519 files changed, 48496 insertions, 40623 deletions

diff --git a/.bowerrc b/.bowerrc
new file mode 100644
index 00000000..8c122aa3
--- /dev/null
+++ b/.bowerrc
@@ -0,0 +1,3 @@
+{"directory": "extlib/",
+ "analytics": false
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 2524739f..e29689ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,10 +23,17 @@
 /mediagoblin.db
 /celery.db
 /kombu.db
+/celerybeat-schedule
 /server-log.txt
+*.egg/
+/env
+/mediagoblin.ini
+/node_modules/
+/pip-selfcheck.json
 
 # pyconfigure/automake generated files
 /Makefile
+/mediagoblin/_version.py
 /autom4te.cache/
 /config.log
 /config.status
@@ -41,6 +48,17 @@
 *.pyo
 *~
 *.swp
+*.mo
 
 # The legacy of buildout
 .installed.cfg
+
+# Virtualenv, tox
+venv*
+.tox/
+
+# extlib things
+/extlib/jquery/
+/extlib/leaflet/
+/extlib/tinymce/
+/extlib/video.js/
diff --git a/AUTHORS b/AUTHORS
index 86360e09..2127c87e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -95,8 +95,6 @@ Thank you!
 * Tiberiu C. Turbureanu
 * Tran Thanh Bao
 * Tryggvi Björgvinsson
-* Shawn Khan
-* Sergio Durigan Junior
 * Will Kahn-Greene
 
 Special thanks to:
diff --git a/COPYING b/COPYING
index a8469027..b748306d 100644
--- a/COPYING
+++ b/COPYING
@@ -34,8 +34,8 @@ terms of the GNU Affero General Public License as published by the
 Free Software Foundation, either version 3 of the License, or (at
 your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public
-License along with this program, in the file ``licenses/LGPLv3.txt``.
+You should have received a copy of the GNU Affero General Public
+License along with this program, in the file ``licenses/AGPLv3.txt``.
 If not, see <http://www.gnu.org/licenses/>.
 
 
diff --git a/Makefile.in b/Makefile.in
index b9b91a0e..5530b9e8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,7 @@
 # Makefile.in
 #
 # Copyright © 2012, 2013 Brandon Invergo <brandon@invergo.net>
+# Copyright © 2014, 2015 Christopher Allan Webber <cwebber@dustycloud.org>
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -24,8 +25,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PYTHON = @PYTHON@
 VIRTUALENV = @VIRTUALENV@
-SPHINXBUILD = @SPHINXBUILD@
-POSTGRES = @POSTGRES@
 SHELL = @SHELL@
 MKDIR_P = @MKDIR_P@
 INSTALL = @INSTALL@
@@ -43,89 +42,141 @@ srcdir = @srcdir@
 abs_srcdir = @abs_srcdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-pythondir = @pythondir@
-pyexecdir = @pyexecdir@
 pkgdatadir = $(datadir)/@PACKAGE_NAME@
 pkgincludedir = $(includedir)/@PACKAGE_NAME@
-pkgpythondir = @pkgpythondir@
-pkgpyexecdir = @pkgpyexecdir@
 PYTHONPATH = $(pythondir)$(PATH_SEPARATOR)$(DESTDIR)$(pythondir)
+USE_PYTHON3 = @USE_PYTHON3@
 
-all: develop
+EXTLIB_INSTALLS = extlib/jquery extlib/video.js extlib/leaflet extlib/tinymce
 
-.PHONY: all install develop uninstall distclean info install-html html \
-install-pdf pdf install-dvi dvi install-ps ps clean dist check \
-installdirs postgresql update
+# pkgpythondir = @pkgpythondir@
+# pkgpyexecdir = @pkgpyexecdir@
+# pythondir = @pythondir@
+# pyexecdir = @pyexecdir@
+# SPHINXBUILD = @SPHINXBUILD@
+# POSTGRES = @POSTGRES@
 
-# Since installing to a virtualenv is all the rage these days, support
-# it here. If the VIRTUALENV variable is set to anything other than
-# "no", set up a new virtualenv and install there, otherwise install
-# as usual from setup.py
-install: installdirs
-	$(NORMAL_INSTALL)
+
+# Maybe add a virtualenv prefix to a command
 ifneq ($(VIRTUALENV),no)
-	$(VIRTUALENV) $(VIRTUALENV_FLAGS) --python=$(PYTHON) \
-		--system-site-packages $(DESTDIR)$(prefix) || \
-		$(VIRTUALENV) $(DESTDIR)$(prefix)
-	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py install \
-		--prefix=$(DESTDIR)$(prefix)
+# virtualenv specified to be included by config (default)
+#   ... we only use virtualenv for local development, we don't
+#   auto-deploy to it.
+
+maybe_venved = ./bin/
+maybe_venved_python = ./bin/python
+# Yes, build the virtualenv as a dependency!
+maybe_venv_dep = virtualenv
+# And to clean up!
+maybe_venv_clean = clean-virtualenv
+
 else
-	$(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
+# --without-virtualenv must have been passed in... don't build
+#   a local virtualenv or use such commands
+maybe_venved =
+maybe_venved_python = $(PYTHON)
+# No need for commands to build virtualenv as a dependency!
+maybe_venv_dep = 
+# Nor to clean up!
+maybe_venv_clean = 
 endif
-	if [[ $(DESTDIR)$(prefix) != $(abs_srcdir) ]]; then \
-		$(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile; \
-		$(INSTALL_DATA) $(srcdir)/lazycelery.sh $(DESTDIR)$(prefix)/lazycelery.sh; \
-		$(INSTALL_DATA) $(srcdir)/lazyserver.sh $(DESTDIR)$(prefix)/lazyserver.sh; \
-	fi
-
-# The same as "install", except use the "develop" setup.py target
-develop: installdirs
-	$(NORMAL_INSTALL)
+
+.PHONY: all install uninstall distclean info install-html html \
+install-pdf pdf install-dvi dvi install-ps ps clean dist check \
+installdirs i18n virtualenv docs extlib
+
+# update postgresql
+
+all: develop
+
+docs:
 ifneq ($(VIRTUALENV),no)
-	$(VIRTUALENV) $(VIRTUALENV_FLAGS) --python=$(PYTHON) \
-		--system-site-packages $(DESTDIR)$(prefix) || \
-		$(VIRTUALENV) $(DESTDIR)$(prefix)
-	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py develop \
-		--prefix=$(DESTDIR)$(prefix)
+	source bin/activate && cd docs && make html
 else
-	$(PYTHON) $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix)
+	cd docs && make html
 endif
-	if [ "$(DESTDIR)$(prefix)" != "$(abs_srcdir)" ]; then \
-		$(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile; \
-		$(INSTALL_DATA) $(srcdir)/lazycelery.sh $(DESTDIR)$(prefix)/lazycelery.sh; \
-		$(INSTALL_DATA) $(srcdir)/lazyserver.sh $(DESTDIR)$(prefix)/lazyserver.sh; \
-	fi
 
+# In the future we may provide more options than just npm/bower here
+# eg, we may support guix updating.
+extlib:
+	./devtools/update_extlib.sh
+
+develop: $(maybe_venv_dep) i18n mediagoblin.ini
+
+# NEVER clobber a user's mediagoblin.ini once they've defined it
+mediagoblin.ini:
+	cp --no-clobber mediagoblin.example.ini mediagoblin.ini
+
+# base-configs: paste.ini mediagoblin.example.ini
+
+install: installdirs
+	$(maybe_venved_python) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
+
+
+# In the future, maybe we can compile the individual .po files here?
+i18n: $(maybe_venv_dep)
+	./devtools/compile_translations.sh
+
+
+ifneq ($(VIRTUALENV),no)
+./bin/python:
+	rm -f ./bin/python
+	virtualenv --system-site-packages --python=$(PYTHON) .
+	./bin/python setup.py develop --upgrade
+
+virtualenv: bin/python extlib
+
+clean-virtualenv:
+	rm -rf ./bin/
+	rm -rf ./lib/
+	rm -rf ./include/
+endif
 
 # setup.py doesn't (yet) support an uninstall command, so until it does, you 
 # must manually remove everything that was installed here. The following example
 # should remove a basic package installed via setup.py, but please double- and 
 # triple-check it so that you don't remove something you shouldn't!
 # Be sure to remove any extra files you install, such as binaries or documentation!
+# 
 # uninstall: 
-#	case $(prefix) in
-#		/usr|/usr/local )
-#			exit 1 ;;
-#		/www/*|/srv/* )
-#		 	rm -rvf $(prefix) ;;
-#	esac
-
-# Just use the usual setup.py clean command
+# 	rm -rvf $(pkgpythondir)
+# 	rm -v $(pythondir)/$(PACKAGE_DISTNAME)-*.egg-info
+# 
+
+# We don't know what this does yet.
+# Originally:
+## Just use the usual setup.py clean command
+#clean:
+#	$(maybe_venved_python) setup.py clean
 clean:
-	$(PYTHON) setup.py clean
+	@echo "No rule to clean house, yet."
+	@echo "distclean works but might do more than you want. :)"
 
 
+# It's not obvious to me whether the virtualenv/bower/npm things should be
+# auto-cleaned as part of distclean.  I'm leaning towards "yes" for now but
+# I'm not really happy about that.
+
 # Clean up the output of configure
-distclean: 
-	rm -v $(srcdir)/config.log
-	rm -v $(srcdir)/config.status
+distclean: $(maybe_venv_clean)
+	rm -vf $(srcdir)/config.log
+	rm -vf $(srcdir)/config.status
 	rm -rvf $(srcdir)/autom4te.cache
-	rm -v $(srcdir)/aclocal.m4
-	rm -v $(srcdir)/Makefile
+	rm -vf $(srcdir)/aclocal.m4
+	rm -rf $(EXTLIB_INSTALLS)
+	rm -rf node_modules
+	rm -vf $(srcdir)/Makefile
+
+
+###########################################################################
+# These things aren't really tested / supported yet.
+###########################################################################
+
+
 
 # You can either use the setup.py sdist command or you can roll your own here
-dist:
-#	$(PYTHON) setup.py sdist
+dist: extlib
+#	$(maybe_venved_python) setup.py sdist
 	mkdir $(PACKAGE_DISTNAME)
 	cp -r $(DISTFILES) $(PACKAGE_DISTNAME)
 	tar -czf $(PACKAGE_DISTNAME).tar.gz $(PACKAGE_DISTNAME)
@@ -133,25 +184,16 @@ dist:
 
 # Use the setup.py check command
 check:
-	$(PYTHON) setup.py check
+	./runtests.sh
 
 # setup.py might complain if a directory doesn't exist so just in case, make the directory
 # here
 installdirs:
 	$(MKDIR_P) $(DESTDIR)$(prefix)
 
-# Set up PostgreSQL
-postgresql:
-	sudo -u $(POSTGRES) createuser mediagoblin
-	sudo -u $(POSTGRES) createdb -E UNICODE -O mediagoblin mediagoblin
-
-update:
-ifneq ($(VIRTUALENV),no)
-	$(prefix)/bin/python $(srcdir)/setup.py develop --prefix=$(prefix) --upgrade
-else
-	$(PYTHON) $(srcdir)/setup.py develop --prefix=$(prefix) --upgrade
-endif	
-	$(prefix)/bin/gmg dbupdate
+######################
+# Needs to be updated?
+######################
 
 # The following show how to install documentation. In this example,
 # docs are built from a separate Makefile contained in the docs
@@ -169,39 +211,14 @@ $(DESTDIR)$(infodir)/mediagoblin.info: docs/build/texinfo/mediagoblin.info
 info: docs/build/texinfo/mediagoblin.info
 
 docs/build/texinfo/mediagoblin.info: $(wildcard docs/source/*)
-ifneq ($(SPHINXBUILD),no)
-	$(MAKE) -C docs info SPHINXBUILD=$(SPHINXBUILD)
+ifneq ($(VIRTUALENV),no)
+	source bin/activate && cd docs && make info
+else
+	cd docs && make info
 endif
 
 
 install-html: html installdirs
 	$(INSTALL_DATA) docs/build/html/* $(DESTDIR)$(htmldir)
 
-html: docs/build/html/index.html
-
-docs/build/html/index.html: $(wildcard $(srcdir)/docs/source/*)
-ifneq ($(SPHINXBUILD),no)
-	$(MAKE) -C docs html SPHINXBUILD=$(SPHINXBUILD)
-endif
-
-
-install-pdf: pdf installdirs
-	$(INSTALL_DATA) docs/build/latex/mediagoblin.pdf $(DESTDIR)$(pdfdir)
-
-pdf: docs/build/latex/mediagoblin.pdf
-
-docs/build/latex/mediagoblin.pdf: $(wildcard $(srcdir)/docs/source/*)
-ifneq ($(SPHINXBUILD),no)
-	$(MAKE) -C docs latexpdf SPHINXBUILD=$(SPHINXBUILD)
-endif
-
-
-install-dvi:
-
-dvi:
-
-install-ps:
-
-ps:
-
-
+html: docs
diff --git a/alembic.ini b/alembic.ini
new file mode 100644
index 00000000..2fa08099
--- /dev/null
+++ b/alembic.ini
@@ -0,0 +1,59 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = %(here)s/mediagoblin/db/migrations
+
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# max length of characters to apply to the
+# "slug" field
+#truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+sqlalchemy.url = sqlite:///mediagoblin.db
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/experimental-bootstrap.sh b/bootstrap.sh
index 78d0f1c7..05c84d46 100755
--- a/experimental-bootstrap.sh
+++ b/bootstrap.sh
@@ -2,3 +2,6 @@
 
 aclocal -I m4 --install
 autoreconf -fvi
+
+git submodule init
+git submodule update
diff --git a/bower.json b/bower.json
new file mode 100644
index 00000000..5f7fff5d
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,20 @@
+{
+  "name": "mediagoblin-extlib",
+  "description": "External libraries used by GNU MediaGoblin",
+  "author": "MediaGoblin team <devel@mediagoblin.org>",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "extlib/",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": "~2.1.3",
+    "video.js": "~4.11.4",
+    "leaflet": "~0.7.3",
+    "tinymce": "~4.1.7"
+  }
+}
diff --git a/configure.ac b/configure.ac
index b3933e88..975f0e00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 dnl configure.ac
 dnl
 dnl Copyright 2012, 2013 Brandon Invergo <brandon@invergo.net>
+dnl           2014 MediaGoblin contributors (see MediaGoblin's AUTHORS)
 dnl
 dnl Copying and distribution of this file, with or without modification,
 dnl are permitted in any medium without royalty provided the copyright
@@ -45,19 +46,30 @@ dnl 2) package version (i.e. 1.2)
 dnl 3) bug/info/project email address (i.e. bug-foo@gnu.org)
 dnl----
 dnl
-AC_INIT([mediagoblin], [0.4.0.dev], [cwebber@gnu.org])
+
+dnl # valid version formats:
+dnl # * x.y      - final release
+dnl # * x.ya1    - alpha 1
+dnl # * x.yb1    - beta 1
+dnl # * x.yrc1   - release candidate 1
+dnl # * x.y.dev  - dev
+dnl 
+dnl # see http://www.python.org/dev/peps/pep-0386/
+
+AC_INIT([mediagoblin], [0.8.0.dev], [cwebber@gnu.org])
+
 
 dnl----
 dnl Load macros from the m4/ directory. If you plan to write new 
 dnl macros, put them in files in this directory.
 dnl----
 dnl
-AC_CONFIG_MACRO_DIR([m4])
+dnl AC_CONFIG_MACRO_DIR([m4])
 
 
-# The default prefix should be changed from /usr/local. Set it, as in
-# the documentation, to /srv/mediagoblin.example.org/mediagoblin/
-AC_PREFIX_DEFAULT([`pwd`])
+dnl # The default prefix should be changed from /usr/local. Set it, as in
+dnl # the documentation, to /srv/mediagoblin.example.org/mediagoblin/
+dnl AC_PREFIX_DEFAULT([`pwd`])
 
 
 dnl###########################
@@ -67,36 +79,26 @@ dnl
 dnl In this section, we check for the presence of important commands
 dnl and programs.
 
-dnl--PC_INIT----------------------------------------------------------
-dnl This is the only required macro. Its primary function is to find
-dnl a Python interpreter that is compatible with the package and set 
-dnl the PYTHON variable to hold its path. It can optionally take
-dnl arguments to specify minimum and/or maximum versions:
-dnl PC_INIT: find an interpreter with a version between 2.0 and 3.3.99
-dnl          (in other words, up to and including any possible release
-dnl          in the 3.3 series)
-dnl PC_INIT([MIN_VER], [MAX_VER]): Find an interpreter that is between
-dnl          the minimum and maximum version. If the min is in the 2.0
-dnl          series and the max is in the 3.0 series, non-existent 
-dnl          releases (2.8 & 2.9) will be correctly skipped.
+dnl--A bit simpler python init----------------------------------------
+dnl Expect python2.7 or python2.6 unless --with-python3 is given.
 dnl----
-dnl
-PC_INIT([2.6], [2.7.99])
-
-dnl--PC_PYTHON_PROG_PYTHON_CONFIG-------------------------------------
-dnl In order to use some of the other macros, you also need the 
-dnl python-config command, which will fall subject to the same problem 
-dnl of python3-config being preferred to python2-config. This macro
-dnl will be automatically included if you use on of the macros that 
-dnl depends on it, so you normally don't have to call it. However, if
-dnl you require a specific version, you can do something like the
-dnl following example.
-dnl----
-dnl
-PC_PYTHON_PROG_PYTHON_CONFIG([python2-config])
-if [[ "x$PYTHON_CONFIG" == "x" ]]; then
-   PC_PYTHON_PROG_PYTHON_CONFIG([$PYTHON-config])
-fi   
+
+
+AC_ARG_WITH([python3],
+	[AS_HELP_STRING([--with-python3], [Set up to use Python 3 by default.])],
+	[],
+	[with_python3=no])
+AS_IF([test "x$with_python3" != xno],
+        AC_CHECK_PROGS([PYTHON], [python3.3], [none])
+        AC_SUBST([USE_PYTHON3], [true])
+	AS_IF([test "x$PYTHON" = xnone],
+              [AC_MSG_FAILURE(
+		[--with-python3 given but no acceptable python3 (3.3) could be found])]),
+      AC_CHECK_PROGS([PYTHON], [python2.7], [none])
+      AC_SUBST([USE_PYTHON3], [false])
+      AS_IF([test "x$PYTHON" = xnone],
+              [AC_MSG_FAILURE(
+		[No acceptable python (2.7) could be found])]))
 
 dnl----
 dnl With the following set of macros, we implement an option 
@@ -107,7 +109,7 @@ dnl available, checking both for "virtualenv" and "virtualenv2"
 dnl (AC_CHECK_PROGS)
 dnl----
 dnl
-# Support installing to a virtualenv via the --with-virtualenv 
+# Support doing development in a virtualenv via the --with-virtualenv 
 # configure flag
 AC_ARG_WITH([virtualenv],
 	[AS_HELP_STRING([--without-virtualenv], [install to a Python virtualenv])],
@@ -131,10 +133,10 @@ dnl print a warning. If the program uses some other documentation
 dnl system, you can do something similar with it.
 dnl----
 dnl
-# Check for sphinx-build
-AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no])
-AS_IF([test "x$SPHINXBUILD" = xno], 
-    AC_MSG_WARN(sphinx-build is required to build documentation))
+dnl # Check for sphinx-build
+dnl AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no])
+dnl AS_IF([test "x$SPHINXBUILD" = xno], 
+dnl     AC_MSG_WARN(sphinx-build is required to build documentation))
 
 
 dnl----
@@ -145,51 +147,7 @@ dnl
 AC_PROG_MKDIR_P
 AC_PROG_INSTALL	    
 
-# Check for a supported database program
-AC_PATH_PROG([SQLITE], [sqlite3])
-AC_PATH_PROG([POSTGRES], [psql])
-AS_IF([test "x$SQLITE" = x -a "x$POSTGRES" = "x"],
-   [AC_MSG_ERROR([SQLite or PostgreSQL is required])])
-
-
-dnl--PC_PYTHON_SITE_PACKAGE_DIR---------------------------------------
-dnl This uses PYTHON_SITE_DIR to construct a directory for this
-dnl project (ie $PYTHON_SITE_DIR/project_name) and stores it in
-dnl pkgpythondir. This value is used by Automake for installing Python
-dnl scripts. By default, this begins with $pythondir, unexpanded, to
-dnl provide compatibility with GNU Makefile specifications, allowing
-dnl the user to change the prefix from the commandline.
-dnl----
-dnl
-PC_PYTHON_SITE_PACKAGE_DIR
-
-dnl--PC_PYTHON_EXEC_PACKAGE_DIR----------------------------------------
-dnl Same as PC_PYTHON_SITE_PACKAGE_DIR but for $exec-prefix. Stored in
-dnl pkgpyexecdir
-dnl----
-dnl
-PC_PYTHON_EXEC_PACKAGE_DIR
-
-
-dnl###############################
-dnl Checking Python capabilities #
-dnl###############################
-
-dnl--PC_PYTHON_CHECK_MODULE([PYTHON-MODULE], [ACTION-IF-PRESENT],
-dnl                         [ACTION-IF-ABSENT]) 
-dnl This macro lets you check if a given Python module exists on the
-dnl system.
-dnl----
-dnl
-dnl PC_PYTHON_CHECK_MODULE([foo])
-
-# Check for python-lxml module
-PC_PYTHON_CHECK_MODULE([lxml], [], 
-                       [AC_MSG_ERROR([python-lxml is required])])
-
-# Check for the Python Imaging Library
-PC_PYTHON_CHECK_MODULE([Image], [],
-                       [AC_MSG_ERROR([Python Imaging Library is required])])
+dnl--MediaGoblin specific commands/variables ------------------------
 
 
 dnl#########
@@ -197,6 +155,7 @@ dnl Finish #
 dnl#########
 
 dnl Define the files to be configured
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile] [mediagoblin/_version.py])
+
 dnl Generate config.status
 AC_OUTPUT
diff --git a/devtools/compile_translations.sh b/devtools/compile_translations.sh
new file mode 100755
index 00000000..fa84e9a7
--- /dev/null
+++ b/devtools/compile_translations.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2015 GNU MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# exit if anything fails
+set -e
+
+if [ -f "./bin/pybabel" ]; then
+    PYBABEL="./bin/pybabel";
+else
+    PYBABEL=pybabel;
+fi
+
+
+## This used to be a lot simpler...
+##
+## But now we have a Lojban translation that we can't compile
+## currently.  We don't want to get rid of it because we want it... see 
+## https://issues.mediagoblin.org/ticket/1070
+## to track progress.
+
+for file in `find mediagoblin/i18n/ -name "*.po"`; do
+    if [ "$file" != "mediagoblin/i18n/jbo/mediagoblin.po" ] && \
+       [ "$file" != "mediagoblin/i18n/templates/en/mediagoblin.po" ]; then 
+        mkdir -p `dirname $file`/LC_MESSAGES/;
+        $PYBABEL compile -i $file \
+               -o `dirname $file`/LC_MESSAGES/mediagoblin.mo \
+               -l `echo $file | awk -F / '{ print $3 }'`;
+    else
+        echo "Skipping $file which pybabel can't compile :("; 
+    fi;
+done
diff --git a/devtools/pootle-exclude.txt b/devtools/pootle-exclude.txt
new file mode 100644
index 00000000..e830d157
--- /dev/null
+++ b/devtools/pootle-exclude.txt
@@ -0,0 +1,2 @@
+.translation_index
+LC_MESSAGES/
diff --git a/mediagoblin/plugins/oauth/templates/oauth/client/connections.html b/devtools/update_extlib.sh
index 63b0230a..b94f0076 100644..100755
--- a/mediagoblin/plugins/oauth/templates/oauth/client/connections.html
+++ b/devtools/update_extlib.sh
@@ -1,6 +1,7 @@
-{#
+#!/bin/bash
+
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2015 GNU MediaGoblin Contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -14,21 +15,27 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
--#}
-{% extends "mediagoblin/base.html" %}
-{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
-{% block mediagoblin_content %}
-<h1>{% trans %}OAuth client connections{% endtrans %}</h1>
-{% if connections %}
-<ul>
-    {% for connection in connections %}
-    <li><span title="{{ connection.client.description }}">{{
-        connection.client.name }}</span> - {{ connection.state }}
-    </li>
-    {% endfor %}
-</ul>
-{% else %}
-<p>You haven't connected using an OAuth client before.</p>
-{% endif %}
-{% endblock %}
+
+set -e
+
+# Make sure we have npm available
+
+if ! which npm > /dev/null; then
+    echo "Can't find npm, no way to install extlib :(";
+    exit 1;
+fi
+
+# Install bower if need be
+if which bower > /dev/null; then
+    BOWER=`which bower`;
+elif [ -f ./node_modules/.bin/bower ]; then
+    BOWER="./node_modules/.bin/bower";
+else
+    echo "Bower not found, installing via npm!";
+    npm install bower;
+    BOWER="./node_modules/.bin/bower";
+fi
+
+# Do package/file installs
+$BOWER install
diff --git a/devtools/update_translations.sh b/devtools/update_translations.sh
index 29743f94..58e4e11d 100755
--- a/devtools/update_translations.sh
+++ b/devtools/update_translations.sh
@@ -26,27 +26,13 @@ echo "==> pulling git master"
 git pull
 
 echo "==> pulling present translations"
-./bin/tx pull -a
-
-git add mediagoblin/i18n/
-git commit -m "Committing present MediaGoblin translations before pushing extracted messages" \
-    || true  # Don't fail if nothing to commit
+rsync --exclude-from="devtools/pootle-exclude.txt" -vaz chapters.gnu.org::pootle/mediagoblin/ mediagoblin/i18n/
 
 echo "==> Extracting translations"
-./bin/pybabel extract -F babel.ini -o mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po .
-
-echo "==> Pushing extracted translations to Transifex"
-./bin/tx push -s
-
-echo "==> Waiting 5 seconds, so the server can process the new stuff (hopefully)"
-sleep 5
-
-# gets the new strings added to all files
-echo "==> Re-Pulling translations from Transifex"
-./bin/tx pull -a
+./bin/pybabel extract -F babel.ini -o mediagoblin/i18n/templates/mediagoblin.pot .
 
 echo "==> Compiling .mo files"
-./bin/pybabel compile -D mediagoblin -d mediagoblin/i18n/
+./devtools/compile_translations.sh
 
 echo "==> Committing to git"
 git add mediagoblin/i18n/
diff --git a/docs/Makefile b/docs/Makefile
index 0b97bf7c..e9ee5af0 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -2,6 +2,7 @@
 #
 
 # You can set these variables from the command line.
+PYTHON        ?= python
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
@@ -14,11 +15,12 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) sou
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+.PHONY: help clean html htmlview dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html       to make standalone HTML files"
+	@echo "  htmlview   to open the index page built by the html target in your browser"
 	@echo "  dirhtml    to make HTML files named index.html in directories"
 	@echo "  singlehtml to make a single large HTML file"
 	@echo "  pickle     to make pickle files"
@@ -46,6 +48,9 @@ html:
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
+htmlview: html
+	$(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')"
+
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
diff --git a/docs/source/api/activities.rst b/docs/source/api/activities.rst
new file mode 100644
index 00000000..cbbd1fab
--- /dev/null
+++ b/docs/source/api/activities.rst
@@ -0,0 +1,208 @@
+.. MediaGoblin Documentation
+
+   Written in 2015 by MediaGoblin contributors
+
+   To the extent possible under law, the author(s) have dedicated all
+   copyright and related and neighboring rights to this software to
+   the public domain worldwide. This software is distributed without
+   any warranty.
+
+   You should have received a copy of the CC0 Public Domain
+   Dedication along with this software. If not, see
+   <http://creativecommons.org/publicdomain/zero/1.0/>.
+
+==========
+Activities
+==========
+
+.. contents:: Sections
+   :local:
+
+GNU MediaGoblin uses `Activity Streams 1.0 <http://activitystrea.ms>`_ JSON
+format to represent activities or events that happen. There are several
+components to Activity Streams.
+
+Objects
+=======
+These represent "things" in MediaGoblin such as types of media, comments, collections
+of other objects, etc. There are attributes all objects have and some attributes which
+are specific to certain objects.
+
+Example
+-------
+a representation of an image object::
+
+    {
+        "id": "https://gmg.server.tld/api/image/someidhere",
+        "objectType": "image",
+        "content": "My lovely image",
+        "image": {
+            "url": "https://gmg.server.tld/mgoblin_media/media_entries/23/some_image.jpg",
+            "height": 1000,
+            "width": 500
+        },
+        "author": {
+            "id": "acct:someone@gmg.server.tld"
+        }
+    }
+
+This has both attributes which are on all objects (e.g. ``objectType`` and ``id``)
+and attributes which are on only images (e.g. ``image``).
+
+Activities
+==========
+This is something which happens such as: commenting on an image, uploading an image, etc.
+these always have a ``verb`` which describes what kind of activity it is and they always have
+an ``object`` associated with them.
+
+Example
+-------
+A activity which describes the event of posting a new image::
+
+    {
+        "id": "https://gmg.server.tld/api/activity/someidhere",
+        "verb": "post",
+        "object": {
+            "id": "https://gmg.server.tld/api/comment/someid",
+            "objectType": "comment",
+            "content": "What a wonderful picture you have there!",
+            "inReplyTo": {
+                "id": "https://gmg.server.tld/api/image/someidhere"
+            }
+        },
+        "author": {
+            "id": "acct:someone@gmg.server.tld"
+        }
+    }
+
+Collections
+===========
+
+These are ordered lists which contain objects. Currently in GNU MediaGoblin they are used
+to represent "albums" or collections of media however they can represent anything. They will
+be used in the future to represent lists/groups of users which you can send activities to.
+
+Example
+^^^^^^^
+A collection which contains two images::
+
+    {
+        "id": "https://gmg.server.tld/api/collection/someidhere",
+        "totalItems": 2,
+        "url": "http://gmg.server.tld/u/someone/collection/cool-album/",
+        "items": [
+			{
+			   "id": "https://gmg.server.tld/api/image/someidhere",
+			   "objectType": "image",
+			   "content": "My lovely image",
+			   "image": {
+			       "url": "https://gmg.server.tld/mgoblin_media/media_entries/23/some_image.jpg",
+			       "height": 1000,
+			       "width": 500
+			   },
+			   "author": {
+			       "id": "acct:someone@gmg.server.tld"
+			   }
+			},
+			{
+			   "id": "https://gmg.server.tld/api/image/someother",
+			   "objectType": "image",
+			   "content": "Another image for you",
+			   "image": {
+			       "url": "https://gmg.server.tld/mgoblin_media/media_entries/24/some_other_image.jpg",
+			       "height": 1000,
+			       "width": 500
+			   },
+			   "author": {
+			       "id": "acct:someone@gmg.server.tld"
+			   }
+			}
+        ]
+    }
+
+Feeds
+-----
+
+There are several feeds which can be read and posted to as part of the API. Some
+of the feeds are still a work in progress however a lot of them are present for
+compatibility.
+
+They also support certain GET parameters which allow you to control the stream.
+These are:
+
++-------------+----------+----------+----------------------------------+
+| Parameter   | Default  | Limit    | Description                      |
++=============+==========+==========+==================================+
+| count       | 20       | 200      | Number of activities to return   |
++-------------+----------+----------+----------------------------------+
+| offset      | 0        | No limit | Offset of collection             |
++-------------+----------+----------+----------------------------------+
+
+.. warning::
+   Activities are added to the beginning of collection so using count and
+   offset is a bad way of doing pages.
+
+.. important::
+   Due to the way we're currently doing deletes in MediaGoblin some activities
+   are broken and are skipped. This means the number you specify in the count
+   is NOT always the number of activities returned.
+
+
+Inbox
+^^^^^
+
+**Endpoint:** `/api/user/<username>/inbox`
+
+This feed can be read by user to see what media has been sent to them.
+MediaGoblin currently doesn't have the ability to sent media to anyone
+as all media is public, all media on that instance should show up in the
+users inbox.
+
+There are also subsets of the inbox which are:
+
+Major
+"""""
+**Endpoint:** ``/api/user/<username>/inbox/major``
+
+This contains all major changes such as new objects being posted. Currently
+comments exist in this feed, in the future they will be moved to the minor feed.
+
+Minor
+"""""
+**Endpoint:** ``/api/user/<username>/inbox/minor``
+
+This contains minor changes such as objects being updated or deleted. This feed
+should have comments in it, currently they are listed under major, in the future
+they will exist in this endpoint.
+
+Direct
+""""""
+**Endpoint:** ``/api/user/<username>/inbox/direct``
+
+Currently this is just a mirror of the regular inbox for compatibility with
+pump.io. In the future this will contain all objects specifically addressed to
+the user.
+
+Direct major
+""""""""""""
+**Endpoint:** ``/api/user/<username>/inbox/direct/major``
+
+Currently this is just a mirror of the major inbox for compatibility with
+pump.io. In the future this will contain all major activities which are
+specifically addressed to the user.
+
+Direct minor
+""""""""""""
+**Endpoint:** ``/api/user/<username>/inbox/direct/minor``
+
+Currently this is just a mirror of the minor inbox for compatibility with
+pump.io. In the future this will contain all minor activities which are
+specifically addressed to the user.
+
+Feed (outbox)
+^^^^^^^^^^^^^
+**Endpoint:** ``/api/user/<username>/feed``
+
+This is where the client should post new activities. It can be read by the
+user to see what they have posted. This will only contain content they have
+authored or shared (sharing will come in the future).
diff --git a/docs/source/api/client_register.rst b/docs/source/api/authentication.rst
index 08f92c47..1d52d300 100644
--- a/docs/source/api/client_register.rst
+++ b/docs/source/api/authentication.rst
@@ -1,6 +1,6 @@
 .. MediaGoblin Documentation
 
-   Written in 2011, 2012 by MediaGoblin contributors
+   Written in 2015 by MediaGoblin contributors
 
    To the extent possible under law, the author(s) have dedicated all
    copyright and related and neighboring rights to this software to
@@ -11,11 +11,17 @@
    Dedication along with this software. If not, see
    <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-====================
+==================
+API Authentication
+==================
+
+.. contents:: Sections
+   :local:
+
 Registering a Client
 ====================
 
-To use the GNU MediaGoblin API you need to use the dynamic client registration. This has been adapted from the `OpenID specification <https://openid.net/specs/openid-connect-registration-1_0.html>`_, this is the only part of OpenID that is being used to serve the purpose to provide the client registration which is used in OAuth. 
+To use the GNU MediaGoblin API you need to use the dynamic client registration. This has been adapted from the `OpenID specification <https://openid.net/specs/openid-connect-registration-1_0.html>`_, this is the only part of OpenID that is being used to serve the purpose to provide the client registration which is used in OAuth.
 
 The endpoint is ``/api/client/register``
 
@@ -31,7 +37,7 @@ client_secret
     **update only** - This should only be used updating client information, this is the client_secret given when you register
 
 contacts
-    **optional** - This a space seporated list of email addresses to contact of people responsible for the client
+    **optional** - This a space separated list of email addresses to contact of people responsible for the client
 
 application_type
     **required** - This is the type of client you are making, this must be either *web* or *native*
@@ -39,15 +45,15 @@ application_type
 application_name
     **optional** - This is the name of your client
 
-logo_url
-    **optional** - This is a URL of the logo image for your client
+logo_uri
+    **optional** - This is a URI of the logo image for your client
 
 redirect_uri
-    **optional** - This is a space seporated list of pre-registered URLs for use at the Authorization Server
+    **optional** - This is a space separated list of pre-registered URLs for use at the Authentication Server
 
 
 Response
---------
+^^^^^^^^
 
 You will get back a response:
 
@@ -60,12 +66,11 @@ client_secret
 expires_at
     This is time that the client credentials expire. If this is 0 the client registration does not expire.
 
-=======
-Example
-=======
+Examples
+--------
 
 Register Client
----------------
+^^^^^^^^^^^^^^^
 
 To register a client for the first time, this is the minimum you must supply::
 
@@ -84,7 +89,7 @@ A Response will look like::
 
 
 Updating Client
----------------
+^^^^^^^^^^^^^^^
 
 Using the response we got above we can update the information and add new information we may have opted not to supply::
 
@@ -93,8 +98,8 @@ Using the response we got above we can update the information and add new inform
         "client_id": "vwljdhUMhhNbdKizpjZlxv",
         "client_secret": "hJtfhaQzgKerlLVdaeRAgmbcstSOBLRfgOinMxBCHcb",
         "application_type": "web",
-        "application_name": "MyClient!", 
-        "logo_url": "https://myclient.org/images/my_logo.png",
+        "application_name": "MyClient!",
+        "logo_uri": "https://myclient.org/images/my_logo.png",
         "contacts": "myemail@someprovider.com another_developer@provider.net",
     }
 
@@ -107,9 +112,8 @@ The response will just return back the client_id and client_secret you sent::
     }
 
 
-======
-Errors
-======
+Possible Registration Errors
+----------------------------
 
 There are a number of errors you could get back, This explains what could cause some of them:
 
@@ -129,7 +133,7 @@ client_id is required to update.
     When you try and update you need to specify the client_id, this will be what you were given when you initially registered the client.
 
 client_secret is required to update.
-    When you try to update you need to specify the client_secrer, this will be what you were given when you initially register the client.
+    When you try to update you need to specify the client_secret, this will be what you were given when you initially register the client.
 
 Unauthorized.
     This is when you are trying to update however the client_id and/or client_secret you have submitted are incorrect.
@@ -144,15 +148,34 @@ Logo URL <url> is not a valid URL
     This is when the URL specified did not meet the validation.
 
 contacts must be a string of space-separated email addresses.
-    ``contacts`` should be a string (not a list), ensure each email is seporated by a space
+    ``contacts`` should be a string (not a list), ensure each email is separated by a space
 
 Email <email> is not a valid email
     This is when you have submitted an invalid email address
 
 redirect_uris must be space-separated URLs.
-    ``redirect_uris`` should be a string (not a list), ensure each URL is seporated by a space
+    ``redirect_uris`` should be a string (not a list), ensure each URL is separated by a space
 
 URI <URI> is not a valid URI
     This is when your URI is invalid.
 
- 
+OAuth
+=====
+
+GNU MediaGoblin uses OAuth1 to authenticate requests to the API. There are many
+libraries out there for OAuth1, you're likely not going to have to do much. There
+is a library for the GNU MediaGoblin called `PyPump <https://github.com/xray7224/PyPump>`_.
+We are not using OAuth2 as we want to stay completely compatible with pump.io.
+
+
+Endpoints
+---------
+
+These are the endpoints you need to use for the oauth requests:
+
+`/oauth/request_token` is for getting the request token.
+
+`/oauth/authorize` is to send the user to to authorize your application.
+
+`/oauth/access_token` is for getting the access token to use in requests.
+
diff --git a/docs/source/api/media.rst b/docs/source/api/media.rst
deleted file mode 100644
index bafe43d3..00000000
--- a/docs/source/api/media.rst
+++ /dev/null
@@ -1,155 +0,0 @@
-.. MediaGoblin Documentation
-
-   Written in 2011, 2012 by MediaGoblin contributors
-
-   To the extent possible under law, the author(s) have dedicated all
-   copyright and related and neighboring rights to this software to
-   the public domain worldwide. This software is distributed without
-   any warranty.
-
-   You should have received a copy of the CC0 Public Domain
-   Dedication along with this software. If not, see
-   <http://creativecommons.org/publicdomain/zero/1.0/>.
-
-.. info:: Currently only image uploading is supported.
-
-===============
-Uploading Media
-===============
-
-To use any the APIs mentioned in this document you will required :doc:`oauth`
-
-Uploading and posting an media requiest you to make two to three requests:
-
-1) Uploads the data to the server
-2) Post media to feed
-3) Update media to have title, description, license, etc. (optional)
-
-These steps could be condenced in the future however currently this is how the
-pump.io API works. There is currently an issue open, if you would like to change
-how this works please contribute upstream: https://github.com/e14n/pump.io/issues/657
-
-----------------------
-Upload Media to Server
-----------------------
-
-To upload media you should use the URI `/api/user/<username>/uploads`.
-
-A POST request should be made to the media upload URI submitting at least two header:
-
-* `Content-Type` - This being a valid mimetype for the media.
-* `Content-Length` - size in bytes of the media.
-
-The media data should be submitted as POST data to the image upload URI.
-You will get back a JSON encoded response which will look similiar to::
-
-    {
-        "updated": "2014-01-11T09:45:48Z",
-        "links": {
-            "self": {
-                "href": "https://<server>/image/4wiBUV1HT8GRqseyvX8m-w"
-            }
-        },
-        "fullImage": {
-            "url": "https://<server>//uploads/<username>/2014/1/11/V3cBMw.jpg",
-            "width": 505,
-            "height": 600
-        },
-        "replies": {
-            "url": "https://<server>//api/image/4wiBUV1HT8GRqseyvX8m-w/replies"
-        },
-        "image": {
-            "url": "https://<server>/uploads/<username>/2014/1/11/V3cBMw_thumb.jpg",
-            "width": 269,
-            "height": 320
-        },
-        "author": {
-            "preferredUsername": "<username>",
-            "displayName": "<username>",
-            "links": {
-                "activity-outbox": {
-                    "href": "https://<server>/api/user/<username>/feed"
-                },
-                "self": {
-                    "href": "https://<server>/api/user/<username>/profile"
-                },
-                "activity-inbox": {
-                    "href": "https://<server>/api/user/<username>/inbox"
-                }
-            },
-            "url": "https://<server>/<username>",
-            "updated": "2013-08-14T10:01:21Z",
-            "id": "acct:<username>@<server>",
-            "objectType": "person"
-        },
-        "url": "https://<server>/<username>/image/4wiBUV1HT8GRqseyvX8m-w",
-        "published": "2014-01-11T09:45:48Z",
-        "id": "https://<server>/api/image/4wiBUV1HT8GRqseyvX8m-w",
-        "objectType": "image"
-    }
-
-The main things in this response is `fullImage` which contains `url` (the URL
-of the original image - i.e. fullsize) and `image` which contains `url` (the URL
-of a thumbnail version).
-
-.. warning:: Media which have been uploaded but not submitted to a feed will
-             periodically be deleted.
-
---------------
-Submit to feed
---------------
-
-This is submitting the media to appear on the website. This will create an
-object in your feed which will then appear on the GNU MediaGoblin website so the
-user and others can view and interact with the media.
-
-The URL you need to POST to is `/api/user/<username>/feed`
-
-You first should do a post to the feed URI with some of the information you got
-back from the above request (which uploaded the media). The request should look
-something like::
-
-    {
-        "verb": "post",
-        "object": {
-            "id": "https://<server>/api/image/6_K9m-2NQFi37je845c83w",
-            "objectType": "image"
-        }
-    }
-
-.. warning:: Any other data submitted **will** be ignored
-
--------------------
-Submitting Metadata
--------------------
-
-Finally if you wish to set a title, description and license you will need to do
-and update request to the endpoint, the following attributes can be submitted:
-
-+--------------+---------------------------------------+-------------------+
-| Name         | Description                           | Required/Optional |
-+==============+=======================================+===================+
-| displayName  | This is the title for the media       | Optional          |
-+--------------+---------------------------------------+-------------------+
-| content      | This is the description for the media | Optional          |
-+--------------+---------------------------------------+-------------------+
-| license      | This is the license to be used        | Optional          |
-+--------------+---------------------------------------+-------------------+
-
-.. note:: license attribute is mediagoblin specific, pump.io does not support this attribute
-
-
-The update request should look something similiar to::
-
-    {
-        "verb": "update",
-        "object": {
-            "displayName": "My super awesome image!",
-            "content": "The awesome image I took while backpacking to modor",
-            "license": "creativecommons.org/licenses/by-sa/3.0/",
-            "id": "https://<server>/api/image/6_K9m-2NQFi37je845c83w",
-            "objectType": "image"
-        }
-    }
-
-.. warning:: Any other data submitted **will** be ignored.
diff --git a/docs/source/api/media_interaction.rst b/docs/source/api/media_interaction.rst
deleted file mode 100644
index 41114a71..00000000
--- a/docs/source/api/media_interaction.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-.. MediaGoblin Documentation
-
-   Written in 2011, 2012 by MediaGoblin contributors
-
-   To the extent possible under law, the author(s) have dedicated all
-   copyright and related and neighboring rights to this software to
-   the public domain worldwide. This software is distributed without
-   any warranty.
-
-   You should have received a copy of the CC0 Public Domain
-   Dedication along with this software. If not, see
-   <http://creativecommons.org/publicdomain/zero/1.0/>.
-
-Pump.io supports a number of different interactions that can happen against
-media. Theser are commenting, liking/favoriting and (re-)sharing. Currently
-MediaGoblin supports just commenting although other interactions will come at
-a later date.
-
---------------
-How to comment
---------------
-
-.. warning:: Commenting on a comment currently is NOT supported.
-
-Commenting is done by posting a comment activity to the users feed. The
-activity should look similiar to::
-
-    {
-        "verb": "post",
-        "object": {
-            "objectType": "comment",
-            "inReplyTo": <media>
-        }
-    }
-
-This is where `<media>` is the media object you have got with from the server.
-
-----------------
-Getting comments
-----------------
-
-The media object you get back should have a `replies` section. This should
-be an object which contains the number of replies and if there are any (i.e.
-number of replies > 0) then `items` will include an array of every item::
-
-    {
-        "totalItems": 2,
-        "items: [
-            {
-                "id": 1,
-                "objectType": "comment",
-                "content": "I'm a comment ^_^",
-                "author": <author user object>
-            },
-            {
-                "id": 4,
-                "objectType": "comment",
-                "content": "Another comment! Blimey!",
-                "author": <author user object>
-            }
-        ],
-        "url": "http://some.server/api/images/1/comments/"
-    }
-
-
diff --git a/docs/source/api/oauth.rst b/docs/source/api/oauth.rst
deleted file mode 100644
index 003ad492..00000000
--- a/docs/source/api/oauth.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-.. MediaGoblin Documentation
-
-   Written in 2011, 2012 by MediaGoblin contributors
-
-   To the extent possible under law, the author(s) have dedicated all
-   copyright and related and neighboring rights to this software to
-   the public domain worldwide. This software is distributed without
-   any warranty.
-
-   You should have received a copy of the CC0 Public Domain
-   Dedication along with this software. If not, see
-   <http://creativecommons.org/publicdomain/zero/1.0/>.
-
-==============
-Authentication
-==============
-
-GNU MediaGoblin uses OAuth1 to authenticate requests to the API. There are many
-libraries out there for OAuth1, you're likely not going to have to do much. There
-is a library for the GNU MediaGoblin called `PyPump <https://github.com/xray7224/PyPump>`_.
-We are not using OAuth2 as we want to stay completely compatable with GNU MediaGoblin.
-
-
-We use :doc:`client_register` to get the client ID and secret.
-
-Endpoints
----------
-
-These are the endpoints you need to use for the oauth requests:
-
-`/oauth/request_token` is for getting the request token.
-
-`/oauth/authorize` is to send the user to to authorize your application.
-
-`/oauth/access_token` is for getting the access token to use in requests.
-
diff --git a/docs/source/api/objects.rst b/docs/source/api/objects.rst
new file mode 100644
index 00000000..4c199616
--- /dev/null
+++ b/docs/source/api/objects.rst
@@ -0,0 +1,229 @@
+.. MediaGoblin Documentation
+
+   Written in 2015 by MediaGoblin contributors
+
+   To the extent possible under law, the author(s) have dedicated all
+   copyright and related and neighboring rights to this software to
+   the public domain worldwide. This software is distributed without
+   any warranty.
+
+   You should have received a copy of the CC0 Public Domain
+   Dedication along with this software. If not, see
+   <http://creativecommons.org/publicdomain/zero/1.0/>.
+
+.. info:: Currently only image uploading is supported.
+
+=======
+Objects
+=======
+
+Using any the APIs mentioned in this document you will required
+:doc:`authentication`. There are many ways to interact with objects, some of
+which aren't supported yet by mediagoblin such as liking or sharing objects
+however you can interact with them by updating them, deleting them and
+commenting on them.
+
+Posting Objects
+---------------
+
+For the most part you should be able to post objects by creating the JSON
+representation of the object on an activity and posting that to the user's
+feed (outbox). Images however are slightly different and there are more steps
+to it as you might imagine.
+
+Using posting a comment as an example, I'll show you how to post the object
+to GNU MediaGoblin or pump.io. I first need to create the JSON representation
+of the activity with the object but without the ID, URL, published or updated
+timestamps or any other data the server creates. My activity comment is::
+
+    {
+        "verb": "post",
+        "object": {
+            "objectType": "comment",
+            "content": "This is my comment to be posted",
+            "inReplyTo": {
+                "id": "https://<server>/api/image/1"
+            }
+        }
+    }
+
+This should be posted to the users feed (outbox) which you can find out about
+:doc:`activities`. You will get back the full activity containing all of
+attributes including ID, urls, etc.
+
+Posting Media
+~~~~~~~~~~~~~
+
+Posting media is a special case from posting all other objects. This is because
+you need to submit more than just the JSON image representation, you need to
+actually subject the image itself. There is also strange behavour around media
+postings where if you want to give the media you're posting a title or
+description you need to peform an update too. A full media posting in order of
+steps to do is as follows:
+
+1) Uploads the data to the server
+2) Post media to feed
+3) Update media to have title, description, license, etc. (optional)
+
+This could be condensed into a 2-step process however this would need to happen
+upstream. If you would like to contribute to changing this upstream there is
+an issue open: https://github.com/e14n/pump.io/issues/657
+
+To upload media you should use the URL `/api/user/<username>/uploads`.
+
+A POST request should be made to the media upload URL submitting at least two
+headers:
+
+* `Content-Type` - This being a valid mimetype for the media.
+* `Content-Length` - size in bytes of the media.
+
+The media data should be submitted as POST data to the image upload URL.
+You will get back a JSON encoded response which will look similar to::
+
+    {
+        "updated": "2014-01-11T09:45:48Z",
+        "links": {
+            "self": {
+                "href": "https://<server>/image/4wiBUV1HT8GRqseyvX8m-w"
+            }
+        },
+        "fullImage": {
+            "url": "https://<server>//uploads/<username>/2014/1/11/V3cBMw.jpg",
+            "width": 505,
+            "height": 600
+        },
+        "replies": {
+            "url": "https://<server>//api/image/4wiBUV1HT8GRqseyvX8m-w/replies"
+        },
+        "image": {
+            "url": "https://<server>/uploads/<username>/2014/1/11/V3cBMw_thumb.jpg",
+            "width": 269,
+            "height": 320
+        },
+        "author": {
+            "preferredUsername": "<username>",
+            "displayName": "<username>",
+            "links": {
+                "activity-outbox": {
+                    "href": "https://<server>/api/user/<username>/feed"
+                },
+                "self": {
+                    "href": "https://<server>/api/user/<username>/profile"
+                },
+                "activity-inbox": {
+                    "href": "https://<server>/api/user/<username>/inbox"
+                }
+            },
+            "url": "https://<server>/<username>",
+            "updated": "2013-08-14T10:01:21Z",
+            "id": "acct:<username>@<server>",
+            "objectType": "person"
+        },
+        "url": "https://<server>/<username>/image/4wiBUV1HT8GRqseyvX8m-w",
+        "published": "2014-01-11T09:45:48Z",
+        "id": "https://<server>/api/image/4wiBUV1HT8GRqseyvX8m-w",
+        "objectType": "image"
+    }
+
+The main things in this response is `fullImage` which contains `url` (the URL
+of the original image - i.e. fullsize) and `image` which contains `url` (the URL
+of a thumbnail version).
+
+.. warning:: Media which have been uploaded but not submitted to a feed will
+             periodically be deleted.
+
+Once you've got the image object back you will need to submit the post
+activity to the feed. This is exactly the same process as posting any other
+object described above. You create a post activity and post that to the feed
+(outbox) endpoint. The post activity looks like::
+
+    {
+        "verb": "post",
+        "object": {
+            "id": "https://<server>/api/image/4wiBUV1HT8GRqseyvX8m-w",
+            "objectType": "image"
+        }
+    }
+
+You will get back the full activity, unlike above however if you wish to
+submit `displayName` (title) or `content` (description) information you need
+to create an update activity and post that to the feed after you have posted
+the image. An update activity would look like::
+
+    {
+        "verb": "update",
+        "object": {
+            "id": "https://<server>/api/image/4wiBUV1HT8GRqseyvX8m-w",
+            "displayName": "This is my title",
+            "content": "This is my description",
+            "objectType": "image"
+        }
+    }
+
+Updating Objects
+----------------
+
+If you would like to edit or update an object you can do so by submitting an
+update activity. An update to a comment might look like::
+
+    {
+        "verb": "update",
+        "object": {
+            "id": "https://<server>/api/comment/1",
+            "objectType": "comment",
+            "content": "This is my new updated comment!"
+        }
+    }
+
+This should be posted to the feed (outbox). You will get back the full update
+activity in response.
+
+Deleting Objects
+----------------
+
+Objects can be deleted by submitting a delete activity to the feed. A delete
+object for a comment looks like::
+
+    {
+        "verb": "delete",
+        "object": {
+            "id": "https://<server>/api/comment/id",
+            "objectType": "comment"
+        }
+    }
+
+You should get the full delete activity in response.
+
+.. warning::
+    While deletion works, currently because of the way deletion is implemented
+    deletion either via the API or the webUI causes any activities to be broken
+    and will be skipped and unaccessible. A migration to remove the broken
+    activities will come in a future release when soft-deletion has been
+    implemented.
+
+Posting Comments
+----------------
+
+Comments currently can only be on media objects, this however will change in
+future versions of MediaGoblin to be inline with pump.io and Activity Streams
+1.0 which allow comments to be on any object including comments themselves.
+
+If you want to submit a comment on an object it's very easy, it's just like
+posting any other object except you use the `inReplyTo` attribute which
+specifies the object you are commenting on. The `inReplyTo` needs to contain
+the object or specifically the ID of it.
+
+Example of comment on an image::
+
+    {
+        "verb": "post",
+        "object": {
+            "content": "My comment here",
+            "inReplyTo": {
+                "id": "https://<server>/api/image/72"
+            }
+        }
+    }
+
+This should be posted to a feed and you will get back the full activity object
+as with any other object posting.
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0b2bccac..0f53e4cf 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -219,7 +219,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'gnumediagoblin', u'GNU MediaGoblin Documentation',
+    ('index', 'mediagoblin', u'GNU MediaGoblin Documentation',
      [u'Chris Webber, et al'], 1)
 ]
 
@@ -233,7 +233,7 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'gnumediagoblin', u'GNU MediaGoblin Documentation', u'gnumediagoblin',
+  ('index', 'mediagoblin', u'GNU MediaGoblin Documentation', u'mediagoblin',
    'GNU MediaGoblin', 'Media sharing web application.', 'Miscellaneous'),
 ]
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 8e49d1d1..a4fd2455 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -105,15 +105,14 @@ This chapter covers MediaGoblin's `Pump API
 work in progress; full federation is not supported at the moment, but
 media uploading works!  You can use something like
 `PyPump <http://pypump.org>`_
-to write MediaGoblin uploadable applications.)
+to write MediaGoblin applications.)
 
 .. toctree::
    :maxdepth: 1
 
-   api/client_register
-   api/oauth
-   api/media
-   api/media_interaction
+   api/authentication
+   api/activities
+   api/objects
 
 
 
diff --git a/docs/source/plugindocs/oauth.rst b/docs/source/plugindocs/oauth.rst
deleted file mode 100644
index 0685c9d1..00000000
--- a/docs/source/plugindocs/oauth.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../../mediagoblin/plugins/oauth/README.rst
diff --git a/docs/source/siteadmin/configuration.rst b/docs/source/siteadmin/configuration.rst
index 3da5cdd9..dd0d6cd9 100644
--- a/docs/source/siteadmin/configuration.rst
+++ b/docs/source/siteadmin/configuration.rst
@@ -109,6 +109,34 @@ they sound like.
 - email_smtp_user
 - email_smtp_pass
 
+Changing data directory
+-----------------------
+
+MediaGoblin by default stores your data in wherever ``data_basedir``.
+This can be changed by changing the value in your ``mediagoblin.ini`` file
+for example::
+
+    [DEFAULT]
+    data_basedir = "/var/mediagoblin/user_data"
+
+For efficiency reasons MediaGoblin doesn't serve these files itself and
+instead leaves that to the webserver. You will have to alter the location
+to match the path in ``data_basedir``.
+
+If you use ``lazyserver.sh`` you need to change the ``paste.ini`` file::
+
+    [app:mediagoblin]
+    /mgoblin_media = /var/mediagoblin/user_data
+
+If you use nginx you need to change the config::
+
+     # Instance specific media:
+     location /mgoblin_media/ {
+         alias /var/mediagoblin/user_data;
+     }
+
+Once you have done this you will need to move any existing media you had in the
+old directory to the new directory so existing media still can be displayed.
 
 All other configuration changes
 -------------------------------
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 350f91ec..af36728c 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -45,7 +45,7 @@ Dependencies
 
 MediaGoblin has the following core dependencies:
 
-- Python 2.6 or 2.7
+- Python 2.7
 - `python-lxml <http://lxml.de/>`_
 - `git <http://git-scm.com/>`_
 - `SQLite <http://www.sqlite.org/>`_/`PostgreSQL <http://www.postgresql.org/>`_
@@ -193,26 +193,14 @@ Change to the MediaGoblin directory that you just created::
 
 Clone the MediaGoblin repository and set up the git submodules::
 
-    git clone https://gitorious.org/mediagoblin/mediagoblin.git
+    git clone https://gitorious.org/mediagoblin/mediagoblin.git -b stable
     cd mediagoblin
     git submodule init && git submodule update
 
 
-And set up the in-package virtualenv::
+Set up the hacking environment::
 
-    (virtualenv --python=python2 --system-site-packages . || virtualenv --python=python2 .) && ./bin/python setup.py develop
-
-.. note::
-
-   We presently have an **experimental** make-style deployment system.  if
-   you'd like to try it, instead of the above command, you can run::
-
-     ./experimental-bootstrap.sh && ./configure && make
-
-   This also includes a number of nice features, such as keeping your
-   viratualenv up to date by simply running `make update`.
-
-   Note: this is liable to break.  Use this method with caution.
+    ./bootstrap.sh && ./configure && make
 
 The above provides an in-package install of ``virtualenv``. While this
 is counter to the conventional ``virtualenv`` configuration, it is
@@ -384,6 +372,18 @@ this ``nginx.conf`` file should be modeled on the following::
      }
     }
 
+The first four ``location`` directives instruct Nginx to serve the
+static and uploaded files directly rather than through the MediaGoblin
+process. This approach is faster and requires less memory.
+
+.. note::
+
+   The user who owns the Nginx process, normally ``www-data``,
+   requires execute permission on the directories ``static``,
+   ``public``, ``theme_static`` and ``plugin_static`` plus all their
+   parent directories. This user also requires read permission on all
+   the files within these directories. This is normally the default.
+
 Now, nginx instance is configured to serve the MediaGoblin
 application. Perform a quick test to ensure that this configuration
 works. Restart nginx so it picks up your changes, with a command that
@@ -429,3 +429,7 @@ Security Considerations
    and restart the server, so that it creates a new secret key.
    All previous sessions will be invalidated.
 
+..
+   Local variables:
+   fill-column: 70
+   End:
diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst
index f8030081..7d9f72b0 100644
--- a/docs/source/siteadmin/media-types.rst
+++ b/docs/source/siteadmin/media-types.rst
@@ -79,12 +79,15 @@ good/bad/ugly).  On Debianoid systems
 
 .. code-block:: bash
 
-    sudo apt-get install python-gst0.10 \
-        gstreamer0.10-plugins-base \
-        gstreamer0.10-plugins-bad \
-        gstreamer0.10-plugins-good \
-        gstreamer0.10-plugins-ugly \
-        gstreamer0.10-ffmpeg
+    sudo apt-get install python-gi python3-gi \
+        gstreamer1.0-tools \
+        gir1.2-gstreamer-1.0 \
+        gir1.2-gst-plugins-base-1.0 \
+        gstreamer1.0-plugins-good \
+        gstreamer1.0-plugins-ugly \
+        gstreamer1.0-plugins-bad \
+        gstreamer1.0-libav \
+        python-gst-1.0
 
 
 Add ``[[mediagoblin.media_types.video]]`` under the ``[plugins]`` section in
@@ -206,7 +209,7 @@ It may work on some earlier versions, but that is not guaranteed (and
 is surely not to work prior to Blender 2.5X).
 
 Add ``[[mediagoblin.media_types.stl]]`` under the ``[plugins]`` section in your
-``mediagoblin_local.ini`` and restart MediaGoblin. 
+``mediagoblin_local.ini`` and restart MediaGoblin.
 
 Run
 
@@ -255,7 +258,7 @@ This feature has been tested on Fedora with:
 It may work on some earlier versions, but that is not guaranteed.
 
 Add ``[[mediagoblin.media_types.pdf]]`` under the ``[plugins]`` section in your
-``mediagoblin_local.ini`` and restart MediaGoblin. 
+``mediagoblin_local.ini`` and restart MediaGoblin.
 
 Run
 
diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst
index 16899a0b..91c11eec 100644
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@ -69,7 +69,7 @@ That's it, probably!  If you run into problems, don't hesitate to
 - Removed a false download link from setup.py
 
 0.7.0
-====
+=====
 
 **Do this to upgrade**
 
diff --git a/extlib/README b/extlib/README
index 45ee5b46..d2ef18d3 100644
--- a/extlib/README
+++ b/extlib/README
@@ -2,6 +2,48 @@
  External Library README
 =========================
 
+This directory contains two kinds of things: external dependencies
+specified in package.json (which gets installed into the node_modules
+directory), and full copies of third-party code, which we call
+embedded code copies.
+
+
+External dependencies specified in package.json
+===============================================
+
+package.json is a file that specifies external code dependencies. We
+download those using the "npm" tool. As a developer of MediaGoblin,
+install npm however is convenient for you (for example, apt-get
+install npm).
+
+If you are "merely installing" MediaGoblin (and aren't attempting to
+change its code), you should know that the MediaGoblin team's main
+release download, also known as the MediaGoblin mulltipack tarball,
+contains a copy of all the code specified via package.json.
+
+As a general rule, always specify dependencies in package.json using
+"==" to pin to a specific release that you have tested MediaGoblin
+with. The MediaGoblin team always welcomes patches that merely change
+the version of a dependency so long as you have tested that the app
+works. Doing this is a valuable and significant contribution to the
+project.
+
+Other notes about the contents of package.json:
+
+* Inconsolata is available in the npm repositories, but it does not
+  include the OTF font format, and at the time of writing it appears
+  that PIL needs OTF/TTF and cannot accept a WOFF font file. For this
+  reason, we have avoided using the Inconsolata package from npm.
+
+* Lato is available in NPM as connect-fonts-lato, but the font file
+  has a different hash than the file currently in extlib, so we are
+  sticking with our extlib version until someone has time to test
+  the NPM version. (That could be you!)
+
+
+Embedded code copies
+====================
+
 DO NOT "FIX" CODE IN THIS DIRECTORY.
 
 ONLY UPSTREAM VERSIONS OF SOFTWARE GO IN THIS DIRECTORY.
diff --git a/extlib/html5slider/html5slider.js b/extlib/html5slider/html5slider.js
deleted file mode 100644
index e69c3d2b..00000000
--- a/extlib/html5slider/html5slider.js
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
-html5slider - a JS implementation of <input type=range> for Firefox 4 and up
-https://github.com/fryn/html5slider
-
-Copyright (c) 2010-2011 Frank Yan, <http://frankyan.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-(function() {
-
-// test for native support
-var test = document.createElement('input');
-try {
-  test.type = 'range';
-  if (test.type == 'range')
-    return;
-} catch (e) {
-  return;
-}
-
-// test for required property support
-if (!document.mozSetImageElement || !('MozAppearance' in test.style))
-  return;
-
-var scale;
-var isMac = navigator.platform == 'MacIntel';
-var thumb = {
-  radius: isMac ? 9 : 6,
-  width: isMac ? 22 : 12,
-  height: isMac ? 16 : 20
-};
-var track = '-moz-linear-gradient(top, transparent ' + (isMac ?
-  '6px, #999 6px, #999 7px, #ccc 9px, #bbb 11px, #bbb 12px, transparent 12px' :
-  '9px, #999 9px, #bbb 10px, #fff 11px, transparent 11px') +
-  ', transparent)';
-var styles = {
-  'min-width': thumb.width + 'px',
-  'min-height': thumb.height + 'px',
-  'max-height': thumb.height + 'px',
-  padding: 0,
-  border: 0,
-  'border-radius': 0,
-  cursor: 'default',
-  'text-indent': '-999999px' // -moz-user-select: none; breaks mouse capture
-};
-var onChange = document.createEvent('HTMLEvents');
-onChange.initEvent('change', true, false);
-
-if (document.readyState == 'loading')
-  document.addEventListener('DOMContentLoaded', initialize, true);
-else
-  initialize();
-
-function initialize() {
-  // create initial sliders
-  Array.forEach(document.querySelectorAll('input[type=range]'), transform);
-  // create sliders on-the-fly
-  document.addEventListener('DOMNodeInserted', onNodeInserted, true);
-}
-
-function onNodeInserted(e) {
-  check(e.target);
-  if (e.target.querySelectorAll)
-    Array.forEach(e.target.querySelectorAll('input'), check);
-}
-
-function check(input, async) {
-  if (input.localName != 'input' || input.type == 'range');
-  else if (input.getAttribute('type') == 'range')
-    transform(input);
-  else if (!async)
-    setTimeout(check, 0, input, true);
-}
-
-function transform(slider) {
-
-  var isValueSet, areAttrsSet, isChanged, isClick, prevValue, rawValue, prevX;
-  var min, max, step, range, value = slider.value;
-
-  // lazily create shared slider affordance
-  if (!scale) {
-    scale = document.body.appendChild(document.createElement('hr'));
-    style(scale, {
-      '-moz-appearance': isMac ? 'scale-horizontal' : 'scalethumb-horizontal',
-      display: 'block',
-      visibility: 'visible',
-      opacity: 1,
-      position: 'fixed',
-      top: '-999999px'
-    });
-    document.mozSetImageElement('__sliderthumb__', scale);
-  }
-
-  // reimplement value and type properties
-  var getValue = function() { return '' + value; };
-  var setValue = function setValue(val) {
-    value = '' + val;
-    isValueSet = true;
-    draw();
-    delete slider.value;
-    slider.value = value;
-    slider.__defineGetter__('value', getValue);
-    slider.__defineSetter__('value', setValue);
-  };
-  slider.__defineGetter__('value', getValue);
-  slider.__defineSetter__('value', setValue);
-  slider.__defineGetter__('type', function() { return 'range'; });
-
-  // sync properties with attributes
-  ['min', 'max', 'step'].forEach(function(prop) {
-    if (slider.hasAttribute(prop))
-      areAttrsSet = true;
-    slider.__defineGetter__(prop, function() {
-      return this.hasAttribute(prop) ? this.getAttribute(prop) : '';
-    });
-    slider.__defineSetter__(prop, function(val) {
-      val === null ? this.removeAttribute(prop) : this.setAttribute(prop, val);
-    });
-  });
-
-  // initialize slider
-  slider.readOnly = true;
-  style(slider, styles);
-  update();
-
-  slider.addEventListener('DOMAttrModified', function(e) {
-    // note that value attribute only sets initial value
-    if (e.attrName == 'value' && !isValueSet) {
-      value = e.newValue;
-      draw();
-    }
-    else if (~['min', 'max', 'step'].indexOf(e.attrName)) {
-      update();
-      areAttrsSet = true;
-    }
-  }, true);
-
-  slider.addEventListener('mousedown', onDragStart, true);
-  slider.addEventListener('keydown', onKeyDown, true);
-  slider.addEventListener('focus', onFocus, true);
-  slider.addEventListener('blur', onBlur, true);
-
-  function onDragStart(e) {
-    isClick = true;
-    setTimeout(function() { isClick = false; }, 0);
-    if (e.button || !range)
-      return;
-    var width = parseFloat(getComputedStyle(this, 0).width);
-    var multiplier = (width - thumb.width) / range;
-    if (!multiplier)
-      return;
-    // distance between click and center of thumb
-    var dev = e.clientX - this.getBoundingClientRect().left - thumb.width / 2 -
-              (value - min) * multiplier;
-    // if click was not on thumb, move thumb to click location
-    if (Math.abs(dev) > thumb.radius) {
-      isChanged = true;
-      this.value -= -dev / multiplier;
-    }
-    rawValue = value;
-    prevX = e.clientX;
-    this.addEventListener('mousemove', onDrag, true);
-    this.addEventListener('mouseup', onDragEnd, true);
-  }
-
-  function onDrag(e) {
-    var width = parseFloat(getComputedStyle(this, 0).width);
-    var multiplier = (width - thumb.width) / range;
-    if (!multiplier)
-      return;
-    rawValue += (e.clientX - prevX) / multiplier;
-    prevX = e.clientX;
-    isChanged = true;
-    this.value = rawValue;
-  }
-
-  function onDragEnd() {
-    this.removeEventListener('mousemove', onDrag, true);
-    this.removeEventListener('mouseup', onDragEnd, true);
-  }
-
-  function onKeyDown(e) {
-    if (e.keyCode > 36 && e.keyCode < 41) { // 37-40: left, up, right, down
-      onFocus.call(this);
-      isChanged = true;
-      this.value = value + (e.keyCode == 38 || e.keyCode == 39 ? step : -step);
-    }
-  }
-
-  function onFocus() {
-    if (!isClick)
-      this.style.boxShadow = !isMac ? '0 0 0 2px #fb0' :
-        '0 0 2px 1px -moz-mac-focusring, inset 0 0 1px -moz-mac-focusring';
-  }
-
-  function onBlur() {
-    this.style.boxShadow = '';
-  }
-
-  // determines whether value is valid number in attribute form
-  function isAttrNum(value) {
-    return !isNaN(value) && +value == parseFloat(value);
-  }
-
-  // validates min, max, and step attributes and redraws
-  function update() {
-    min = isAttrNum(slider.min) ? +slider.min : 0;
-    max = isAttrNum(slider.max) ? +slider.max : 100;
-    if (max < min)
-      max = min > 100 ? min : 100;
-    step = isAttrNum(slider.step) && slider.step > 0 ? +slider.step : 1;
-    range = max - min;
-    draw(true);
-  }
-
-  // recalculates value property
-  function calc() {
-    if (!isValueSet && !areAttrsSet)
-      value = slider.getAttribute('value');
-    if (!isAttrNum(value))
-      value = (min + max) / 2;;
-    // snap to step intervals (WebKit sometimes does not - bug?)
-    value = Math.round((value - min) / step) * step + min;
-    if (value < min)
-      value = min;
-    else if (value > max)
-      value = min + ~~(range / step) * step;
-  }
-
-  // renders slider using CSS background ;)
-  function draw(attrsModified) {
-    calc();
-    if (isChanged && value != prevValue)
-      slider.dispatchEvent(onChange);
-    isChanged = false;
-    if (!attrsModified && value == prevValue)
-      return;
-    prevValue = value;
-    var position = range ? (value - min) / range * 100 : 0;
-    var bg = '-moz-element(#__sliderthumb__) ' + position + '% no-repeat, ';
-    style(slider, { background: bg + track });
-  }
-
-}
-
-function style(element, styles) {
-  for (var prop in styles)
-    element.style.setProperty(prop, styles[prop], 'important');
-}
-
-})();
diff --git a/extlib/jquery/MIT-LICENSE.txt b/extlib/jquery/MIT-LICENSE.txt
deleted file mode 100644
index 957f26d3..00000000
--- a/extlib/jquery/MIT-LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright 2013 jQuery Foundation and other contributors
-http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/extlib/jquery/jquery.js b/extlib/jquery/jquery.js
deleted file mode 100644
index 198b3ff0..00000000
--- a/extlib/jquery/jquery.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.1 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
-f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
-{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/extlib/leaflet/CHANGELOG.md b/extlib/leaflet/CHANGELOG.md
deleted file mode 100644
index 49ebfe24..00000000
--- a/extlib/leaflet/CHANGELOG.md
+++ /dev/null
@@ -1,88 +0,0 @@
-Leaflet Changelog
-=================
-
-## 0.3 (master)
-
-## 0.2.1 (2011-06-18)
-
- * Fixed regression that caused error in `TileLayer.Canvas`
-
-## 0.2 (2011-06-17)
-
-### Major features
-
- * Added **WMS** support (`TileLayer.WMS` layer).
- * Added different **projections** support, having `EPSG:3857`, `EPSG:4326` and `EPSG:3395` out of the box (through `crs` option in `Map`). Thanks to [@Miroff](https://github.com/Miroff) & [@Komzpa](https://github.com/Komzpa) for great advice and explanation regarding this.
- * Added **GeoJSON** layer support.
- 
-### Improvements
- 
-#### Usability improvements
- 
- * Improved panning performance in Chrome and FF considerably with the help of `requestAnimationFrame`. [#130](https://github.com/CloudMade/Leaflet/issues/130)
- * Improved click responsiveness in mobile WebKit (now it happens without delay). [#26](https://github.com/CloudMade/Leaflet/issues/26)
- * Added tap tolerance (so click happens even if you moved your finger slighly when tapping).
- * Improved geolocation error handling: better error messages, explicit timeout, set world view on locateAndSetView failure. [#61](https://github.com/CloudMade/Leaflet/issues/61)
- 
-#### API improvements
-
- * Added **MultiPolyline** and **MultiPolygon** layers. [#77](https://github.com/CloudMade/Leaflet/issues/77) 
- * Added **LayerGroup** and **FeatureGroup** layers for grouping other layers.
- * Added **TileLayer.Canvas** for easy creation of canvas-based tile layers.
- * Changed `Circle` to be zoom-dependent (with radius in meters); circle of a permanent size is now called `CircleMarker`.
- * Added `mouseover` and `mouseout` events to map, markers and paths; added map `mousemove` event.
- * Added `setLatLngs`, `spliceLatLngs`, `addLatLng`, `getLatLngs` methods to polylines and polygons.
- * Added `setLatLng` and `setRadius` methods to `Circle` and `CircleMarker`.
- * Improved `LatLngBounds contains` method to accept `LatLng` in addition to `LatLngBounds`, the same for `Bounds contains` and `Point` 
- * Improved `LatLngBounds` & `Bounds` to allow their instantiation without arguments (by [@snc](https://github.com/snc)).
- * Added TMS tile numbering support through `TileLayer` `scheme: 'tms'` option (by [@tmcw](https://github.com/tmcw)).
- * Added `TileLayer` `noWrap` option to disable wrapping `x` tile coordinate (by [@jasondavies](https://github.com/jasondavies)).
- * Added `opacity` option and `setOpacity` method to `TileLayer`.
- * Added `setLatLng` and `setIcon` methods to `Marker`.
- * Added `title` option to `Marker`.
- * Added `maxZoom` argument to `map.locateAndSetView` method.
- * Added ability to pass Geolocation options to map `locate` and `locateAndSetView` methods (by [@JasonSanford](https://github.com/JasonSanford)).
- * Improved `Popup` to accept HTML elements in addition to strings as its content.
- 
-#### Development workflow improvements
- 
- * Added `Makefile` for building `leaflet.js` on non-Windows machines (by [@tmcw](https://github.com/tmcw)).
- * Improved `debug/leaflet-include.js` script to allow using it outside of `debug` folder (by [@antonj](https://github.com/antonj)).
- * Improved `L` definition to be compatible with CommonJS. [#122](https://github.com/CloudMade/Leaflet/issues/122)
- 
-### Bug fixes
- 
-#### General bugfixes
-
- * Fixed a bug where zooming is broken if the map contains a polygon and you zoom to an area where it's not visible. [#47](https://github.com/CloudMade/Leaflet/issues/47)
- * Fixed a bug where closed polylines would not appear on the map.
- * Fixed a bug where marker that was added, removed and then added again would not appear on the map. [#66](https://github.com/CloudMade/Leaflet/issues/66)
- * Fixed a bug where tile layer that was added, removed and then added again would not appear on the map.
- * Fixed a bug where some tiles would not load when panning across the date line. [#97](https://github.com/CloudMade/Leaflet/issues/97)
- * Fixed a bug where map div with `position: absolute` is reset to `relative`. [#100](https://github.com/CloudMade/Leaflet/issues/100) 
- * Fixed a bug that caused an error when trying to add a marker without shadow in its icon.
- * Fixed a bug where popup content would not update on `setContent` call. [#94](https://github.com/CloudMade/Leaflet/issues/94)
- * Fixed a bug where double click zoom wouldn't work if popup is opened on map click
- * Fixed a bug with click propagation on popup close button. [#99](https://github.com/CloudMade/Leaflet/issues/99)
- * Fixed inability to remove ImageOverlay layer.
- 
-#### Browser bugfixes
- 
- * Fixed a bug where paths would not appear in IE8. 
- * Fixed a bug where there were occasional slowdowns before zoom animation in WebKit. [#123](https://github.com/CloudMade/Leaflet/issues/123)
- * Fixed incorrect zoom animation & popup styling in Opera 11.11.
- * Fixed popup fade animation in Firefox and Opera.
- * Fixed a bug where map isn't displayed in Firefox when there's an `img { max-width: 100% }` rule.
-
-#### Mobile browsers bugfixes
-
- * Fixed a bug that prevented panning on some Android 2.1 (and possibly older) devices. [#84](https://github.com/CloudMade/Leaflet/issues/84)
- * Disabled zoom animation on Android by default because it's buggy on some devices (will be enabled back when it's stable enough). [#32](https://github.com/CloudMade/Leaflet/issues/32)
- * Fixed a bug where map would occasionally break while multi-touch-zooming on iOS. [#32](https://github.com/CloudMade/Leaflet/issues/32)
- * Fixed a bug that prevented panning/clicking on Android 3 tablets. [#121](https://github.com/CloudMade/Leaflet/issues/121)
- * Fixed a bug that prevented panning/clicking on Opera Mobile. [#138](https://github.com/CloudMade/Leaflet/issues/138)
- * Fixed potentional memory leak on WebKit when removing tiles, thanks to [@Scalar4eg](https://github.com/Scalar4eg). [#107](https://github.com/CloudMade/Leaflet/issues/107)
-
-## 0.1 (2011-05-13)
-
- * Initial Leaflet release.
diff --git a/extlib/leaflet/LICENSE b/extlib/leaflet/LICENSE
deleted file mode 100644
index 883dc212..00000000
--- a/extlib/leaflet/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2010-2011, CloudMade, Vladimir Agafonkin

-All rights reserved. 

-

-Redistribution and use in source and binary forms, with or without modification, are 

-permitted provided that the following conditions are met: 

-

-   1. Redistributions of source code must retain the above copyright notice, this list of 

-      conditions and the following disclaimer. 

-	  

-   2. Redistributions in binary form must reproduce the above copyright notice, this list 

-      of conditions and the following disclaimer in the documentation and/or other materials

-      provided with the distribution. 

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 

-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 

-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 

-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 

-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 

-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 

-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 

-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/extlib/leaflet/README.md b/extlib/leaflet/README.md
deleted file mode 100644
index b6caae96..00000000
--- a/extlib/leaflet/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<img src="http://leaflet.cloudmade.com/docs/images/logo.png" alt="Leaflet" />

-

-Leaflet is a modern, lightweight BSD-licensed JavaScript library for making tile-based interactive maps for both desktop and mobile web browsers, developed by [CloudMade](http://cloudmade.com) to form the core of its next generation JavaScript API.

-

-It is built from the ground up to work efficiently and smoothly on both platforms, utilizing cutting-edge technologies included in HTML5. Its top priorities are usability, performance and small size, [A-grade](http://developer.yahoo.com/yui/articles/gbs/) browser support, flexibility and easy to use API. The OOP-based code of the library is designed to be modular, extensible and very easy to understand.

-

-Check out the website for more information: [leaflet.cloudmade.com](http://leaflet.cloudmade.com)

-

-## Contributing to Leaflet

-Let's make the best open-source library for maps that can possibly exist! Please send your pull requests to [Vladimir Agafonkin](http://github.com/mourner) (Leaflet maintainer) - we'll be happy to accept your contributions! [List of Leaflet contributors](http://github.com/CloudMade/Leaflet/contributors)
\ No newline at end of file
diff --git a/extlib/leaflet/build/Makefile b/extlib/leaflet/build/Makefile
deleted file mode 100644
index 22d65483..00000000
--- a/extlib/leaflet/build/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-../dist/leaflet.js: Makefile

-	java -jar ../lib/closure-compiler/compiler.jar \

-	--js ../src/Leaflet.js \

-	--js ../src/core/Util.js \

-	--js ../src/core/Class.js \

-	--js ../src/core/Events.js \

-	--js ../src/core/Browser.js \

-	--js ../src/geometry/Point.js \

-	--js ../src/geometry/Bounds.js \

-	--js ../src/geometry/Transformation.js \

-	--js ../src/geometry/LineUtil.js \

-	--js ../src/geometry/PolyUtil.js \

-	--js ../src/dom/DomEvent.js \

-	--js ../src/dom/DomEvent.DoubleTap.js \

-	--js ../src/dom/DomUtil.js \

-	--js ../src/dom/Draggable.js \

-	--js ../src/dom/transition/Transition.js \

-	--js ../src/dom/transition/Transition.Native.js \

-	--js ../src/dom/transition/Transition.Timer.js \

-	--js ../src/geo/LatLng.js \

-	--js ../src/geo/LatLngBounds.js \

-	--js ../src/geo/projection/Projection.js \

-	--js ../src/geo/projection/Projection.SphericalMercator.js \

-	--js ../src/geo/projection/Projection.LonLat.js \

-	--js ../src/geo/projection/Projection.Mercator.js \

-	--js ../src/geo/crs/CRS.js \

-	--js ../src/geo/crs/CRS.EPSG3857.js \

-	--js ../src/geo/crs/CRS.EPSG4326.js \

-	--js ../src/geo/crs/CRS.EPSG3395.js \

-	--js ../src/layer/LayerGroup.js \

-	--js ../src/layer/FeatureGroup.js \

-	--js ../src/layer/tile/TileLayer.js \

-	--js ../src/layer/tile/TileLayer.WMS.js \

-	--js ../src/layer/tile/TileLayer.Canvas.js \

-	--js ../src/layer/ImageOverlay.js \

-	--js ../src/layer/Popup.js \

-	--js ../src/layer/marker/Icon.js \

-	--js ../src/layer/marker/Marker.js \

-	--js ../src/layer/marker/Marker.Popup.js \

-	--js ../src/layer/vector/Path.js \

-	--js ../src/layer/vector/Path.VML.js \

-	--js ../src/layer/vector/Path.Popup.js \

-	--js ../src/layer/vector/Polyline.js \

-	--js ../src/layer/vector/Polygon.js \

-	--js ../src/layer/vector/MultiPoly.js \

-	--js ../src/layer/vector/Circle.js \

-	--js ../src/layer/vector/CircleMarker.js \

-	--js ../src/layer/GeoJSON.js \

-	--js ../src/handler/Handler.js \

-	--js ../src/handler/MapDrag.js \

-	--js ../src/handler/TouchZoom.js \

-	--js ../src/handler/ScrollWheelZoom.js \

-	--js ../src/handler/DoubleClickZoom.js \

-	--js ../src/handler/ShiftDragZoom.js \

-	--js ../src/handler/MarkerDrag.js \

-	--js ../src/control/Control.js \

-	--js ../src/control/Control.Zoom.js \

-	--js ../src/control/Control.Attribution.js \

-	--js ../src/map/Map.js \

-	--js ../src/map/ext/Map.Geolocation.js \

-	--js ../src/map/ext/Map.Popup.js \

-	--js ../src/map/ext/Map.PanAnimation.js \

-	--js ../src/map/ext/Map.ZoomAnimation.js \

-	--js ../src/map/ext/Map.Control.js \

-	--js_output_file ../dist/leaflet.js

diff --git a/extlib/leaflet/build/build.bat b/extlib/leaflet/build/build.bat
deleted file mode 100644
index a09d2259..00000000
--- a/extlib/leaflet/build/build.bat
+++ /dev/null
@@ -1,65 +0,0 @@
-@echo off

-java -jar ../lib/closure-compiler/compiler.jar ^

---js ../src/Leaflet.js ^

---js ../src/core/Util.js ^

---js ../src/core/Class.js ^

---js ../src/core/Events.js ^

---js ../src/core/Browser.js ^

---js ../src/geometry/Point.js ^

---js ../src/geometry/Bounds.js ^

---js ../src/geometry/Transformation.js ^

---js ../src/geometry/LineUtil.js ^

---js ../src/geometry/PolyUtil.js ^

---js ../src/dom/DomEvent.js ^

---js ../src/dom/DomEvent.DoubleTap.js ^

---js ../src/dom/DomUtil.js ^

---js ../src/dom/Draggable.js ^

---js ../src/dom/transition/Transition.js ^

---js ../src/dom/transition/Transition.Native.js ^

---js ../src/dom/transition/Transition.Timer.js ^

---js ../src/geo/LatLng.js ^

---js ../src/geo/LatLngBounds.js ^

---js ../src/geo/projection/Projection.js ^

---js ../src/geo/projection/Projection.SphericalMercator.js ^

---js ../src/geo/projection/Projection.LonLat.js ^

---js ../src/geo/projection/Projection.Mercator.js ^

---js ../src/geo/crs/CRS.js ^

---js ../src/geo/crs/CRS.EPSG3857.js ^

---js ../src/geo/crs/CRS.EPSG4326.js ^

---js ../src/geo/crs/CRS.EPSG3395.js ^

---js ../src/layer/LayerGroup.js ^

---js ../src/layer/FeatureGroup.js ^

---js ../src/layer/tile/TileLayer.js ^

---js ../src/layer/tile/TileLayer.WMS.js ^

---js ../src/layer/tile/TileLayer.Canvas.js ^

---js ../src/layer/ImageOverlay.js ^

---js ../src/layer/Popup.js ^

---js ../src/layer/marker/Icon.js ^

---js ../src/layer/marker/Marker.js ^

---js ../src/layer/marker/Marker.Popup.js ^

---js ../src/layer/vector/Path.js ^

---js ../src/layer/vector/Path.VML.js ^

---js ../src/layer/vector/Path.Popup.js ^

---js ../src/layer/vector/Polyline.js ^

---js ../src/layer/vector/Polygon.js ^

---js ../src/layer/vector/MultiPoly.js ^

---js ../src/layer/vector/Circle.js ^

---js ../src/layer/vector/CircleMarker.js ^

---js ../src/layer/GeoJSON.js ^

---js ../src/handler/Handler.js ^

---js ../src/handler/MapDrag.js ^

---js ../src/handler/TouchZoom.js ^

---js ../src/handler/ScrollWheelZoom.js ^

---js ../src/handler/DoubleClickZoom.js ^

---js ../src/handler/ShiftDragZoom.js ^

---js ../src/handler/MarkerDrag.js ^

---js ../src/control/Control.js ^

---js ../src/control/Control.Zoom.js ^

---js ../src/control/Control.Attribution.js ^

---js ../src/map/Map.js ^

---js ../src/map/ext/Map.Geolocation.js ^

---js ../src/map/ext/Map.Popup.js ^

---js ../src/map/ext/Map.PanAnimation.js ^

---js ../src/map/ext/Map.ZoomAnimation.js ^

---js ../src/map/ext/Map.Control.js ^

---js_output_file ../dist/leaflet.js
\ No newline at end of file
diff --git a/extlib/leaflet/build/build.html b/extlib/leaflet/build/build.html
deleted file mode 100644
index c60e5f31..00000000
--- a/extlib/leaflet/build/build.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet Build Helper</title>

-	

-	<script type="text/javascript" src="deps.js"></script>

-	

-	<style type="text/css">

-		body {

-			font: 12px/1.4 Verdana, sans-serif;

-			text-align: center;

-			padding: 2em 0;

-		}

-		#container {

-			text-align: left;

-			margin: 0 auto;

-			width: 600px;

-		}

-		#deplist {

-			list-style: none;

-			padding: 0;

-		}

-		#deplist li {

-			padding-top: 10px;

-			padding-bottom: 10px;

-			border-top: 1px solid #eee;

-		}

-		#deplist li.heading {

-			border: none;

-			background: #eee;

-			padding: 5px 10px;

-			margin-top: 10px;

-		}

-		#deplist input {

-			float: left;

-			margin-right: 5px;

-			display: inline;

-		}

-		#deplist label {

-			float: left;

-			width: 190px;

-			font-weight: bold;

-		}

-		#deplist div {

-			display: table-cell;

-			height: 1%;

-		}

-		#deplist .desc {

-		} 

-		

-		#deplist .deps {

-			color: #777;

-		}

-		

-		#command {

-			width: 100%;

-		}

-	</style>

-</head>

-<body>

-	<div id="container">

-		<h1>Leaflet Build Helper</h1>

-		

-		<p>

-			<a id="select-all" href="#all">Select All</a> | 

-			<a id="deselect-all" href="#none">Deselect All</a>

-		</p>

-		

-		<ul id="deplist"></ul>

-		

-		<p>

-			Run this command in the build directory:<br />

-			<input type="text" id="command" />

-		</p>

-	</div>

-	

-	<script type="text/javascript">

-		var deplist = document.getElementById('deplist'),

-			commandInput = document.getElementById('command');

-		

-		document.getElementById('select-all').onclick = function() {

-			var checks = deplist.getElementsByTagName('input');

-			for (var i = 0; i < checks.length; i++) {

-				checks[i].checked = true;

-			}

-			updateCommand();

-			return false;

-		};

-		

-		document.getElementById('deselect-all').onclick = function() {

-			var checks = deplist.getElementsByTagName('input');

-			for (var i = 0; i < checks.length; i++) {

-				if (!checks[i].disabled) {

-					checks[i].checked = false;

-				}

-			}

-			updateCommand();

-			return false;

-		};

-		

-		function updateCommand() {

-			var files = {};

-			var checks = deplist.getElementsByTagName('input');

-			for (var i = 0; i < checks.length; i++) {

-				if (checks[i].checked) {

-					var srcs = deps[checks[i].id].src;

-					for (var j = 0; j < srcs.length; j++) {

-						files[srcs[j]] = true;

-					}

-				}

-			}

-			

-			var command = 'java -jar ../lib/closure-compiler/compiler.jar ';

-			for (var src in files) {

-				command += '--js ../src/' + src + ' ';

-			}

-			command += '--js_output_file ../dist/leaflet-custom.js';

-			

-			commandInput.value = command;

-		}

-		

-		commandInput.onclick = function() {

-			commandInput.focus();

-			commandInput.select();

-		};

-		

-		function onCheckboxChange() {

-			if (this.checked) {

-				var depDeps = deps[this.id].deps;

-				if (!depDeps) { return; }

-				for (var i = 0; i < depDeps.length; i++) {

-					var check = document.getElementById(depDeps[i]);

-					if (!check.checked) {

-						check.checked = true;

-						check.onchange();

-					}

-				}

-			} else {

-				var checks = deplist.getElementsByTagName('input');

-				for (var i = 0; i < checks.length; i++) {

-					var dep = deps[checks[i].id];

-					if (!dep.deps) { continue; }

-					for (var j = 0; j < dep.deps.length; j++) {

-						if (dep.deps[j] == this.id) {

-							if (checks[i].checked) {

-								checks[i].checked = false;

-								checks[i].onchange();

-							}

-						}

-					}

-				}

-			}

-			updateCommand();

-		}

-	

-		for (var name in deps) {

-			var li = document.createElement('li');

-			

-			if (deps[name].heading) {

-				var heading = document.createElement('li');

-				heading.className = 'heading';

-				heading.appendChild(document.createTextNode(deps[name].heading));

-				deplist.appendChild(heading);

-			}

-			

-			var div = document.createElement('div');

-

-			var label = document.createElement('label');

-

-			var check = document.createElement('input');

-			check.type = 'checkbox';

-			check.id = name;

-			label.appendChild(check);

-			check.onchange = onCheckboxChange;

-			

-			if (name == 'Core') {

-				check.checked = true;

-				check.disabled = true;

-			}

-			

-			label.appendChild(document.createTextNode(name));

-			label.htmlFor = name;

-			

-			li.appendChild(label);

-			

-			var desc = document.createElement('span');

-			desc.className = 'desc';

-			desc.appendChild(document.createTextNode(deps[name].desc));

-

-			var depText = deps[name].deps && deps[name].deps.join(', ');

-			if (depText) {

-				var depspan = document.createElement('span');

-				depspan.className = 'deps';

-				depspan.appendChild(document.createTextNode('Deps: ' + depText));

-			}

-			

-			div.appendChild(desc);

-			div.appendChild(document.createElement('br'));

-			if (depText) { div.appendChild(depspan); }

-			

-			li.appendChild(div);

-			

-			deplist.appendChild(li);

-		}

-		updateCommand();

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/build/deps.js b/extlib/leaflet/build/deps.js
deleted file mode 100644
index 42735648..00000000
--- a/extlib/leaflet/build/deps.js
+++ /dev/null
@@ -1,211 +0,0 @@
-var deps = {

-	Core: {

-		src: ['Leaflet.js',

-		      'core/Browser.js', 

-		      'core/Class.js', 

-		      'core/Events.js', 

-		      'core/Util.js',

-		      'dom/DomUtil.js',

-		      'geo/LatLng.js',

-		      'geo/LatLngBounds.js',

-		      'geo/projection/Projection.js',

-		      'geo/projection/Projection.SphericalMercator.js',

-		      'geo/projection/Projection.LonLat.js',

-		      'geo/crs/CRS.js',

-		      'geo/crs/CRS.EPSG3857.js',

-		      'geo/crs/CRS.EPSG4326.js',

-		      'geometry/Bounds.js',

-		      'geometry/Point.js',

-		      'geometry/Transformation.js',

-		      'map/Map.js'],

-		desc: 'The core of the library, including OOP, events, DOM facilities, basic units, projections (EPSG:3857 and EPSG:4326) and the base Map class.'

-	},

-	

-	

-	EPSG3395: {

-		src: ['geo/projection/Projection.Mercator.js',

-		      'geo/crs/CRS.EPSG3395.js'],

-		desc: 'EPSG:3395 projection (used by some map providers).',

-		heading: 'Additional projections'

-	},

-	

-	TileLayer: {

-		src: ['layer/tile/TileLayer.js'],

-		desc: 'The base class for displaying tile layers on the map.',

-		heading: 'Layers'

-	},

-	

-	TileLayerWMS: {

-		src: ['layer/tile/TileLayer.WMS.js'],

-		desc: 'WMS tile layer.',

-		deps: ['TileLayer']

-	},

-	

-	TileLayerCanvas: {

-		src: ['layer/tile/TileLayer.Canvas.js'],

-		desc: 'Tile layer made from canvases (for custom drawing purposes).',

-		deps: ['TileLayer']

-	},

-	

-	ImageOverlay: {

-		src: ['layer/ImageOverlay.js'],

-		desc: 'Used to display an image over a particular rectangular area of the map.'

-	},

-	

-	Marker: {

-		src: ['layer/marker/Icon.js', 'layer/marker/Marker.js'],

-		desc: 'Markers to put on the map.'

-	},

-	

-	Popup: {

-		src: ['layer/Popup.js', 'layer/marker/Marker.Popup.js', 'map/ext/Map.Popup.js'],

-		deps: ['Marker'],

-		desc: 'Used to display the map popup (used mostly for binding HTML data to markers and paths on click).'

-	},

-	

-	LayerGroup: {

-		src: ['layer/LayerGroup.js'],

-		desc: 'Allows grouping several layers to handle them as one.'

-	},

-	

-	FeatureGroup: {

-		src: ['layer/FeatureGroup.js'],

-		deps: ['LayerGroup', 'Popup'],

-		desc: 'Extends LayerGroup with mouse events and bindPopup method shared between layers.'

-	},

-	

-	

-	Path: {

-		src: ['layer/vector/Path.js', 'layer/vector/Path.Popup.js'],

-		desc: 'Vector rendering core (SVG-powered), enables overlaying the map with SVG paths.',

-		heading: 'Vector layers'

-	},

-	

-	PathVML: {

-		src: ['layer/vector/Path.VML.js'],

-		desc: 'VML fallback for vector rendering core (IE 6-8).'

-	},

-	

-	Polyline: {

-		src: ['geometry/LineUtil.js', 'layer/vector/Polyline.js'],

-		deps: ['Path'],

-		desc: 'Polyline overlays.'

-	},

-	

-	Polygon: {

-		src: ['geometry/PolyUtil.js', 'layer/vector/Polygon.js'],

-		deps: ['Polyline'],

-		desc: 'Polygon overlays.'

-	},

-

-	MultiPoly: {

-		src: ['layer/vector/MultiPoly.js'],

-		deps: ['FeatureGroup', 'Polyline', 'Polygon'],

-		desc: 'MultiPolygon and MultyPolyline layers.'

-	},

-

-	Circle: {

-		src: ['layer/vector/Circle.js'],

-		deps: ['Path'],

-		desc: 'Circle overlays (with radius in meters).'

-	},

-	

-	CircleMarker: {

-		src: ['layer/vector/CircleMarker.js'],

-		deps: ['Circle'],

-		desc: 'Circle overlays with a constant pixel radius.'

-	},

-	

-	GeoJSON: {

-		src: ['layer/GeoJSON.js'],

-		deps: ['Marker', 'MultiPoly', 'FeatureGroup'],

-		desc: 'GeoJSON layer, parses the data and adds corresponding layers above.'

-	},

-

-	

-	MapDrag: {

-		src: ['dom/DomEvent.js',

-		      'dom/Draggable.js',

-		      'handler/Handler.js',

-		      'handler/MapDrag.js'],

-		desc: 'Makes the map draggable (by mouse or touch).',

-		heading: 'Interaction'

-	},

-	

-	MouseZoom: {

-		src: ['dom/DomEvent.js',

-		      'handler/Handler.js',

-		      'handler/DoubleClickZoom.js',

-		      'handler/ScrollWheelZoom.js'],

-		desc: 'Scroll wheel zoom and double click zoom on the map.'

-	},

-	

-	TouchZoom: {

-		src: ['dom/DomEvent.js',

-		      'dom/DomEvent.DoubleTap.js',

-		      'handler/Handler.js',

-		      'handler/TouchZoom.js'],

-		deps: ['MapAnimationZoom'],

-		desc: 'Enables smooth touch zooming on iOS and double tap on iOS/Android.'

-	},

-	

-	ShiftDragZoom: {

-		src: ['handler/ShiftDragZoom.js'],

-		desc: 'Enables zooming to bounding box by shift-dragging the map.'

-	},

-	

-	MarkerDrag: {

-		src: ['handler/MarkerDrag.js'],

-		desc: 'Makes markers draggable (by mouse or touch).'

-	},

-		

-	

-	ControlZoom: {

-		src: ['control/Control.js', 

-		      'map/ext/Map.Control.js', 

-		      'control/Control.Zoom.js'],

-		heading: 'Controls',

-		desc: 'Basic zoom control with two buttons (zoom in / zoom out).'

-	},

-	

-	ControlZoom: {

-		src: ['control/Control.js', 

-		      'map/ext/Map.Control.js', 

-		      'control/Control.Attribution.js'],

-		desc: 'Attribution control.'

-	},

-	

-	

-	MapAnimationNative: {

-		src: ['dom/DomEvent.js',

-		      'dom/transition/Transition.js',

-		      'dom/transition/Transition.Native.js'],

-		desc: 'Animation core that uses CSS3 Transitions (for powering pan & zoom animations). Works on mobile webkit-powered browsers and some modern desktop browsers.',

-		heading: 'Visual effects'

-	},

-	

-	MapAnimationFallback: {

-		src: ['dom/transition/Transition.Timer.js'],

-		deps: ['MapAnimationNative'],

-		desc: 'Timer-based animation fallback for browsers that don\'t support CSS3 transitions.'

-	},

-	

-	MapAnimationPan: {

-		src: ['map/ext/Map.PanAnimation.js'],

-		deps: ['MapAnimationNative'],

-		desc: 'Panning animation. Can use both native and timer-based animation.'

-	},

-	

-	MapAnimationZoom: {

-		src: ['map/ext/Map.ZoomAnimation.js'],

-		deps: ['MapAnimationPan', 'MapAnimationNative'],

-		desc: 'Smooth zooming animation. So far it works only on browsers that support CSS3 Transitions.'

-	},

-	

-	

-	MapGeolocation: {

-		src: ['map/ext/Map.Geolocation.js'],

-		desc: 'Adds Map#locate method and related events to make geolocation easier.',

-		heading: 'Misc'

-	}

-};
\ No newline at end of file
diff --git a/extlib/leaflet/debug/control/map-control.html b/extlib/leaflet/debug/control/map-control.html
deleted file mode 100644
index 8d52bc98..00000000
--- a/extlib/leaflet/debug/control/map-control.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet debug page</title>

-

-	<link rel="stylesheet" href="../../dist/leaflet.css" />

-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->

-	

-	<link rel="stylesheet" href="../css/screen.css" />

-	

-	<script src="../include.js"></script>

-</head>

-<body>

-

-	<div id="map"></div>

-

-	<script type="text/javascript">

-

-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',

-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18}),

-			latlng = new L.LatLng(50.5, 30.51);

-	

-		var map = new L.Map('map').addLayer(cloudmade).setView(latlng, 15);

-		

-		var zoomControl = new L.Control.Zoom();

-		map.addControl(zoomControl);

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/debug/css/mobile.css b/extlib/leaflet/debug/css/mobile.css
deleted file mode 100644
index d8f46f32..00000000
--- a/extlib/leaflet/debug/css/mobile.css
+++ /dev/null
@@ -1,6 +0,0 @@
-html, body, #map {

-	margin: 0;

-	padding: 0;

-	width: 100%;

-	height: 100%;

-}
\ No newline at end of file
diff --git a/extlib/leaflet/debug/css/screen.css b/extlib/leaflet/debug/css/screen.css
deleted file mode 100644
index f9886987..00000000
--- a/extlib/leaflet/debug/css/screen.css
+++ /dev/null
@@ -1,5 +0,0 @@
-#map {

-	width: 800px; 

-	height: 600px; 

-	border: 1px solid #ccc;

-	}
\ No newline at end of file
diff --git a/extlib/leaflet/debug/geojson/geojson-sample.js b/extlib/leaflet/debug/geojson/geojson-sample.js
deleted file mode 100644
index 24ecf050..00000000
--- a/extlib/leaflet/debug/geojson/geojson-sample.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var geojsonSample = {

-	"type": "FeatureCollection",

-	"features": [

-		{

-			"type": "Feature",

-			"geometry": {

-				"type": "Point",

-				"coordinates": [102.0, 0.5]

-			},

-			"properties": {

-				"prop0": "value0",

-				"color": "blue"

-			}

-		},

-		 

-		{

-			"type": "Feature",

-			"geometry": {

-				"type": "LineString",

-				"coordinates": [[102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]]

-			},

-			"properties": {

-				"color": "red",

-				"prop1": 0.0

-			}

-		},

-		 

-		{

-			"type": "Feature",

-			"geometry": {

-				"type": "Polygon",

-				"coordinates": [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]]]

-			},

-			"properties": {

-				"color": "green",

-				"prop1": {

-					"this": "that"

-				}

-			}

-		},

-

-		{

-			"type": "Feature",

-			"geometry": {

-				"type": "MultiPolygon",

-				"coordinates": [[[[100.0, 1.5], [100.5, 1.5], [100.5, 2.0], [100.0, 2.0], [100.0, 1.5]]], [[[100.5, 2.0], [100.5, 2.5], [101.0, 2.5], [101.0, 2.0], [100.5, 2.0]]]]

-			}

-		}

-	]

-};
\ No newline at end of file
diff --git a/extlib/leaflet/debug/geojson/geojson.html b/extlib/leaflet/debug/geojson/geojson.html
deleted file mode 100644
index 319e7c13..00000000
--- a/extlib/leaflet/debug/geojson/geojson.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet debug page</title>

-

-	<link rel="stylesheet" href="../../dist/leaflet.css" />

-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->

-	

-	<link rel="stylesheet" href="../css/screen.css" />

-	

-	<script src="../leaflet-include.js"></script>

-</head>

-<body>

-

-	<div id="map" style="width: 600px; height: 600px; border: 1px solid #ccc"></div>

-	<button id="populate">Populate with 10 markers</button>

-

-	<script type="text/javascript" src="geojson-sample.js"></script>

-	<script type="text/javascript">

-

-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',

-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',

-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution});

-	

-		var map = new L.Map('map', {

-			center: new L.LatLng(0.78, 102.37), 

-			zoom: 7, 

-			layers: [cloudmade]

-		});

-		

-		var geojson = new L.GeoJSON();

-		

-		/* points are rendered as markers by default, but you can change this:

-			

-		var geojson = new L.GeoJSON(null, {

-			pointToLayer: function(latlng) { return new L.CircleMarker(latlng); }

-		});

-		*/

-		

-		

-		geojson.on('featureparse', function(e) {

-			// you can style features depending on their properties, etc.

-			var popupText = 'geometry type: ' + e.geometryType + '<br/>';

-			if (e.layer instanceof L.Path) {

-				e.layer.setStyle({color: e.properties.color});

-				popupText += 'color: ' + e.properties.color;

-			}

-			e.layer.bindPopup(popupText);

-		});

-		

-		geojson.addGeoJSON(geojsonSample);

-		

-		map.addLayer(geojson);

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/debug/leaflet-include.js b/extlib/leaflet/debug/leaflet-include.js
deleted file mode 100644
index 9ae8f458..00000000
--- a/extlib/leaflet/debug/leaflet-include.js
+++ /dev/null
@@ -1,100 +0,0 @@
-(function() {

-	//TODO replace script list with the one from ../buid/deps.js

-	var scripts = [

-		'Leaflet.js',

-		

-		'core/Util.js', 

-		'core/Class.js',

-		'core/Events.js',

-		'core/Browser.js',

-		

-		'geometry/Point.js',

-		'geometry/Bounds.js',

-		'geometry/Transformation.js',

-		'geometry/LineUtil.js',

-		'geometry/PolyUtil.js',

-		

-		'dom/DomEvent.js',

-		'dom/DomEvent.DoubleTap.js',

-		'dom/DomUtil.js',

-		'dom/Draggable.js',

-		

-		'dom/transition/Transition.js',

-		'dom/transition/Transition.Native.js',

-		'dom/transition/Transition.Timer.js',

-		

-		'geo/LatLng.js',

-		'geo/LatLngBounds.js',

-		

-		'geo/projection/Projection.js',

-		'geo/projection/Projection.SphericalMercator.js',

-		'geo/projection/Projection.LonLat.js',

-		'geo/projection/Projection.Mercator.js',

-		

-		'geo/crs/CRS.js',

-		'geo/crs/CRS.EPSG3857.js',

-		'geo/crs/CRS.EPSG4326.js',

-		'geo/crs/CRS.EPSG3395.js',

-		

-		'layer/LayerGroup.js',

-		'layer/FeatureGroup.js',

-		

-		'layer/tile/TileLayer.js',

-		'layer/tile/TileLayer.WMS.js',

-		'layer/tile/TileLayer.Canvas.js',

-		'layer/ImageOverlay.js',

-		'layer/Popup.js',

-		

-		'layer/marker/Icon.js',

-		'layer/marker/Marker.js',

-		'layer/marker/Marker.Popup.js',

-		

-		'layer/vector/Path.js',

-		'layer/vector/Path.VML.js',

-		'layer/vector/Path.Popup.js',

-		'layer/vector/Polyline.js',

-		'layer/vector/Polygon.js',

-		'layer/vector/MultiPoly.js',

-		'layer/vector/Circle.js',

-		'layer/vector/CircleMarker.js',

-		

-		'layer/GeoJSON.js',

-		

-		'handler/Handler.js',

-		'handler/MapDrag.js',

-		'handler/TouchZoom.js',

-		'handler/DoubleClickZoom.js',

-		'handler/ScrollWheelZoom.js',

-		'handler/ShiftDragZoom.js',

-		'handler/MarkerDrag.js',

-		

-		'control/Control.js',

-		'control/Control.Zoom.js',

-		'control/Control.Attribution.js',

-		

-		'map/Map.js',

-		'map/ext/Map.Geolocation.js',

-		'map/ext/Map.Popup.js',

-		'map/ext/Map.PanAnimation.js',

-		'map/ext/Map.ZoomAnimation.js',

-		'map/ext/Map.Control.js'

-	];

-	

-	function getSrcUrl() {

-		var scripts = document.getElementsByTagName('script');

-		for (var i = 0; i < scripts.length; i++) {

-			var src = scripts[i].src;

-			if (src) {

-				var res = src.match(/^(.*)leaflet-include\.js$/);

-				if (res) {

-					return res[1] + '../src/';

-				}

-			}

-		}

-	}

-	

-	var path = getSrcUrl();

-	for (var i = 0; i < scripts.length; i++) {

-		document.writeln("<script type='text/javascript' src='" + path + "../src/" + scripts[i] + "'></script>");

-	}

-})();
\ No newline at end of file
diff --git a/extlib/leaflet/debug/map/canvas.html b/extlib/leaflet/debug/map/canvas.html
deleted file mode 100644
index 233035f1..00000000
--- a/extlib/leaflet/debug/map/canvas.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet debug page</title>

-

-	<link rel="stylesheet" href="../../dist/leaflet.css" />

-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->

-	

-	<link rel="stylesheet" href="../css/screen.css" />

-	

-	<script src="../leaflet-include.js"></script>

-</head>

-<body>

-

-	<div id="map" style="width: 600px; height: 600px; border: 1px solid #ccc"></div>

-

-	<script type="text/javascript">

-

-		var tiles = new L.TileLayer.Canvas();

-		

-		tiles.drawTile = function(canvas, tile, zoom) {

-			var ctx = canvas.getContext('2d');

-			

-			ctx.fillStyle = 'white';

-			ctx.fillRect(0, 0, 255, 255);

-			

-			

-			ctx.fillStyle = 'black';

-			ctx.fillText('x: ' + tile.x + ', y: ' + tile.y + ', zoom:' + zoom, 20, 20);

-			

-			

-			ctx.strokeStyle = 'red';

-			ctx.beginPath();

-			ctx.moveTo(0, 0);

-			ctx.lineTo(255, 0);

-			ctx.lineTo(255, 255);

-			ctx.lineTo(0, 255);

-			ctx.closePath();

-			ctx.stroke();

-		}

-	

-		var map = new L.Map('map', {center: new L.LatLng(50.5, 30.51), zoom: 15, layers: [tiles]});

-		

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/debug/map/map-mobile.html b/extlib/leaflet/debug/map/map-mobile.html
deleted file mode 100644
index 27d12ed9..00000000
--- a/extlib/leaflet/debug/map/map-mobile.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet debug page</title>

-

-	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />

-	

-	<link rel="stylesheet" href="../../dist/leaflet.css" />

-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->

-	

-	<link rel="stylesheet" href="../css/mobile.css" />

-	

-	<script src="../leaflet-include.js"></script>

-</head>

-<body>

-

-	<div id="map"></div>

-

-	<script type="text/javascript">

-

-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',

-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',

-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution});

-	

-		var map = new L.Map('map').addLayer(cloudmade);

-		

-		map.on('locationfound', function(e) {

-			var marker = new L.Marker(e.latlng);

-			map.addLayer(marker);

-			

-			marker.bindPopup("<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.</p><p>Donec nec justo eget felis facilisis fermentum. Aliquam porttitor mauris sit amet orci. Aenean dignissim pellentesque felis.</p>");

-		});

-		

-		map.on('locationerror', function(e) {

-			alert(e.message);

-			map.fitWorld();

-		});

-		

-		map.locateAndSetView();

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/debug/map/map.html b/extlib/leaflet/debug/map/map.html
deleted file mode 100644
index 88bdd5b0..00000000
--- a/extlib/leaflet/debug/map/map.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet debug page</title>

-

-	<link rel="stylesheet" href="../../dist/leaflet.css" />

-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->

-	

-	<link rel="stylesheet" href="../css/screen.css" />

-	

-	<script src="../leaflet-include.js"></script>

-</head>

-<body>

-

-	<div id="map" style="width: 600px; height: 600px; border: 1px solid #ccc"></div>

-	<button id="populate">Populate with 10 markers</button>

-

-	<script type="text/javascript">

-

-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',

-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',

-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),

-			latlng = new L.LatLng(50.5, 30.51);

-	

-		var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});

-		

-		var markers = new L.FeatureGroup();

-		

-		function populate() {

-			var bounds = map.getBounds(),

-				southWest = bounds.getSouthWest(),

-				northEast = bounds.getNorthEast(),

-				lngSpan = northEast.lng - southWest.lng,

-				latSpan = northEast.lat - southWest.lat;

-			

-			for (var i = 0; i < 10; i++) {

-				var latlng = new L.LatLng(

-						southWest.lat + latSpan * Math.random(),

-			        	southWest.lng + lngSpan * Math.random());

-				

-				markers.addLayer(new L.Marker(latlng));

-			}

-

-			return false;

-		};

-

-		markers.bindPopup("<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.</p><p>Donec nec justo eget felis facilisis fermentum. Aliquam porttitor mauris sit amet orci. Aenean dignissim pellentesque.</p>");

-		

-		map.addLayer(markers);

-		

-		populate();

-		L.DomUtil.get('populate').onclick = populate;

-		

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/debug/map/wms-marble.html b/extlib/leaflet/debug/map/wms-marble.html
deleted file mode 100644
index fd5443ab..00000000
--- a/extlib/leaflet/debug/map/wms-marble.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet debug page</title>

-

-	<link rel="stylesheet" href="../../dist/leaflet.css" />

-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->

-	

-	<link rel="stylesheet" href="../css/screen.css" />

-	

-	<script src="../leaflet-include.js"></script>

-</head>

-<body>

-

-	<div id="map" style="width: 1024px; height: 440px; border: 1px solid #ccc"></div>

-

-	<script type="text/javascript">

-		var map = new L.Map('map', {crs: L.CRS.EPSG4326});

-	

-		var bluemarble = new L.TileLayer.WMS("http://maps.opengeo.org/geowebcache/service/wms", {

-			layers: 'bluemarble',

-			attribution: "Data &copy; NASA Blue Marble, image service by OpenGeo",

-			minZoom: 2,

-			maxZoom: 5,

-		});

-

-		map.addLayer(bluemarble).fitWorld();

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/debug/map/wms.html b/extlib/leaflet/debug/map/wms.html
deleted file mode 100644
index 08694726..00000000
--- a/extlib/leaflet/debug/map/wms.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet debug page</title>

-

-	<link rel="stylesheet" href="../../dist/leaflet.css" />

-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->

-	

-	<link rel="stylesheet" href="../css/screen.css" />

-	

-	<script src="../leaflet-include.js"></script>

-</head>

-<body>

-

-	<div id="map" style="width: 800px; height: 600px; border: 1px solid #ccc"></div>

-

-	<script type="text/javascript">

-		var map = new L.Map('map');

-	

-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',

-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',

-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution});

-	

-		var nexrad = new L.TileLayer.WMS("http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi", {

-			layers: 'nexrad-n0r-900913',

-			format: 'image/png',

-			transparent: true,

-			attribution: "Weather data &copy; 2011 IEM Nexrad",

-			opacity: 0.4

-		});

-

-		var bounds = new L.LatLngBounds(new L.LatLng(32, -126), new L.LatLng(50, -64));

-		

-		map.addLayer(cloudmade).addLayer(nexrad).fitBounds(bounds);

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/debug/vector/route.js b/extlib/leaflet/debug/vector/route.js
deleted file mode 100644
index fa847e31..00000000
--- a/extlib/leaflet/debug/vector/route.js
+++ /dev/null
@@ -1 +0,0 @@
-var route = [[51.452339,-0.26291],[51.452011,-0.26479],[51.451839,-0.26624],[51.45187,-0.26706],[51.451881,-0.26733],[51.452049,-0.26734],[51.453098,-0.26734],[51.453838,-0.26717],[51.454849,-0.267],[51.45575,-0.26704],[51.45631,-0.26723],[51.456402,-0.26729],[51.456669,-0.26745],[51.45689,-0.26755],[51.457001,-0.26758],[51.45797,-0.26776],[51.458359,-0.26786],[51.459019,-0.26783],[51.459629,-0.26785],[51.459888,-0.26809],[51.460178,-0.26845],[51.46077,-0.26841],[51.461102,-0.26838],[51.461479,-0.2685],[51.46159,-0.26848],[51.462479,-0.26776],[51.462921,-0.26766],[51.463291,-0.26754],[51.463558,-0.26736],[51.46373,-0.26728],[51.464291,-0.26676],[51.464432,-0.26675],[51.464722,-0.26671],[51.464821,-0.2657],[51.46484,-0.2655],[51.464851,-0.26504],[51.46489,-0.26456],[51.464951,-0.26397],[51.464981,-0.26357],[51.46497,-0.26344],[51.465031,-0.26294],[51.46508,-0.26224],[51.465111,-0.26179],[51.46513,-0.26157],[51.465149,-0.261],[51.465149,-0.26077],[51.465149,-0.26051],[51.465149,-0.26011],[51.46513,-0.25982],[51.46513,-0.25955],[51.46513,-0.25929],[51.465111,-0.25872],[51.46513,-0.2583],[51.46513,-0.25771],[51.465141,-0.25753],[51.46516,-0.25675],[51.46516,-0.25658],[51.46516,-0.25647],[51.465179,-0.25574],[51.465191,-0.25525],[51.465199,-0.25486],[51.46521,-0.25455],[51.46521,-0.25413],[51.46524,-0.25293],[51.465229,-0.25186],[51.465191,-0.25085],[51.46513,-0.25001],[51.46508,-0.24926],[51.465069,-0.24862],[51.465111,-0.24775],[51.465149,-0.2472],[51.465172,-0.24675],[51.46524,-0.24571],[51.465279,-0.24482],[51.465321,-0.24423],[51.465229,-0.24372],[51.465149,-0.24266],[51.465118,-0.24208],[51.465069,-0.24147],[51.464939,-0.24028],[51.464821,-0.2395],[51.46476,-0.2389],[51.464729,-0.23852],[51.464642,-0.23755],[51.464569,-0.23693],[51.464481,-0.2365],[51.464371,-0.23557],[51.464211,-0.23437],[51.46418,-0.23421],[51.464001,-0.23334],[51.463959,-0.23316],[51.463829,-0.23253],[51.463779,-0.23235],[51.463699,-0.23189],[51.463661,-0.2317],[51.463589,-0.23136],[51.463539,-0.23106],[51.463402,-0.23025],[51.463341,-0.2299],[51.463249,-0.22924],[51.463139,-0.22838],[51.46312,-0.22823],[51.463001,-0.22726],[51.462959,-0.22698],[51.462891,-0.22645],[51.462769,-0.22551],[51.462761,-0.22516],[51.462681,-0.22436],[51.46262,-0.224],[51.462521,-0.22297],[51.462421,-0.22247],[51.462181,-0.22183],[51.462009,-0.22149],[51.461731,-0.22074],[51.461399,-0.2196],[51.461361,-0.21948],[51.46122,-0.21878],[51.461109,-0.21824],[51.460979,-0.2175],[51.460789,-0.21715],[51.46069,-0.21685],[51.460522,-0.21596],[51.4604,-0.21533],[51.460361,-0.21511],[51.460251,-0.21458],[51.46022,-0.2144],[51.460159,-0.21411],[51.460121,-0.21389],[51.46011,-0.2138],[51.459961,-0.21308],[51.459942,-0.21294],[51.459702,-0.21186],[51.459702,-0.21184],[51.45948,-0.21112],[51.459259,-0.21038],[51.459011,-0.20963],[51.45892,-0.2094],[51.458809,-0.2091],[51.458759,-0.20898],[51.45858,-0.20853],[51.458328,-0.20795],[51.458179,-0.2076],[51.458141,-0.20751],[51.458099,-0.20743],[51.457981,-0.2072],[51.45771,-0.20668],[51.4575,-0.20638],[51.457321,-0.20614],[51.45718,-0.20596],[51.457088,-0.20584],[51.456921,-0.20558],[51.456829,-0.20541],[51.456772,-0.20522],[51.45676,-0.20518],[51.456749,-0.20509],[51.45673,-0.20469],[51.456718,-0.20466],[51.456699,-0.20425],[51.456692,-0.20391],[51.456692,-0.20371],[51.456661,-0.20284],[51.456661,-0.20272],[51.456661,-0.20254],[51.456669,-0.20231],[51.456692,-0.20178],[51.456699,-0.20148],[51.45673,-0.20116],[51.45676,-0.20077],[51.45686,-0.19978],[51.45697,-0.19857],[51.457001,-0.19826],[51.457039,-0.19806],[51.45705,-0.19793],[51.457142,-0.19781],[51.457211,-0.19776],[51.45742,-0.19785],[51.45763,-0.19794],[51.45776,-0.19795],[51.457829,-0.19791],[51.45789,-0.19784],[51.458,-0.19751],[51.458172,-0.19697],[51.458271,-0.19654],[51.458439,-0.19585],[51.458599,-0.19507],[51.45863,-0.1949],[51.458729,-0.19437],[51.458809,-0.19394],[51.45892,-0.19318],[51.45892,-0.1926],[51.458839,-0.19206],[51.458858,-0.19189],[51.45887,-0.1917],[51.459049,-0.19117],[51.45916,-0.19078],[51.459148,-0.19065],[51.45908,-0.19055],[51.458679,-0.19041],[51.458511,-0.19034],[51.458271,-0.19026],[51.457939,-0.19013],[51.457329,-0.1899],[51.457199,-0.18985],[51.456829,-0.18972],[51.457069,-0.18858],[51.457142,-0.18824],[51.457211,-0.18785],[51.45731,-0.18732],[51.457581,-0.1857],[51.457649,-0.18525],[51.457878,-0.18476],[51.45797,-0.18457],[51.45829,-0.18387],[51.45866,-0.18305],[51.458771,-0.18276],[51.458801,-0.18269],[51.4589,-0.18243],[51.458981,-0.18222],[51.45911,-0.1819],[51.459229,-0.1815],[51.459358,-0.18094],[51.459431,-0.18064],[51.45956,-0.18014],[51.459518,-0.18],[51.459469,-0.17984],[51.45882,-0.1796],[51.458431,-0.17945],[51.458351,-0.17935],[51.458279,-0.17924],[51.458309,-0.17861],[51.458401,-0.17714],[51.458511,-0.17525],[51.45853,-0.17515],[51.45858,-0.17493],[51.458912,-0.17401],[51.459,-0.17374],[51.459179,-0.1732],[51.45929,-0.17292],[51.459461,-0.17245],[51.459579,-0.1721],[51.459919,-0.17123],[51.460232,-0.17037],[51.4604,-0.16967],[51.46048,-0.16947],[51.460579,-0.16882],[51.460751,-0.16781],[51.460838,-0.16703],[51.460781,-0.16653],[51.460819,-0.16599],[51.460831,-0.1658],[51.460869,-0.16534],[51.46088,-0.16485],[51.460899,-0.16431],[51.460979,-0.16321],[51.460999,-0.16296],[51.461021,-0.16268],[51.461021,-0.1625],[51.46104,-0.16213],[51.46106,-0.16186],[51.461151,-0.16126],[51.46122,-0.1602],[51.4613,-0.15897],[51.461319,-0.15819],[51.461281,-0.15716],[51.4613,-0.15642],[51.460049,-0.15658],[51.45993,-0.15658],[51.459759,-0.15659],[51.45969,-0.15658],[51.458931,-0.15604],[51.458172,-0.15538],[51.457878,-0.1551],[51.45742,-0.15465],[51.456821,-0.15379],[51.455681,-0.15134],[51.455528,-0.15098],[51.45475,-0.14926],[51.453999,-0.14742],[51.45401,-0.14732],[51.454159,-0.14628],[51.453369,-0.14419],[51.452862,-0.14297],[51.452332,-0.14222],[51.451832,-0.14213],[51.45174,-0.14214],[51.451328,-0.14212],[51.451099,-0.14197],[51.451012,-0.14191],[51.450729,-0.14134],[51.450691,-0.14118],[51.450489,-0.1404],[51.449871,-0.13813],[51.449799,-0.13787],[51.449539,-0.13695],[51.449261,-0.13612],[51.44915,-0.13577],[51.448811,-0.13476],[51.448502,-0.13383],[51.448391,-0.13351],[51.44833,-0.13332],[51.44812,-0.13277],[51.447861,-0.13189],[51.447609,-0.13092],[51.447552,-0.13067],[51.44735,-0.12992],[51.44717,-0.12935],[51.447071,-0.12885],[51.446991,-0.12862],[51.446972,-0.12857],[51.44685,-0.1282],[51.445992,-0.12606],[51.44511,-0.12436],[51.44492,-0.12368],[51.44487,-0.12353],[51.444752,-0.12276],[51.444721,-0.12266],[51.444641,-0.12243],[51.44453,-0.12213],[51.444389,-0.12187],[51.44434,-0.12167],[51.444118,-0.12058],[51.444012,-0.12013],[51.44371,-0.11895],[51.443531,-0.1182],[51.443489,-0.11803],[51.443451,-0.11786],[51.443371,-0.11758],[51.4431,-0.11661],[51.44276,-0.1158],[51.44212,-0.11491],[51.441689,-0.11427],[51.44138,-0.11364],[51.441151,-0.11289],[51.441101,-0.11274],[51.441059,-0.11257],[51.440651,-0.11082],[51.440578,-0.11025],[51.440392,-0.10871],[51.441078,-0.10854],[51.441441,-0.10829],[51.44109,-0.10701],[51.44101,-0.10662],[51.440941,-0.10626],[51.440929,-0.10578],[51.440891,-0.1052],[51.440762,-0.10446],[51.44051,-0.10355],[51.440441,-0.10333],[51.440189,-0.10274],[51.43964,-0.10179],[51.439461,-0.10091],[51.439339,-0.10016],[51.43935,-0.10003],[51.439339,-0.09909],[51.4394,-0.09832],[51.439548,-0.0979],[51.43969,-0.09752],[51.43985,-0.09727],[51.440189,-0.09671],[51.44043,-0.09609],[51.44046,-0.09599],[51.44072,-0.09489],[51.440948,-0.09397],[51.441071,-0.09291],[51.441101,-0.09183],[51.441109,-0.09137],[51.441109,-0.091],[51.441101,-0.09],[51.44104,-0.0892],[51.440861,-0.08854],[51.440891,-0.08813],[51.440979,-0.08768],[51.44173,-0.08473],[51.44183,-0.08436],[51.441891,-0.08413],[51.44191,-0.08401],[51.44199,-0.08292],[51.442089,-0.08137],[51.4422,-0.08036],[51.442242,-0.08006],[51.44228,-0.07963],[51.44231,-0.07934],[51.442451,-0.07843],[51.442551,-0.07765],[51.442669,-0.07675],[51.442982,-0.07507],[51.443298,-0.07406],[51.443489,-0.07357],[51.443562,-0.07321],[51.443569,-0.0728],[51.443489,-0.07209],[51.443359,-0.07099],[51.443119,-0.0694],[51.4431,-0.06915],[51.443089,-0.06894],[51.443138,-0.06811],[51.44318,-0.06783],[51.443199,-0.06772],[51.443291,-0.06757],[51.443069,-0.06722],[51.442532,-0.06649],[51.442421,-0.06637],[51.4422,-0.06613],[51.442059,-0.06597],[51.44186,-0.06575],[51.44178,-0.06567],[51.441761,-0.06555],[51.441269,-0.06498],[51.44112,-0.06465],[51.44104,-0.06435],[51.441021,-0.06425],[51.440948,-0.06408],[51.440609,-0.06253],[51.440601,-0.0622],[51.440559,-0.06188],[51.440552,-0.06152],[51.44054,-0.0609],[51.440529,-0.06047],[51.44051,-0.06015],[51.44051,-0.05982],[51.44054,-0.05915],[51.44054,-0.05889],[51.440552,-0.0586],[51.440552,-0.0584],[51.440472,-0.05796],[51.440361,-0.05765],[51.440239,-0.05739],[51.440109,-0.05707],[51.43969,-0.05579],[51.43924,-0.05458],[51.43911,-0.05418],[51.439049,-0.054],[51.439289,-0.05379],[51.439751,-0.0538],[51.440102,-0.05379],[51.440201,-0.05371],[51.440239,-0.05359],[51.440269,-0.05332],[51.4403,-0.05295],[51.440281,-0.05266],[51.440231,-0.05243],[51.440022,-0.05139],[51.43998,-0.05115],[51.440071,-0.0507],[51.440479,-0.04968],[51.440762,-0.04884],[51.44138,-0.04734],[51.442162,-0.04733],[51.442181,-0.04733],[51.442268,-0.04725],[51.442329,-0.04588],[51.442329,-0.04563],[51.44228,-0.04412],[51.442242,-0.04251],[51.44215,-0.04132],[51.44202,-0.03995],[51.442051,-0.03951],[51.442089,-0.03879],[51.442211,-0.03746],[51.442299,-0.03678],[51.442329,-0.03654],[51.442341,-0.03618],[51.442341,-0.03586],[51.442322,-0.03489],[51.442291,-0.03441],[51.442081,-0.03347],[51.441929,-0.03274],[51.441898,-0.03239],[51.441959,-0.03208],[51.442131,-0.03124],[51.442322,-0.03081],[51.442692,-0.02992],[51.4431,-0.02868],[51.443138,-0.028],[51.443169,-0.0276],[51.44323,-0.02698],[51.443352,-0.02683],[51.443741,-0.02636],[51.443851,-0.02623],[51.443932,-0.02613],[51.444221,-0.02538],[51.44455,-0.02409],[51.444618,-0.02361],[51.444691,-0.02308],[51.44479,-0.02226],[51.444801,-0.02197],[51.444809,-0.02115],[51.44487,-0.02082],[51.444939,-0.02056],[51.445019,-0.02034],[51.445122,-0.02013],[51.445229,-0.01994],[51.445431,-0.01983],[51.445969,-0.01957],[51.446129,-0.01946],[51.446072,-0.01873],[51.44595,-0.01764],[51.4459,-0.01725],[51.445709,-0.01584],[51.445511,-0.0145],[51.445339,-0.01315],[51.445068,-0.01105],[51.445068,-0.00916],[51.445068,-0.00897],[51.445099,-0.00713],[51.44511,-0.00561],[51.445099,-0.00474],[51.44508,-0.00345],[51.445122,-0.00221],[51.44516,-0.00109],[51.445171,0.00011],[51.44519,0.00135],[51.445202,0.00247],[51.445221,0.00356],[51.445278,0.00442],[51.445301,0.00467],[51.445389,0.00518],[51.44556,0.00565],[51.44558,0.00603],[51.44556,0.00663],[51.445572,0.00772],[51.445641,0.00859],[51.445679,0.00959],[51.445721,0.01089],[51.445801,0.0115],[51.445889,0.0127],[51.446159,0.01386],[51.446381,0.01466],[51.446609,0.0156],[51.447708,0.02026],[51.44775,0.02043],[51.448189,0.02234],[51.44825,0.02255],[51.448292,0.0227],[51.448441,0.0232],[51.448669,0.02399],[51.448879,0.02476],[51.44902,0.02536],[51.449089,0.02561],[51.44978,0.02794],[51.450119,0.02896],[51.450191,0.02912],[51.450249,0.02914],[51.450279,0.02917],[51.450298,0.0292],[51.450329,0.02924],[51.450352,0.02933],[51.450359,0.02943],[51.45034,0.02953],[51.450279,0.02964],[51.45023,0.02969],[51.450161,0.0297],[51.4501,0.02967],[51.450039,0.02965],[51.44997,0.02965],[51.44978,0.02972],[51.4492,0.02993],[51.44857,0.03013],[51.448021,0.03033],[51.44772,0.03043],[51.44696,0.03077],[51.446739,0.03084],[51.446419,0.03088],[51.44614,0.0309],[51.44577,0.03095],[51.445438,0.03104],[51.445148,0.03122],[51.444939,0.03145],[51.444721,0.03171],[51.444561,0.03193],[51.444401,0.03219],[51.444241,0.0325],[51.443958,0.03315],[51.443501,0.03425],[51.4431,0.03519],[51.442791,0.03597],[51.442471,0.03678],[51.44228,0.03729],[51.442131,0.0378],[51.441811,0.03879],[51.441368,0.04027],[51.441231,0.04084],[51.44101,0.04174],[51.440479,0.04412],[51.43972,0.04768],[51.439651,0.04802],[51.4394,0.04924],[51.439369,0.04944],[51.439178,0.05038],[51.43911,0.05061],[51.438999,0.05081],[51.438789,0.05132],[51.438568,0.05182],[51.438358,0.05242],[51.438179,0.05313],[51.43795,0.05417],[51.437191,0.05753],[51.436932,0.05848],[51.436871,0.05864],[51.43679,0.05888],[51.436581,0.0594],[51.435188,0.0627],[51.434921,0.0634],[51.43483,0.06364],[51.434711,0.06398],[51.43462,0.06424],[51.434502,0.06462],[51.43433,0.06534],[51.43401,0.06693],[51.43359,0.06872],[51.433361,0.0698],[51.43288,0.07194],[51.432598,0.07332],[51.432369,0.07429],[51.43206,0.07563],[51.431351,0.07868],[51.431042,0.07999],[51.430489,0.08221],[51.430351,0.08261],[51.430119,0.08312],[51.429951,0.08344],[51.429798,0.08367],[51.429409,0.08413],[51.42889,0.08458],[51.427738,0.08559],[51.426731,0.08656],[51.4259,0.08747],[51.424511,0.08901],[51.422531,0.09173],[51.421539,0.09321],[51.420368,0.09517],[51.418839,0.09795],[51.417141,0.10123],[51.416222,0.10311],[51.415829,0.10403],[51.415371,0.10513],[51.415119,0.10581],[51.41444,0.10769],[51.414009,0.10905],[51.413521,0.11098],[51.41264,0.11505],[51.412041,0.11826],[51.41124,0.12231],[51.410992,0.12349],[51.410671,0.12522],[51.410599,0.12554],[51.41003,0.12827],[51.409771,0.12976],[51.409649,0.13078],[51.409561,0.13171],[51.409512,0.13284],[51.4095,0.13436],[51.409489,0.13994],[51.409489,0.1408],[51.4095,0.14117],[51.409489,0.1419],[51.40947,0.14288],[51.409389,0.14418],[51.40921,0.14569],[51.409069,0.14648],[51.408932,0.14716],[51.408749,0.14788],[51.40852,0.14863],[51.408131,0.14982],[51.407532,0.15119],[51.40696,0.15228],[51.40654,0.15293],[51.406269,0.15334],[51.405628,0.15413],[51.4049,0.15499],[51.404308,0.15556],[51.404129,0.15573],[51.403271,0.15645],[51.402302,0.15709],[51.401112,0.15767],[51.399971,0.15804],[51.399109,0.15828],[51.398079,0.15855],[51.397049,0.15889],[51.396179,0.15931],[51.39547,0.1598],[51.39452,0.16056],[51.393681,0.1614],[51.392921,0.16234],[51.392551,0.16289],[51.39212,0.16354],[51.391571,0.16447],[51.39085,0.166],[51.390228,0.1678],[51.38979,0.16935],[51.389469,0.17106],[51.389259,0.1728],[51.389172,0.17438],[51.38916,0.17585],[51.389221,0.17702],[51.389542,0.18034],[51.38969,0.18225],[51.38974,0.18407],[51.38974,0.18552],[51.389679,0.18714],[51.38942,0.18934],[51.389172,0.19115],[51.38876,0.19339],[51.388161,0.196],[51.38747,0.19845],[51.38702,0.19998],[51.38678,0.20088],[51.38625,0.20298],[51.385509,0.20598],[51.38522,0.20735],[51.385052,0.20821],[51.38467,0.21019],[51.38448,0.21191],[51.384418,0.21259],[51.384392,0.21318],[51.38435,0.21409],[51.3843,0.21612],[51.384171,0.22142],[51.384029,0.22337],[51.383831,0.22515],[51.38345,0.22739],[51.383411,0.22763],[51.383362,0.22786],[51.382919,0.22983],[51.382351,0.23176],[51.38184,0.23328],[51.381142,0.23508],[51.380901,0.23562],[51.38076,0.23596],[51.38039,0.23683],[51.37867,0.24056],[51.377449,0.24298],[51.37598,0.2457],[51.375271,0.24696],[51.373531,0.24988],[51.37122,0.25339],[51.3703,0.2548],[51.36866,0.25733],[51.366501,0.26056],[51.365349,0.26232],[51.364361,0.26381],[51.3634,0.26522],[51.362431,0.26644],[51.361179,0.26788],[51.360851,0.26818],[51.360149,0.26885],[51.359001,0.26981],[51.357712,0.27082],[51.355461,0.27233],[51.3531,0.27363],[51.351528,0.27437],[51.349098,0.27529],[51.347988,0.27563],[51.346981,0.27589],[51.34605,0.27605],[51.3451,0.27615],[51.344181,0.27614],[51.343079,0.27607],[51.340969,0.27571],[51.340099,0.27544],[51.33886,0.27496],[51.336941,0.27424],[51.336651,0.27417],[51.335949,0.274],[51.334801,0.27373],[51.33308,0.27351],[51.33073,0.27348],[51.329079,0.27365],[51.327808,0.27388],[51.326462,0.2743],[51.32526,0.27495],[51.323929,0.27599],[51.322701,0.27727],[51.321671,0.27865],[51.32098,0.27987],[51.32074,0.28029],[51.319931,0.28203],[51.319359,0.28364],[51.318668,0.28581],[51.318241,0.28741],[51.317829,0.28888],[51.31641,0.29444],[51.315529,0.29828],[51.315029,0.30069],[51.314289,0.30436],[51.313911,0.30597],[51.31348,0.30744],[51.312672,0.30974],[51.311611,0.31285],[51.311081,0.31464],[51.31041,0.31727],[51.309399,0.32178],[51.308849,0.32467],[51.308479,0.32698],[51.308041,0.32987],[51.307991,0.33014],[51.307961,0.33033],[51.30772,0.33232],[51.307419,0.3351],[51.30714,0.33829],[51.306919,0.34202],[51.306789,0.34573],[51.30677,0.34766],[51.30682,0.35044],[51.306919,0.35324],[51.307178,0.35651],[51.307468,0.35934],[51.30772,0.36124],[51.308189,0.36418],[51.308651,0.36814],[51.308708,0.36896],[51.30883,0.37218],[51.30891,0.3746],[51.30888,0.37754],[51.30901,0.38345],[51.309071,0.38842],[51.309261,0.39099],[51.309601,0.39395],[51.309959,0.39628],[51.31065,0.40007],[51.310909,0.40133],[51.311081,0.40247],[51.311211,0.40348],[51.311432,0.40537],[51.311531,0.4067],[51.3116,0.40831],[51.311611,0.40987],[51.311581,0.41178],[51.311569,0.41225],[51.311539,0.41272],[51.311481,0.41354],[51.311359,0.41489],[51.311192,0.41651],[51.310768,0.41924],[51.310379,0.42111],[51.310101,0.42242],[51.309231,0.42526],[51.308262,0.42798],[51.30727,0.43082],[51.306931,0.43183],[51.30674,0.43252],[51.306149,0.4349],[51.305901,0.43603],[51.305679,0.43715],[51.305038,0.44058],[51.30397,0.44616],[51.303379,0.44947],[51.303249,0.45038],[51.303162,0.45112],[51.30302,0.45268],[51.302769,0.45542],[51.302471,0.45849],[51.30238,0.45939],[51.302231,0.46031],[51.30196,0.46153],[51.30164,0.46285],[51.300961,0.4654],[51.300701,0.46637],[51.300461,0.46734],[51.300289,0.46822],[51.300121,0.46922],[51.300011,0.47011],[51.299931,0.47089],[51.299831,0.47189],[51.29977,0.47257],[51.29966,0.47387],[51.299591,0.47437],[51.299549,0.47468],[51.299541,0.47477],[51.29948,0.47513],[51.299438,0.47536],[51.299339,0.47598],[51.29911,0.47691],[51.298889,0.47756],[51.298691,0.47816],[51.298359,0.47894],[51.298241,0.47919],[51.297661,0.48044],[51.296921,0.48235],[51.296581,0.48351],[51.296398,0.48429],[51.29623,0.48525],[51.29612,0.48602],[51.29599,0.48772],[51.295959,0.49028],[51.295971,0.49123],[51.296001,0.49224],[51.29607,0.4932],[51.296188,0.4943],[51.29636,0.49533],[51.296558,0.49635],[51.29673,0.49698],[51.297211,0.49875],[51.297371,0.49922],[51.297459,0.49954],[51.297871,0.50098],[51.29808,0.50212],[51.298248,0.50355],[51.298351,0.50497],[51.298569,0.50858],[51.29879,0.51282],[51.298901,0.51441],[51.298969,0.51558],[51.29903,0.51657],[51.29908,0.51737],[51.29911,0.51794],[51.29911,0.51862],[51.299091,0.51915],[51.299,0.51987],[51.298908,0.52049],[51.298809,0.52116],[51.29863,0.52195],[51.298359,0.52297],[51.298168,0.52345],[51.297852,0.52421],[51.297489,0.52491],[51.29665,0.52623],[51.29557,0.52804],[51.29483,0.52931],[51.29427,0.53038],[51.292782,0.53339],[51.292221,0.53459],[51.291859,0.53532],[51.291599,0.53592],[51.291191,0.53707],[51.291019,0.53768],[51.290722,0.53911],[51.29047,0.54019],[51.290291,0.54093],[51.290131,0.54148],[51.28989,0.54226],[51.28923,0.544],[51.288582,0.54589],[51.288429,0.54636],[51.28828,0.54689],[51.288181,0.54746],[51.28804,0.54834],[51.287949,0.54936],[51.28791,0.55003],[51.287922,0.55088],[51.287971,0.55186],[51.288029,0.55306],[51.2882,0.55569],[51.28828,0.55696],[51.2883,0.55782],[51.288212,0.56001],[51.288101,0.56193],[51.28796,0.56383],[51.287762,0.56577],[51.287579,0.56706],[51.287361,0.56836],[51.286812,0.57094],[51.28624,0.57306],[51.285789,0.57454],[51.285332,0.57591],[51.284599,0.57786],[51.284061,0.57915],[51.283489,0.58035],[51.282799,0.58177],[51.28257,0.58224],[51.282299,0.58279],[51.280529,0.58595],[51.278931,0.58872],[51.277351,0.5914],[51.276951,0.59208],[51.275421,0.59477],[51.273571,0.59799],[51.271709,0.60145],[51.270592,0.60341],[51.270481,0.6036],[51.269989,0.60445],[51.269489,0.60531],[51.26915,0.60589],[51.268242,0.60747],[51.266701,0.60995],[51.26535,0.61188],[51.264179,0.61357],[51.263302,0.61501],[51.262489,0.6163],[51.261459,0.61795],[51.261311,0.61822],[51.261169,0.6185],[51.261051,0.61878],[51.260929,0.61903],[51.26062,0.61976],[51.260448,0.62018],[51.260201,0.6208],[51.259079,0.62382],[51.258289,0.62644],[51.25795,0.62747],[51.257641,0.62829],[51.256618,0.63055],[51.25634,0.63115],[51.256031,0.63176],[51.255371,0.63291],[51.255032,0.63346],[51.254688,0.63397],[51.252941,0.63631],[51.25243,0.63704],[51.252289,0.63724],[51.251289,0.63867],[51.250961,0.63918],[51.250599,0.63978],[51.249569,0.64159],[51.249271,0.64217],[51.24876,0.64322],[51.248112,0.64466],[51.24781,0.64535],[51.247509,0.64616],[51.247162,0.64707],[51.246861,0.64794],[51.246681,0.64849],[51.246471,0.64916],[51.246281,0.64979],[51.245949,0.65084],[51.245899,0.65104],[51.245171,0.65347],[51.244541,0.65575],[51.24361,0.65901],[51.242668,0.66237],[51.241711,0.66557],[51.241371,0.66662],[51.24102,0.66764],[51.240028,0.6704],[51.239609,0.67148],[51.23914,0.6726],[51.237942,0.67524],[51.237469,0.67616],[51.237041,0.67698],[51.236649,0.67772],[51.23645,0.6781],[51.23595,0.67909],[51.23518,0.68037],[51.234089,0.68227],[51.23365,0.68299],[51.233101,0.68384],[51.232632,0.68449],[51.232208,0.68509],[51.23159,0.68585],[51.231098,0.68638],[51.230659,0.68688],[51.229839,0.6878],[51.229019,0.6888],[51.228279,0.68988],[51.22797,0.69037],[51.227661,0.69092],[51.227211,0.6918],[51.2267,0.69285],[51.226509,0.69331],[51.226261,0.69388],[51.225819,0.69502],[51.225578,0.69575],[51.225281,0.69674],[51.22506,0.69754],[51.224869,0.69836],[51.224701,0.69918],[51.224548,0.69999],[51.224419,0.70091],[51.224339,0.70158],[51.224232,0.70277],[51.22414,0.70386],[51.22414,0.70392],[51.223942,0.70706],[51.223801,0.70842],[51.223709,0.70911],[51.223591,0.70976],[51.223358,0.71097],[51.223049,0.71225],[51.222851,0.71295],[51.22263,0.71364],[51.22224,0.71477],[51.221802,0.71586],[51.221561,0.71644],[51.221291,0.71697],[51.220409,0.71862],[51.220058,0.71922],[51.21965,0.71985],[51.21843,0.72149],[51.2178,0.72229],[51.217461,0.72274],[51.217072,0.72331],[51.21653,0.72418],[51.216202,0.72477],[51.215851,0.72538],[51.215481,0.72616],[51.215069,0.72716],[51.21442,0.72904],[51.21418,0.72975],[51.213928,0.73048],[51.21331,0.73252],[51.212719,0.7343],[51.212502,0.73491],[51.212261,0.73557],[51.21175,0.73686],[51.210781,0.73941],[51.210411,0.74033],[51.210091,0.74111],[51.208961,0.74368],[51.207371,0.7471],[51.205879,0.7505],[51.20435,0.75444],[51.20369,0.7563],[51.2029,0.75831],[51.202068,0.76009],[51.201199,0.76191],[51.199879,0.76458],[51.198879,0.76694],[51.198349,0.76836],[51.196941,0.77223],[51.195881,0.77579],[51.19482,0.77989],[51.19363,0.78381],[51.193481,0.78425],[51.192371,0.78747],[51.19109,0.79133],[51.190819,0.79238],[51.190521,0.79363],[51.190319,0.79462],[51.190182,0.79558],[51.18988,0.79784],[51.189522,0.80175],[51.189091,0.80706],[51.188862,0.8117],[51.188721,0.81612],[51.188599,0.82169],[51.18837,0.8241],[51.188251,0.82496],[51.188099,0.82587],[51.187962,0.82665],[51.187752,0.82763],[51.187569,0.82836],[51.187119,0.82975],[51.186378,0.83164],[51.185749,0.83293],[51.18531,0.83368],[51.184811,0.83448],[51.184299,0.83517],[51.183121,0.83649],[51.182381,0.83722],[51.18198,0.83761],[51.181862,0.83773],[51.179722,0.83981],[51.177509,0.84225],[51.17527,0.84496],[51.17326,0.84778],[51.171341,0.85072],[51.169498,0.85395],[51.167709,0.85684],[51.167049,0.85787],[51.166241,0.8591],[51.16478,0.86123],[51.163509,0.86324],[51.16193,0.86581],[51.1614,0.8668],[51.161079,0.86742],[51.160549,0.8685],[51.160221,0.86923],[51.15966,0.87046],[51.15884,0.87253],[51.157841,0.87482],[51.156559,0.87788],[51.15509,0.88152],[51.1548,0.88219],[51.15337,0.88568],[51.151508,0.89005],[51.15062,0.89223],[51.150249,0.89302],[51.150169,0.8932],[51.149899,0.8938],[51.149632,0.89439],[51.149109,0.89545],[51.148479,0.8966],[51.147461,0.89819],[51.146549,0.89942],[51.14473,0.90196],[51.142151,0.90519],[51.141788,0.90564],[51.140621,0.90699],[51.139591,0.90816],[51.138611,0.90931],[51.13802,0.91008],[51.137371,0.91099],[51.13644,0.91254],[51.135948,0.91346],[51.135071,0.91531],[51.13448,0.91676],[51.133438,0.91969],[51.13208,0.92321],[51.13131,0.92488],[51.13047,0.92637],[51.12999,0.92714],[51.129501,0.92789],[51.12772,0.93053],[51.127171,0.93141],[51.126259,0.93304],[51.125408,0.9346],[51.12484,0.93569],[51.123291,0.93894],[51.122822,0.93991],[51.121529,0.94233],[51.12104,0.94323],[51.119839,0.9451],[51.117802,0.94831],[51.11721,0.94936],[51.11676,0.95022],[51.116459,0.95082],[51.116219,0.95133],[51.115978,0.95189],[51.115761,0.95245],[51.11544,0.9533],[51.114738,0.95539],[51.113811,0.95882],[51.11272,0.96273],[51.111561,0.96647],[51.110279,0.97016],[51.108822,0.97406],[51.10833,0.97522],[51.107491,0.97725],[51.107121,0.97813],[51.106419,0.97979],[51.105999,0.98086],[51.105621,0.98185],[51.105209,0.98297],[51.104858,0.98403],[51.10453,0.98504],[51.10405,0.9866],[51.103519,0.98858],[51.103161,0.98998],[51.102631,0.99251],[51.10183,0.99697],[51.101261,1.00094],[51.100498,1.00727],[51.100441,1.00801],[51.100101,1.01554],[51.099789,1.02085],[51.09943,1.02433],[51.09914,1.02641],[51.098629,1.02937],[51.09795,1.03334],[51.097301,1.03712],[51.096981,1.03903],[51.096691,1.04113],[51.096191,1.04478],[51.09565,1.04961],[51.09523,1.05352],[51.095001,1.05578],[51.094818,1.05718],[51.094551,1.05899],[51.094002,1.0625],[51.093811,1.06352],[51.093479,1.06512],[51.09296,1.06772],[51.09272,1.06914],[51.092541,1.07024],[51.092381,1.07156],[51.09222,1.07294],[51.092091,1.07427],[51.091991,1.07574],[51.091911,1.07683],[51.09185,1.07825],[51.091801,1.08103],[51.09182,1.08295],[51.091881,1.08497],[51.091999,1.08669],[51.09206,1.08743],[51.092178,1.0886],[51.092339,1.09011],[51.092628,1.09246],[51.09293,1.09531],[51.093651,1.09994],[51.093788,1.10123],[51.093811,1.10192],[51.093849,1.10356],[51.0937,1.10681],[51.093472,1.10861],[51.09317,1.1104],[51.092239,1.11382],[51.091209,1.11814],[51.090988,1.12],[51.090889,1.12149],[51.090839,1.12251],[51.090839,1.12344],[51.090988,1.1267],[51.091251,1.12838],[51.091549,1.12994],[51.09219,1.13217],[51.09248,1.13289],[51.092812,1.13363],[51.093449,1.13509],[51.09383,1.13608],[51.09417,1.13718],[51.094791,1.14033],[51.09528,1.14437],[51.095539,1.14675],[51.09565,1.14905],[51.095638,1.15199],[51.0956,1.1539],[51.09557,1.15553],[51.0956,1.15691],[51.09565,1.15785],[51.095711,1.15863],[51.095791,1.15935],[51.095909,1.16004],[51.096081,1.16075],[51.096378,1.16185],[51.096771,1.16293],[51.097149,1.16373],[51.097439,1.16425],[51.09853,1.16572],[51.099621,1.16672],[51.099831,1.16689],[51.10281,1.16969],[51.104382,1.17116],[51.105709,1.17244],[51.106781,1.17389],[51.107849,1.17564],[51.108719,1.17739],[51.109619,1.17987],[51.110512,1.18248],[51.111488,1.18548],[51.112228,1.18863],[51.112499,1.19082],[51.112549,1.19196],[51.112549,1.19278],[51.112518,1.19351],[51.112469,1.19398],[51.11235,1.19533],[51.112228,1.19671],[51.112171,1.19839],[51.11219,1.19926],[51.112209,1.20014],[51.112331,1.20197],[51.112438,1.20275],[51.112541,1.20346],[51.112839,1.20577],[51.11301,1.20811],[51.113022,1.21006],[51.11293,1.2119],[51.11264,1.21474],[51.112301,1.21747],[51.111851,1.22028],[51.111382,1.22301],[51.110882,1.22546],[51.110329,1.22787],[51.10997,1.22901],[51.10955,1.23013],[51.108589,1.23208],[51.106739,1.23498],[51.105942,1.23623],[51.10466,1.23946],[51.104389,1.24029],[51.10429,1.24069],[51.104172,1.24137],[51.10397,1.24288],[51.103889,1.24393],[51.103859,1.24491],[51.10387,1.24596],[51.103958,1.24726],[51.10405,1.24807],[51.104221,1.24973],[51.104488,1.25164],[51.104809,1.25353],[51.10564,1.2573],[51.107071,1.26226],[51.107208,1.26301],[51.107529,1.26477],[51.107689,1.26757],[51.107849,1.27028],[51.108292,1.27241],[51.109692,1.27641],[51.11018,1.27878],[51.110298,1.28074],[51.110031,1.285],[51.110329,1.28792],[51.11063,1.28913],[51.111111,1.29063],[51.112011,1.29313],[51.11293,1.29586],[51.11335,1.29733],[51.113689,1.29877],[51.114029,1.30058],[51.114239,1.30197],[51.114311,1.3025],[51.11441,1.30284],[51.114471,1.30292],[51.11454,1.30295],[51.114601,1.30302],[51.114639,1.30313],[51.114651,1.30328],[51.114639,1.30338],[51.11459,1.30349],[51.114552,1.30354],[51.114559,1.30386],[51.114571,1.30415],[51.114658,1.30462],[51.114731,1.30493],[51.11491,1.30535],[51.11507,1.30566],[51.11525,1.30597],[51.115429,1.3062],[51.115829,1.30659],[51.11618,1.30687],[51.116539,1.30705],[51.11694,1.30718],[51.1171,1.3072],[51.117249,1.30716],[51.117298,1.30712],[51.11739,1.30709],[51.11747,1.30711],[51.11755,1.3072],[51.11771,1.30735],[51.117859,1.30746],[51.118038,1.30755],[51.118301,1.30769],[51.11861,1.30787],[51.118938,1.30809],[51.119362,1.30841],[51.119888,1.30906],[51.11993,1.30902],[51.11998,1.30901],[51.12001,1.30901],[51.12006,1.30904],[51.120098,1.30911],[51.120121,1.30918],[51.120121,1.30924],[51.120609,1.3098],[51.12125,1.31049],[51.122311,1.3116],[51.122829,1.31228],[51.123299,1.31321],[51.12336,1.31319],[51.12344,1.31321],[51.123489,1.31326],[51.123531,1.31334],[51.12355,1.31343],[51.12355,1.31351],[51.123531,1.3136],[51.123501,1.31366],[51.12384,1.31478],[51.123871,1.31488],[51.12392,1.31503],[51.1241,1.31553],[51.12455,1.3167],[51.125172,1.31831],[51.125408,1.31906],[51.125462,1.3194],[51.125481,1.31952],[51.1255,1.3205],[51.12537,1.3222],[51.12534,1.32278],[51.125351,1.32315],[51.12537,1.32341],[51.125389,1.32368],[51.1255,1.3245],[51.12595,1.32607],[51.126171,1.32679],[51.126251,1.32687],[51.126301,1.32687],[51.12635,1.32691],[51.126381,1.32697],[51.1264,1.32701],[51.126411,1.32709],[51.126411,1.32714],[51.12661,1.3272],[51.12674,1.32733],[51.127281,1.32823],[51.127659,1.32897],[51.12793,1.3295],[51.128151,1.33004],[51.128342,1.33049],[51.128391,1.33063],[51.128429,1.33076],[51.128479,1.331],[51.128502,1.33119],[51.128632,1.33167],[51.128719,1.33201],[51.12878,1.33245],[51.128799,1.3326],[51.12886,1.33275],[51.129009,1.33327],[51.12907,1.33347],[51.12907,1.33365],[51.12907,1.33392],[51.129421,1.33511],[51.12965,1.33549],[51.129799,1.33605],[51.12986,1.33621],[51.129921,1.33647],[51.12994,1.33681],[51.1301,1.33749],[51.130089,1.33783],[51.129978,1.33815],[51.129921,1.33843],[51.12991,1.33859],[51.12989,1.33884],[51.12989,1.33906],[51.129921,1.33965],[51.130001,1.34022],[51.130131,1.34103],[51.130161,1.34122],[51.13018,1.3414],[51.130169,1.34149],[51.13015,1.34158],[51.130112,1.34162],[51.130058,1.34167],[51.12999,1.34169],[51.129921,1.34164],[51.129879,1.34158],[51.129848,1.34154],[51.12981,1.34135],[51.12981,1.34135],[51.129761,1.34097],[51.1297,1.3406],[51.129681,1.34054],[51.129601,1.34023],[51.129601,1.3402],[51.129551,1.33999],[51.129539,1.3399],[51.12952,1.33983],[51.129509,1.33976],[51.12949,1.33967],[51.129478,1.33961],[51.129459,1.33953],[51.12944,1.33945],[51.129349,1.33897],[51.129341,1.3389],[51.129292,1.33865],[51.12928,1.33857],[51.129269,1.33852],[51.12925,1.33846],[51.1292,1.3382],[51.12899,1.33747],[51.128502,1.33599],[51.127621,1.33327],[51.127369,1.33316],[51.126629,1.33378],[51.126621,1.33374],[51.126621,1.33364],[51.12664,1.33357],[51.12669,1.33347],[51.124249,1.33631],[51.12339,1.33681],[51.122921,1.33723],[51.122219,1.33852],[51.121521,1.34088],[51.1213,1.34214],[51.120991,1.34396],[51.121029,1.34623],[51.12122,1.34811],[51.121658,1.3505],[51.122429,1.35514],[51.122669,1.35707],[51.12252,1.35925],[51.117809,1.37432],[51.113098,1.38939],[51.108391,1.40446],[51.10368,1.41953],[51.098961,1.4346],[51.09425,1.44967],[51.089539,1.46474],[51.084831,1.47981],[51.080109,1.49488],[51.068069,1.51962],[51.053921,1.56329],[51.04071,1.59852],[51.025211,1.63092],[51.001999,1.66988],[50.982979,1.702],[50.971821,1.73021],[50.965912,1.75008],[50.965778,1.7616],[50.967621,1.78272],[50.970249,1.81447],[50.9734,1.83058],[50.971569,1.84148],[50.970322,1.84528],[50.96946,1.84855],[50.968941,1.85085],[50.967468,1.851],[50.9664,1.85395],[50.965809,1.85499],[50.965721,1.85539],[50.965389,1.85658],[50.965279,1.857],[50.965061,1.85736],[50.964859,1.85768],[50.964828,1.85799],[50.964859,1.85852],[50.96513,1.86018],[50.965439,1.86224],[50.96553,1.86291],[50.965591,1.86335],[50.965679,1.86408],[50.965759,1.86463],[50.965801,1.86492],[50.96571,1.86559],[50.966,1.86722],[50.966209,1.86859],[50.9664,1.86985],[50.966579,1.87094],[50.966721,1.87124],[50.966881,1.87146],[50.967152,1.87174],[50.967251,1.87199],[50.967319,1.87213],[50.967339,1.8723],[50.967319,1.87242],[50.967258,1.87253],[50.967171,1.87264],[50.967049,1.87269],[50.966961,1.87267],[50.9669,1.87264],[50.966782,1.87256],[50.966679,1.87258],[50.966621,1.87266],[50.966579,1.87277],[50.966572,1.87295],[50.966591,1.87306],[50.966709,1.87319],[50.966831,1.87318],[50.9669,1.87312],[50.966942,1.87316],[50.967289,1.87339],[50.9678,1.87385],[50.968369,1.87442],[50.968632,1.87467],[50.968922,1.87501],[50.968971,1.87539],[50.969151,1.87581],[50.96944,1.87606],[50.969521,1.87685],[50.969688,1.87737],[50.97023,1.87846],[50.970631,1.88081],[50.971611,1.88645],[50.97216,1.88977],[50.972839,1.89413],[50.973099,1.89619],[50.973129,1.89712],[50.97298,1.89819],[50.972778,1.8989],[50.972679,1.89918],[50.972198,1.90005],[50.971581,1.90064],[50.97086,1.90113],[50.970188,1.9014],[50.969372,1.90176],[50.96859,1.90212],[50.967812,1.90248],[50.964081,1.90407],[50.961891,1.9049],[50.96096,1.9052],[50.959148,1.90522],[50.95834,1.90519],[50.95726,1.90522],[50.956211,1.90542],[50.955238,1.90564],[50.9543,1.90587],[50.95359,1.90598],[50.95314,1.90604],[50.951931,1.90612],[50.950241,1.90554],[50.948601,1.90488],[50.94746,1.90462],[50.946918,1.90463],[50.946239,1.90463],[50.94558,1.90469],[50.94376,1.90518],[50.941341,1.90606],[50.93996,1.90648],[50.938591,1.90685],[50.938332,1.90688],[50.93803,1.90684],[50.937759,1.90675],[50.93718,1.90661],[50.936871,1.90664],[50.936359,1.90679],[50.936211,1.90684],[50.935741,1.907],[50.93536,1.90711],[50.93515,1.90722],[50.93494,1.90754],[50.934849,1.90806],[50.93491,1.90848],[50.935089,1.90874],[50.935341,1.909],[50.93557,1.90922],[50.935749,1.90945],[50.935871,1.90982],[50.935982,1.91027],[50.9361,1.91173],[50.93652,1.91885],[50.936661,1.92109],[50.93705,1.9273],[50.937328,1.93228],[50.93745,1.93517],[50.937481,1.93688],[50.937592,1.94222],[50.93758,1.94278],[50.937469,1.94724],[50.937031,1.954],[50.936668,1.95871],[50.936298,1.96403],[50.936111,1.96788],[50.936081,1.96839],[50.936081,1.96851],[50.93605,1.96892],[50.935841,1.97239],[50.935669,1.97436],[50.935249,1.97886],[50.934761,1.98359],[50.93433,1.98798],[50.933788,1.99334],[50.933262,1.99872],[50.93314,1.99992],[50.93272,2.00394],[50.932549,2.00585],[50.932232,2.00935],[50.931931,2.01479],[50.931839,2.0177],[50.931839,2.02036],[50.931911,2.0256],[50.932259,2.03095],[50.932838,2.0366],[50.93351,2.04213],[50.93404,2.04668],[50.934681,2.0518],[50.934731,2.05231],[50.93486,2.05341],[50.935459,2.05849],[50.93618,2.06459],[50.936821,2.06931],[50.937,2.07046],[50.93721,2.07157],[50.938049,2.07576],[50.939331,2.08131],[50.940979,2.08698],[50.943771,2.09651],[50.944969,2.10024],[50.945171,2.10083],[50.945358,2.10132],[50.94603,2.103],[50.947449,2.10617],[50.948669,2.10898],[50.94949,2.11112],[50.95013,2.11311],[50.950569,2.11476],[50.95084,2.11595],[50.951061,2.11703],[50.951229,2.11799],[50.95134,2.11879],[50.95142,2.11946],[50.951481,2.12005],[50.951561,2.12091],[50.951611,2.12154],[50.95163,2.12226],[50.95166,2.12399],[50.95163,2.12719],[50.95166,2.12849],[50.951679,2.12922],[50.95174,2.12994],[50.951801,2.13068],[50.952049,2.13256],[50.95219,2.13337],[50.952339,2.13407],[50.95245,2.13468],[50.952751,2.13587],[50.95314,2.13722],[50.95356,2.1384],[50.955509,2.14382],[50.95594,2.14511],[50.956402,2.14664],[50.956619,2.14741],[50.957272,2.15017],[50.957581,2.15165],[50.95792,2.15362],[50.958241,2.1558],[50.958389,2.15706],[50.958488,2.15826],[50.958569,2.15916],[50.958691,2.16131],[50.958729,2.16278],[50.958759,2.16826],[50.958771,2.17093],[50.958771,2.1724],[50.958778,2.17312],[50.958771,2.17719],[50.958809,2.18107],[50.958809,2.18387],[50.958832,2.18546],[50.95887,2.18725],[50.958931,2.1886],[50.959,2.18962],[50.959042,2.19044],[50.959202,2.1941],[50.95929,2.19583],[50.959358,2.19713],[50.959431,2.19857],[50.95977,2.2044],[50.959888,2.20581],[50.959999,2.20656],[50.960129,2.20742],[50.9603,2.2083],[50.960491,2.20918],[50.96106,2.21099],[50.961369,2.21185],[50.96188,2.21307],[50.962372,2.2141],[50.963051,2.2153],[50.9636,2.21608],[50.964081,2.21676],[50.964951,2.21779],[50.966351,2.21906],[50.967548,2.21984],[50.968819,2.2204],[50.969082,2.22051],[50.96999,2.22091],[50.971722,2.22168],[50.973011,2.22223],[50.975269,2.22326],[50.977989,2.22447],[50.979801,2.22537],[50.981491,2.22651],[50.98312,2.22801],[50.98465,2.22979],[50.985142,2.23047],[50.98571,2.23135],[50.98613,2.23207],[50.987309,2.23417],[50.98785,2.23533],[50.988258,2.23622],[50.988621,2.2371],[50.988838,2.23776],[50.988979,2.23815],[50.98951,2.23991],[50.98983,2.24111],[50.990131,2.24249],[50.990311,2.24335],[50.990471,2.24433],[50.990582,2.2451],[50.990631,2.24546],[50.990749,2.24652],[50.990849,2.24767],[50.991001,2.24997],[50.991089,2.25132],[50.991219,2.25285],[50.991371,2.25542],[50.991428,2.25736],[50.99139,2.25824],[50.99131,2.25904],[50.991131,2.26062],[50.990978,2.26203],[50.990929,2.2628],[50.990929,2.26349],[50.990959,2.26412],[50.991089,2.26534],[50.991329,2.26651],[50.991539,2.26752],[50.99189,2.26896],[50.992081,2.26975],[50.992519,2.27123],[50.99271,2.27176],[50.992908,2.27231],[50.993698,2.27429],[50.993881,2.27475],[50.994141,2.27543],[50.994438,2.27647],[50.994991,2.27878],[50.9953,2.2799],[50.99596,2.28193],[50.99688,2.28418],[50.997162,2.2849],[50.997421,2.28563],[50.998192,2.2878],[50.99921,2.29085],[50.999458,2.29158],[51.000069,2.29328],[51.00098,2.29593],[51.002178,2.29964],[51.002411,2.30036],[51.002861,2.30196],[51.003071,2.3028],[51.003368,2.30435],[51.003601,2.30583],[51.004189,2.3101],[51.00425,2.31055],[51.00428,2.31072],[51.004551,2.31257],[51.00457,2.31275],[51.004662,2.3134],[51.005409,2.31722],[51.006069,2.31984],[51.00629,2.32056],[51.007221,2.32332],[51.00766,2.32452],[51.008259,2.32605],[51.008968,2.32791],[51.00951,2.32936],[51.00988,2.33063],[51.01022,2.3319],[51.010448,2.3329],[51.01078,2.33461],[51.01096,2.33604],[51.011009,2.33643],[51.011589,2.34118],[51.01228,2.34741],[51.012379,2.34865],[51.012421,2.34995],[51.012428,2.35025],[51.01247,2.35212],[51.012482,2.35917],[51.01247,2.36228],[51.01247,2.36496],[51.012508,2.36668],[51.012539,2.36733],[51.012569,2.36826],[51.01263,2.36958],[51.012718,2.37139],[51.01276,2.37266],[51.01281,2.37337],[51.012859,2.37427],[51.012989,2.37692],[51.013031,2.37775],[51.0131,2.37894],[51.013119,2.37918],[51.013168,2.37968],[51.013229,2.38015],[51.01339,2.38113],[51.01387,2.38398],[51.013981,2.38455],[51.014462,2.38727],[51.015091,2.39079],[51.01532,2.39201],[51.015518,2.39305],[51.01577,2.39428],[51.016029,2.39543],[51.016209,2.39619],[51.016369,2.39682],[51.01656,2.39753],[51.017361,2.40001],[51.01757,2.40063],[51.018608,2.40362],[51.018929,2.40452],[51.020679,2.40955],[51.02113,2.41077],[51.02158,2.41194],[51.022331,2.41373],[51.02293,2.41513],[51.02372,2.41692],[51.024632,2.41896],[51.026299,2.42273],[51.02718,2.42467],[51.028221,2.42699],[51.030571,2.43217],[51.031361,2.43401],[51.033642,2.43905],[51.035229,2.44255],[51.036591,2.44564],[51.03743,2.4476],[51.037861,2.44877],[51.03817,2.44976],[51.03846,2.45073],[51.038769,2.45191],[51.039108,2.45333],[51.039459,2.45497],[51.040298,2.45914],[51.04211,2.46828],[51.042839,2.47194],[51.043209,2.47404],[51.043419,2.47535],[51.043671,2.47711],[51.043831,2.47876],[51.04398,2.48044],[51.044079,2.4824],[51.04414,2.48386],[51.04417,2.48536],[51.04414,2.48689],[51.044071,2.48871],[51.044022,2.48969],[51.043941,2.49072],[51.043228,2.49809],[51.042229,2.50844],[51.042099,2.51063],[51.042042,2.51265],[51.04208,2.51446],[51.04216,2.51609],[51.042301,2.5175],[51.042431,2.51842],[51.042789,2.52042],[51.043201,2.52211],[51.043598,2.52368],[51.044231,2.52565],[51.04472,2.5272],[51.044941,2.52797],[51.045132,2.52855],[51.04546,2.52966],[51.04578,2.53064],[51.045891,2.53098],[51.046169,2.5318],[51.04644,2.5325],[51.046551,2.5328],[51.047539,2.53531],[51.048191,2.53675],[51.048828,2.53811],[51.051281,2.54349],[51.052811,2.54681],[51.053501,2.5486],[51.054089,2.5503],[51.054699,2.55229],[51.055302,2.55448],[51.055779,2.55651],[51.056301,2.55905],[51.056591,2.56043],[51.057049,2.56247],[51.057251,2.5634],[51.058319,2.56843],[51.058601,2.56969],[51.05888,2.57087],[51.059212,2.57214],[51.05962,2.57351],[51.060001,2.57471],[51.060371,2.57579],[51.060902,2.57714],[51.061588,2.57888],[51.062038,2.58001],[51.063679,2.58404],[51.064041,2.58492],[51.0644,2.58588],[51.064911,2.58728],[51.065319,2.58853],[51.065651,2.58961],[51.066101,2.59122],[51.066479,2.59272],[51.06683,2.59427],[51.067131,2.59571],[51.06741,2.59735],[51.06752,2.59797],[51.067711,2.59921],[51.06786,2.6003],[51.068031,2.60169],[51.068169,2.60318],[51.06831,2.60502],[51.06839,2.60678],[51.068409,2.6073],[51.068439,2.60869],[51.068439,2.6096],[51.068409,2.61156],[51.068352,2.61305],[51.068291,2.61409],[51.068241,2.61486],[51.068169,2.61588],[51.06805,2.61712],[51.067928,2.61827],[51.067799,2.61933],[51.067631,2.62045],[51.06739,2.62205],[51.067131,2.62364],[51.066879,2.62531],[51.066589,2.62707],[51.066341,2.62856],[51.06609,2.63003],[51.065769,2.63167],[51.065529,2.63282],[51.065239,2.63404],[51.064911,2.63527],[51.064499,2.63671],[51.064251,2.63747],[51.064041,2.63811],[51.063499,2.63943],[51.06292,2.64086],[51.06221,2.64252],[51.061131,2.64454],[51.06012,2.64638],[51.059299,2.64799],[51.05862,2.6494],[51.058022,2.65077],[51.057529,2.6522],[51.05703,2.65394],[51.056808,2.65493],[51.056419,2.65689],[51.05621,2.65862],[51.056099,2.65998],[51.056091,2.66042],[51.056019,2.66226],[51.056011,2.66247],[51.05621,2.66523],[51.056252,2.66562],[51.05637,2.66661],[51.056469,2.66746],[51.05687,2.67003],[51.057079,2.67121],[51.057301,2.67227],[51.057659,2.67373],[51.058041,2.67517],[51.0583,2.676],[51.058529,2.67676],[51.059441,2.67934],[51.059929,2.68044],[51.060501,2.68175],[51.061081,2.68296],[51.061581,2.68396],[51.062191,2.68504],[51.06329,2.68672],[51.066238,2.69064],[51.069191,2.6946],[51.06953,2.69505],[51.07011,2.69584],[51.071651,2.69795],[51.072418,2.69904],[51.072762,2.69952],[51.07328,2.70028],[51.073631,2.70076],[51.075062,2.70318],[51.075989,2.70478],[51.076469,2.7056],[51.07737,2.70742],[51.078041,2.70881],[51.080669,2.71368],[51.082119,2.71651],[51.08403,2.72024],[51.08596,2.72395],[51.08749,2.72654],[51.08762,2.72676],[51.088009,2.72735],[51.08828,2.72776],[51.089901,2.72983],[51.090542,2.73054],[51.092491,2.73254],[51.097069,2.73603],[51.100849,2.7394],[51.10141,2.73993],[51.102261,2.74083],[51.104359,2.74302],[51.10585,2.74498],[51.106361,2.74564],[51.10854,2.7486],[51.109261,2.74981],[51.11198,2.75436],[51.11467,2.76005],[51.114891,2.76061],[51.115601,2.7626],[51.115761,2.76306],[51.116161,2.76409],[51.116589,2.76529],[51.117771,2.76841],[51.12117,2.77827],[51.12418,2.78692],[51.124359,2.78746],[51.124859,2.78887],[51.12764,2.7969],[51.127831,2.79746],[51.12862,2.79973],[51.129101,2.80112],[51.129269,2.80159],[51.132858,2.81214],[51.133221,2.81331],[51.133461,2.8141],[51.133888,2.81561],[51.134201,2.81676],[51.134811,2.8192],[51.135349,2.82163],[51.13567,2.82325],[51.135899,2.82449],[51.136089,2.82548],[51.136349,2.82713],[51.1371,2.83239],[51.13726,2.83359],[51.137409,2.83465],[51.138371,2.8417],[51.139099,2.84658],[51.140308,2.85454],[51.141491,2.86184],[51.14164,2.86276],[51.1422,2.86733],[51.142479,2.86962],[51.14296,2.87444],[51.144299,2.8852],[51.145679,2.89336],[51.146931,2.89956],[51.147221,2.90083],[51.147518,2.90218],[51.149181,2.9089],[51.150909,2.91532],[51.15292,2.92111],[51.153099,2.92162],[51.15398,2.92417],[51.154831,2.92664],[51.157249,2.93277],[51.158779,2.9367],[51.161579,2.94386],[51.162491,2.94619],[51.163288,2.94829],[51.16412,2.95068],[51.16468,2.95227],[51.16494,2.95305],[51.165619,2.95527],[51.166962,2.96013],[51.16769,2.96342],[51.168159,2.96567],[51.16877,2.96918],[51.16906,2.97102],[51.169399,2.97327],[51.171879,2.99036],[51.17207,2.99165],[51.172211,2.99269],[51.172989,2.99807],[51.17305,2.99851],[51.17329,3.00016],[51.173649,3.00226],[51.17411,3.0044],[51.17445,3.0058],[51.174931,3.00759],[51.175331,3.00901],[51.17564,3.00987],[51.17952,3.01954],[51.179989,3.02066],[51.18058,3.02217],[51.18092,3.02299],[51.18111,3.02352],[51.181301,3.02409],[51.18166,3.02515],[51.182072,3.02648],[51.182388,3.02762],[51.18367,3.03306],[51.185581,3.04182],[51.189091,3.05743],[51.18932,3.0583],[51.18961,3.05942],[51.190521,3.06289],[51.191109,3.06485],[51.19252,3.06975],[51.19273,3.07071],[51.192909,3.07177],[51.193031,3.0727],[51.19313,3.07392],[51.193161,3.07501],[51.19313,3.07626],[51.193081,3.07739],[51.193001,3.07852],[51.19286,3.07972],[51.192612,3.08154],[51.191601,3.0869],[51.191349,3.08837],[51.189911,3.09536],[51.189129,3.0984],[51.1884,3.10066],[51.18821,3.10126],[51.186199,3.10705],[51.184799,3.11107],[51.18198,3.11918],[51.18063,3.1231],[51.177151,3.13324],[51.172661,3.14639],[51.170872,3.15257],[51.17012,3.15582],[51.168468,3.16401],[51.166939,3.17116],[51.163761,3.18813],[51.163589,3.18902],[51.163559,3.18919],[51.162868,3.19267],[51.162819,3.19292],[51.162769,3.19321],[51.16209,3.19636],[51.161621,3.19818],[51.16148,3.19868],[51.16127,3.19942],[51.160938,3.20048],[51.160412,3.20206],[51.160301,3.20234],[51.159901,3.20339],[51.159859,3.2035],[51.159431,3.20455],[51.158451,3.20644],[51.1577,3.20792],[51.15741,3.2085],[51.157162,3.209],[51.156761,3.20971],[51.155579,3.21174],[51.1549,3.21289],[51.153931,3.2146],[51.15324,3.21591],[51.15237,3.2175],[51.152191,3.21782],[51.15126,3.21969],[51.151169,3.21993],[51.15036,3.22156],[51.14901,3.22481],[51.14785,3.22818],[51.146881,3.23154],[51.146709,3.23211],[51.14645,3.23302],[51.144199,3.24088],[51.141628,3.25038],[51.141071,3.25233],[51.14082,3.25322],[51.140671,3.25373],[51.13924,3.25883],[51.136539,3.26866],[51.13134,3.28713],[51.128139,3.29863],[51.123081,3.3166],[51.12204,3.32055],[51.120621,3.32559],[51.118851,3.33186],[51.115269,3.34479],[51.112011,3.35628],[51.111431,3.35809],[51.110771,3.35983],[51.104359,3.37599],[51.1012,3.38387],[51.099739,3.38761],[51.095131,3.39893],[51.094082,3.40177],[51.09256,3.40559],[51.09137,3.40854],[51.089691,3.41275],[51.087132,3.41912],[51.085651,3.42274],[51.084728,3.42507],[51.083801,3.42739],[51.082878,3.42956],[51.081799,3.43221],[51.077339,3.4436],[51.076519,3.44591],[51.07608,3.44729],[51.075981,3.44763],[51.07539,3.44979],[51.07523,3.45041],[51.074879,3.4518],[51.074501,3.45334],[51.07251,3.46253],[51.07196,3.46512],[51.066978,3.48751],[51.06411,3.50061],[51.06105,3.51623],[51.05904,3.5268],[51.058491,3.52974],[51.05685,3.53852],[51.052608,3.55965],[51.05125,3.56586],[51.050892,3.56749],[51.050529,3.56911],[51.050449,3.56951],[51.048389,3.5789],[51.043869,3.59986],[51.03994,3.61792],[51.03949,3.61953],[51.03775,3.62573],[51.034882,3.63601],[51.03474,3.63647],[51.0336,3.64051],[51.033539,3.6407],[51.032398,3.64472],[51.031979,3.64616],[51.030102,3.65281],[51.024891,3.67076],[51.02475,3.67125],[51.023972,3.67402],[51.023472,3.67574],[51.022491,3.67923],[51.022339,3.67977],[51.021801,3.68161],[51.021339,3.68336],[51.02124,3.68376],[51.020981,3.68476],[51.020741,3.68568],[51.020451,3.68685],[51.019531,3.69031],[51.019001,3.69241],[51.018669,3.69363],[51.017109,3.70012],[51.014702,3.71009],[51.014622,3.71042],[51.014179,3.71226],[51.012611,3.71878],[51.01199,3.72128],[51.011631,3.72217],[51.011311,3.72284],[51.010921,3.72339],[51.010578,3.72382],[51.010239,3.72423],[51.009869,3.72483],[51.00975,3.72508],[51.00951,3.72588],[51.00948,3.72621],[51.009491,3.72647],[51.009541,3.72679],[51.009609,3.72702],[51.00983,3.72759],[51.01009,3.72808],[51.010429,3.72839],[51.01075,3.7285],[51.010948,3.72849],[51.01115,3.7284],[51.01136,3.72827],[51.011532,3.72811],[51.011829,3.72787],[51.012039,3.72778],[51.012211,3.72778],[51.012581,3.72798],[51.01424,3.72894],[51.014629,3.72916],[51.014919,3.72937],[51.01688,3.73074],[51.018459,3.73179],[51.020302,3.73307],[51.021832,3.73444],[51.02388,3.7366],[51.025539,3.73839],[51.026699,3.74038],[51.026909,3.74077],[51.028519,3.74369],[51.028671,3.744],[51.028851,3.74435],[51.02964,3.74592],[51.031132,3.74879],[51.03175,3.74997],[51.033428,3.75321],[51.03426,3.75482],[51.03434,3.755],[51.034649,3.75563],[51.03513,3.75661],[51.03561,3.75785],[51.035999,3.75894],[51.036079,3.75915],[51.036282,3.75982],[51.03661,3.76089],[51.037029,3.76254],[51.037769,3.76571],[51.039028,3.771],[51.040112,3.77556],[51.040489,3.77719],[51.04076,3.77847],[51.042011,3.7838],[51.043049,3.78806],[51.043869,3.79144],[51.044189,3.7928],[51.044739,3.79514],[51.044922,3.79591],[51.046181,3.80122],[51.047771,3.80846],[51.04842,3.81174],[51.051239,3.82769],[51.052109,3.8319],[51.053669,3.83831],[51.055191,3.84386],[51.061069,3.8642],[51.064442,3.87572],[51.06472,3.87678],[51.066898,3.88445],[51.06712,3.88559],[51.06768,3.88811],[51.067719,3.88837],[51.068501,3.89206],[51.06926,3.89805],[51.06974,3.90363],[51.070461,3.91495],[51.070679,3.91877],[51.07111,3.92565],[51.073029,3.95806],[51.07357,3.96646],[51.07431,3.97915],[51.075008,3.98714],[51.0751,3.98797],[51.075199,3.98883],[51.07579,3.99259],[51.07642,3.99564],[51.077061,3.99842],[51.0779,4.00133],[51.07872,4.00399],[51.079762,4.00683],[51.0811,4.01003],[51.08247,4.01287],[51.083832,4.0154],[51.084141,4.01594],[51.084549,4.01667],[51.086521,4.02014],[51.087921,4.02232],[51.08857,4.02339],[51.089588,4.02513],[51.09214,4.02944],[51.094528,4.03348],[51.095089,4.03443],[51.095211,4.03463],[51.100471,4.04349],[51.103989,4.049],[51.1068,4.05277],[51.11087,4.05734],[51.11171,4.05818],[51.112061,4.05854],[51.114491,4.06102],[51.116741,4.06331],[51.119381,4.0661],[51.120918,4.06809],[51.122429,4.07029],[51.123482,4.07216],[51.12402,4.07318],[51.124882,4.07494],[51.125778,4.07704],[51.126629,4.07964],[51.1269,4.08055],[51.127289,4.08194],[51.127541,4.08293],[51.12801,4.08511],[51.128479,4.08777],[51.128948,4.09103],[51.129021,4.09139],[51.13044,4.10455],[51.131821,4.1169],[51.132099,4.1194],[51.132549,4.12348],[51.13287,4.12635],[51.13327,4.12978],[51.133492,4.1312],[51.133839,4.13343],[51.134129,4.13519],[51.13456,4.13755],[51.13567,4.14353],[51.13641,4.14755],[51.137051,4.15104],[51.137211,4.15195],[51.13842,4.15828],[51.13921,4.16272],[51.1399,4.16663],[51.140591,4.17049],[51.141171,4.17362],[51.141891,4.17733],[51.142601,4.181],[51.142792,4.1819],[51.14307,4.18315],[51.143871,4.18615],[51.144581,4.18849],[51.145512,4.1912],[51.146679,4.19441],[51.147179,4.19574],[51.148769,4.20004],[51.149929,4.2034],[51.151112,4.20707],[51.152241,4.21068],[51.15329,4.21422],[51.154541,4.21836],[51.15575,4.22231],[51.157169,4.22699],[51.15839,4.23061],[51.159031,4.23227],[51.15947,4.23338],[51.160358,4.23531],[51.16151,4.23769],[51.16222,4.23907],[51.163422,4.24145],[51.16465,4.24383],[51.166279,4.24703],[51.166729,4.24793],[51.16856,4.25151],[51.170139,4.25456],[51.171581,4.25746],[51.172611,4.25952],[51.173389,4.26121],[51.174561,4.26389],[51.175739,4.26696],[51.176899,4.26997],[51.17799,4.27286],[51.1791,4.27582],[51.180599,4.2799],[51.181931,4.2834],[51.182461,4.28477],[51.183208,4.28673],[51.184212,4.28934],[51.18536,4.29224],[51.18586,4.29331],[51.18729,4.29642],[51.188278,4.29836],[51.18964,4.30093],[51.191269,4.30374],[51.192951,4.30655],[51.19482,4.30962],[51.19622,4.31194],[51.19809,4.3151],[51.200298,4.31877],[51.20142,4.32063],[51.201969,4.32153],[51.202431,4.32237],[51.202721,4.32293],[51.203899,4.32522],[51.204651,4.32687],[51.205391,4.32855],[51.206261,4.33073],[51.208328,4.33607],[51.208649,4.33695],[51.210098,4.34071],[51.211281,4.34388],[51.21146,4.34438],[51.211811,4.3453],[51.21233,4.34667],[51.212791,4.348],[51.213051,4.34876],[51.21312,4.34901],[51.213211,4.34932],[51.21349,4.35058],[51.21365,4.3516],[51.213749,4.35238],[51.21384,4.35324],[51.21389,4.35429],[51.213909,4.35537],[51.21386,4.35653],[51.21368,4.35807],[51.21347,4.35916],[51.213249,4.36017],[51.212978,4.36114],[51.21265,4.3621],[51.212238,4.36311],[51.211731,4.36418],[51.21101,4.36534],[51.210381,4.3662],[51.208759,4.36794],[51.208309,4.36843],[51.20274,4.37432],[51.20155,4.3756],[51.20089,4.37635],[51.2006,4.37673],[51.200272,4.37721],[51.19981,4.37797],[51.199322,4.37899],[51.199009,4.37978],[51.19873,4.38062],[51.198471,4.38164],[51.198238,4.38273],[51.19799,4.38423],[51.197701,4.38573],[51.19759,4.38626],[51.197311,4.38756],[51.19706,4.3886],[51.19685,4.38936],[51.19664,4.39006],[51.196251,4.39129],[51.195099,4.39424],[51.194302,4.39627],[51.193001,4.39983],[51.192059,4.40279],[51.191349,4.40556],[51.190941,4.40767],[51.190632,4.40985],[51.190472,4.41161],[51.19038,4.41322],[51.19035,4.41513],[51.19038,4.41674],[51.190498,4.4188],[51.190659,4.42035],[51.190891,4.42221],[51.191311,4.42416],[51.191719,4.42575],[51.192131,4.42716],[51.192619,4.42862],[51.193001,4.42966],[51.193321,4.43038],[51.193649,4.43107],[51.19397,4.43165],[51.194241,4.4321],[51.194618,4.43266],[51.194981,4.43311],[51.195259,4.43343],[51.19561,4.43381],[51.19595,4.43416],[51.196289,4.43445],[51.196659,4.43472],[51.197411,4.43528],[51.198662,4.43609],[51.201191,4.43746],[51.202412,4.43821],[51.203381,4.43891],[51.20462,4.43994],[51.206181,4.44129],[51.206921,4.44199],[51.207901,4.44294],[51.20924,4.44419],[51.210659,4.44546],[51.21167,4.44639],[51.21254,4.44721],[51.213921,4.44847],[51.214569,4.44921],[51.21471,4.4494],[51.214809,4.44956],[51.214951,4.4498],[51.215069,4.45005],[51.215179,4.45031],[51.215279,4.45061],[51.21553,4.45146],[51.215752,4.45216],[51.215969,4.45301],[51.216179,4.45406],[51.21629,4.45504],[51.21624,4.4558],[51.216091,4.45644],[51.21587,4.45707],[51.215561,4.4577],[51.21513,4.45828],[51.214211,4.45917],[51.214001,4.45936],[51.213348,4.45995],[51.212799,4.46049],[51.212372,4.46099],[51.21188,4.46168],[51.211639,4.46209],[51.211399,4.4626],[51.21117,4.46318],[51.210999,4.46376],[51.21085,4.46433],[51.21072,4.46503],[51.21064,4.46571],[51.21059,4.46636],[51.21059,4.46705],[51.21064,4.46793],[51.21069,4.46847],[51.210751,4.4691],[51.210831,4.4697],[51.210949,4.47055],[51.211071,4.47136],[51.211208,4.47228],[51.21133,4.47315],[51.211391,4.47381],[51.21143,4.47447],[51.211441,4.47509],[51.211418,4.4757],[51.211369,4.4763],[51.211288,4.47694],[51.211151,4.47781],[51.21104,4.47848],[51.210621,4.48085],[51.210522,4.48162],[51.210468,4.48231],[51.210442,4.48312],[51.210449,4.48395],[51.210522,4.485],[51.21067,4.48653],[51.2108,4.4878],[51.211021,4.49018],[51.211121,4.49141],[51.211189,4.49236],[51.211281,4.49391],[51.211311,4.49473],[51.211399,4.49656],[51.211411,4.49859],[51.21143,4.49937],[51.211521,4.50276],[51.211601,4.50624],[51.211712,4.51037],[51.211819,4.51426],[51.211979,4.51977],[51.212101,4.52414],[51.212139,4.52645],[51.212139,4.5272],[51.212139,4.52783],[51.212101,4.52956],[51.212009,4.53141],[51.211868,4.53313],[51.21167,4.53514],[51.211361,4.53743],[51.211048,4.5392],[51.210789,4.54045],[51.210499,4.54188],[51.210258,4.54291],[51.20974,4.54486],[51.20895,4.54791],[51.207958,4.55163],[51.207031,4.55523],[51.206242,4.55827],[51.205238,4.56186],[51.204288,4.56546],[51.203209,4.5695],[51.202259,4.57309],[51.201279,4.57603],[51.200741,4.57732],[51.200111,4.57852],[51.199451,4.57959],[51.198872,4.58057],[51.19838,4.58161],[51.19804,4.58262],[51.1978,4.5836],[51.197651,4.58463],[51.197559,4.58614],[51.197651,4.5877],[51.197849,4.58903],[51.198071,4.58982],[51.19841,4.59072],[51.198761,4.59151],[51.199219,4.59231],[51.19952,4.59268],[51.199821,4.59306],[51.2006,4.59405],[51.201351,4.59523],[51.202019,4.59651],[51.202499,4.5977],[51.20274,4.59835],[51.203411,4.60025],[51.2048,4.60414],[51.205589,4.60638],[51.20805,4.61359],[51.20908,4.61659],[51.209782,4.61862],[51.2118,4.62442],[51.211979,4.62497],[51.21299,4.62775],[51.21402,4.63045],[51.215729,4.63444],[51.217651,4.63834],[51.220181,4.64284],[51.22282,4.64712],[51.231232,4.66047],[51.233978,4.66484],[51.236111,4.66835],[51.237961,4.67215],[51.238979,4.67465],[51.239761,4.67689],[51.240608,4.67974],[51.241291,4.68251],[51.241741,4.68479],[51.24213,4.68706],[51.242741,4.6915],[51.243031,4.69416],[51.243351,4.69842],[51.243519,4.70165],[51.24366,4.70643],[51.243729,4.71221],[51.24371,4.71458],[51.243629,4.72741],[51.24353,4.74118],[51.243649,4.75037],[51.243801,4.7541],[51.244019,4.75768],[51.244381,4.76209],[51.24469,4.765],[51.245781,4.77292],[51.24646,4.77688],[51.24728,4.78085],[51.248569,4.7859],[51.250038,4.79077],[51.250561,4.79228],[51.252048,4.79611],[51.254349,4.80124],[51.25631,4.80483],[51.257271,4.80658],[51.259121,4.80975],[51.260399,4.81183],[51.266781,4.82263],[51.279442,4.84386],[51.282082,4.84837],[51.284592,4.85299],[51.285591,4.85501],[51.286049,4.85596],[51.287418,4.85902],[51.288658,4.862],[51.28981,4.86514],[51.290352,4.86664],[51.291531,4.87026],[51.29224,4.87277],[51.292912,4.87527],[51.29356,4.87801],[51.29409,4.88039],[51.294601,4.88287],[51.295071,4.88551],[51.29549,4.88814],[51.29586,4.89084],[51.29615,4.89339],[51.29641,4.89605],[51.296761,4.90148],[51.29689,4.90434],[51.297009,4.90816],[51.297138,4.91369],[51.29726,4.91806],[51.297291,4.91929],[51.297428,4.92479],[51.297451,4.92556],[51.29755,4.92814],[51.29763,4.93275],[51.29784,4.94177],[51.297951,4.94568],[51.298038,4.94993],[51.298092,4.95214],[51.298229,4.95715],[51.298328,4.96224],[51.298389,4.96824],[51.298351,4.97133],[51.298229,4.97483],[51.298038,4.97831],[51.297821,4.98128],[51.297489,4.98522],[51.297081,4.9888],[51.296631,4.99216],[51.295898,4.9968],[51.29517,5.00171],[51.294781,5.00454],[51.294411,5.00746],[51.294209,5.00934],[51.29406,5.01122],[51.293911,5.01361],[51.293781,5.01604],[51.29372,5.01984],[51.293751,5.02273],[51.293812,5.02471],[51.293911,5.02694],[51.294369,5.03214],[51.29475,5.03562],[51.29538,5.04046],[51.296322,5.04725],[51.296661,5.05005],[51.296989,5.05315],[51.29726,5.05621],[51.297401,5.05818],[51.297489,5.06011],[51.297539,5.0623],[51.29755,5.06443],[51.297489,5.06721],[51.29734,5.07002],[51.297009,5.07402],[51.296612,5.07796],[51.295879,5.08397],[51.29549,5.08691],[51.295132,5.09009],[51.294731,5.09394],[51.29464,5.09467],[51.294441,5.09768],[51.294319,5.10016],[51.29425,5.10457],[51.294312,5.10802],[51.294498,5.11234],[51.294731,5.11532],[51.29509,5.11857],[51.295509,5.12156],[51.29599,5.12459],[51.296761,5.12847],[51.298199,5.13422],[51.300072,5.14081],[51.300591,5.14276],[51.301399,5.1459],[51.301991,5.14842],[51.30265,5.15159],[51.303249,5.15458],[51.303871,5.15814],[51.30452,5.16165],[51.305229,5.16517],[51.30595,5.16817],[51.306999,5.17226],[51.30851,5.17732],[51.310181,5.18249],[51.31218,5.18855],[51.312382,5.1892],[51.314838,5.19669],[51.318821,5.20905],[51.32016,5.21303],[51.320591,5.21436],[51.321072,5.21581],[51.321671,5.21766],[51.322681,5.22073],[51.323341,5.22275],[51.324051,5.22488],[51.32439,5.22589],[51.325031,5.22768],[51.325691,5.2294],[51.326279,5.23089],[51.327061,5.23264],[51.327991,5.23451],[51.32906,5.23651],[51.33009,5.23831],[51.331451,5.24065],[51.337521,5.25108],[51.344028,5.26264],[51.349178,5.27182],[51.351452,5.27587],[51.352482,5.27774],[51.353378,5.27947],[51.353821,5.28036],[51.35434,5.28142],[51.35508,5.28302],[51.355801,5.28465],[51.356491,5.28625],[51.36055,5.29579],[51.360729,5.29619],[51.363239,5.30209],[51.36348,5.30268],[51.364941,5.30605],[51.365059,5.30632],[51.36898,5.31556],[51.370361,5.31878],[51.37159,5.32166],[51.374432,5.32837],[51.375191,5.33016],[51.376862,5.33405],[51.382038,5.34624],[51.38332,5.34934],[51.384441,5.35214],[51.385429,5.35471],[51.387878,5.3613],[51.388371,5.36264],[51.389221,5.36492],[51.390381,5.36807],[51.39267,5.37428],[51.393459,5.37644],[51.39439,5.379],[51.394581,5.37961],[51.394798,5.3803],[51.394989,5.38097],[51.395168,5.38164],[51.395432,5.38274],[51.39555,5.38332],[51.395679,5.38394],[51.395851,5.38488],[51.395931,5.38535],[51.396049,5.38617],[51.396118,5.38674],[51.396259,5.38787],[51.396339,5.38878],[51.39642,5.38967],[51.39653,5.39132],[51.396641,5.393],[51.39674,5.39426],[51.396851,5.39539],[51.396912,5.39591],[51.397099,5.39728],[51.397221,5.39805],[51.397369,5.39886],[51.397449,5.39924],[51.397629,5.40014],[51.39777,5.40073],[51.397919,5.40135],[51.398209,5.40239],[51.40057,5.41075],[51.400631,5.41097],[51.402519,5.41765],[51.40287,5.41891],[51.403229,5.42027],[51.403629,5.422],[51.403839,5.42325],[51.403992,5.42403],[51.404099,5.42481],[51.40416,5.4252],[51.404202,5.42569],[51.404209,5.42611],[51.404221,5.42679],[51.404221,5.42789],[51.404209,5.42864],[51.404202,5.42919],[51.40419,5.42974],[51.404209,5.4303],[51.404209,5.43096],[51.404228,5.43145],[51.404259,5.43249],[51.404289,5.43305],[51.40435,5.43362],[51.404461,5.43508],[51.40453,5.43605],[51.404621,5.43689],[51.40485,5.43825],[51.404949,5.43928],[51.405041,5.44026],[51.405121,5.44118],[51.405201,5.44248],[51.405251,5.44356],[51.405369,5.44983],[51.405399,5.45333],[51.405449,5.45596],[51.405491,5.4582],[51.405571,5.46179],[51.40559,5.46252],[51.405609,5.4658],[51.405609,5.46911],[51.405521,5.47301],[51.40551,5.47352],[51.405399,5.47652],[51.40538,5.47713],[51.40527,5.48024],[51.405239,5.48126],[51.404968,5.48955],[51.404942,5.49025],[51.404911,5.49086],[51.404839,5.49202],[51.404781,5.49246],[51.404701,5.49293],[51.40461,5.49339],[51.40453,5.49377],[51.404469,5.4942],[51.404419,5.49469],[51.404388,5.495],[51.404388,5.49536],[51.404388,5.49565],[51.40443,5.49614],[51.404449,5.49643],[51.40448,5.4969],[51.404541,5.49732],[51.404621,5.49771],[51.404709,5.49809],[51.4048,5.49852],[51.404861,5.49884],[51.4049,5.49925],[51.404919,5.49962],[51.40493,5.49999],[51.404919,5.50091],[51.404919,5.50125],[51.4049,5.50403],[51.4049,5.50435],[51.40493,5.51077],[51.40493,5.51908],[51.404911,5.53358],[51.4049,5.53708],[51.4049,5.54587],[51.404911,5.54781],[51.404961,5.54935],[51.405041,5.5509],[51.40517,5.55247],[51.405239,5.55322],[51.40538,5.55445],[51.405571,5.55591],[51.405788,5.55737],[51.40588,5.55797],[51.40617,5.55947],[51.40646,5.56091],[51.40659,5.56148],[51.40731,5.56419],[51.407681,5.56548],[51.408421,5.56768],[51.408791,5.56875],[51.408951,5.56924],[51.41061,5.57402],[51.411709,5.57722],[51.413349,5.582],[51.416458,5.5911],[51.41695,5.59265],[51.417591,5.59477],[51.417992,5.59638],[51.418369,5.59811],[51.41872,5.59991],[51.418949,5.60137],[51.419189,5.60318],[51.419449,5.60551],[51.420132,5.61227],[51.421539,5.62703],[51.421829,5.63011],[51.42268,5.63891],[51.423019,5.64245],[51.423439,5.64695],[51.423569,5.64864],[51.423649,5.6499],[51.423691,5.6508],[51.423698,5.65328],[51.423672,5.65704],[51.423641,5.6593],[51.42358,5.66349],[51.4235,5.66887],[51.423439,5.67272],[51.423409,5.676],[51.423359,5.67842],[51.423241,5.68237],[51.423222,5.68285],[51.42308,5.68647],[51.422939,5.6889],[51.422791,5.69085],[51.422359,5.69652],[51.422218,5.69818],[51.42205,5.70026],[51.421551,5.7066],[51.4212,5.7111],[51.42083,5.7156],[51.42057,5.71879],[51.420441,5.72116],[51.420319,5.723],[51.42025,5.72475],[51.420109,5.72959],[51.42012,5.73225],[51.42017,5.73484],[51.420212,5.73755],[51.420219,5.73999],[51.42017,5.74142],[51.42009,5.74328],[51.419949,5.74522],[51.419701,5.74773],[51.419529,5.74925],[51.419449,5.74987],[51.419128,5.75225],[51.418869,5.75407],[51.41861,5.75592],[51.418388,5.75762],[51.418079,5.75985],[51.41795,5.76072],[51.417461,5.76412],[51.417301,5.76526],[51.41711,5.76661],[51.41692,5.76774],[51.416599,5.76945],[51.41618,5.77184],[51.41555,5.77506],[51.415131,5.77699],[51.41449,5.7797],[51.414021,5.78159],[51.41349,5.7837],[51.412601,5.7868],[51.411781,5.78951],[51.410831,5.79252],[51.4072,5.80385],[51.407001,5.80447],[51.40556,5.80905],[51.404072,5.81369],[51.403431,5.81581],[51.402599,5.81868],[51.401981,5.82092],[51.3988,5.83371],[51.397251,5.83991],[51.396141,5.84441],[51.39502,5.8489],[51.393501,5.85508],[51.39146,5.86325],[51.39127,5.864],[51.390388,5.86731],[51.389561,5.87036],[51.387989,5.87586],[51.3848,5.88699],[51.382519,5.89479],[51.380829,5.90075],[51.380119,5.90336],[51.37936,5.90683],[51.37886,5.90941],[51.378521,5.91146],[51.378189,5.91406],[51.377979,5.9158],[51.377789,5.91788],[51.377682,5.91923],[51.377468,5.92297],[51.377441,5.92369],[51.377411,5.92498],[51.377399,5.92758],[51.377499,5.93505],[51.377659,5.94228],[51.377918,5.95907],[51.37801,5.96417],[51.378029,5.96599],[51.37801,5.96775],[51.377918,5.97046],[51.377781,5.97305],[51.377548,5.97627],[51.377331,5.98114],[51.37735,5.9839],[51.37735,5.98477],[51.37759,5.99092],[51.37812,5.99769],[51.37854,6.00253],[51.378769,6.00521],[51.378971,6.00723],[51.37949,6.01193],[51.380131,6.01689],[51.380531,6.01951],[51.381161,6.02336],[51.381538,6.02554],[51.38237,6.02959],[51.382751,6.03147],[51.383732,6.03571],[51.387409,6.05021],[51.389172,6.05713],[51.393082,6.07238],[51.393429,6.07391],[51.393791,6.0758],[51.393978,6.077],[51.394131,6.07807],[51.394249,6.07917],[51.394329,6.0803],[51.394421,6.08177],[51.394451,6.08392],[51.394199,6.09123],[51.394039,6.09627],[51.393539,6.10898],[51.393478,6.1104],[51.39336,6.11481],[51.39333,6.11742],[51.393471,6.1237],[51.393688,6.12859],[51.394279,6.13838],[51.39436,6.13939],[51.394451,6.14064],[51.394501,6.14145],[51.39518,6.15196],[51.39534,6.15451],[51.395611,6.15861],[51.395901,6.16434],[51.39592,6.16507],[51.39595,6.16609],[51.395969,6.1688],[51.395931,6.17027],[51.395851,6.17172],[51.395809,6.17254],[51.395741,6.17316],[51.39547,6.17562],[51.39521,6.17761],[51.39481,6.17986],[51.394588,6.18087],[51.39426,6.18234],[51.393848,6.18393],[51.393051,6.18666],[51.391201,6.19293],[51.389439,6.19895],[51.387581,6.20492],[51.387119,6.20635],[51.386139,6.20954],[51.384048,6.21632],[51.382431,6.22147],[51.382191,6.2223],[51.38166,6.22413],[51.381069,6.2267],[51.380482,6.23024],[51.380211,6.23265],[51.380039,6.23456],[51.379971,6.23568],[51.379929,6.23745],[51.379971,6.23919],[51.38002,6.24017],[51.380169,6.24235],[51.380199,6.24288],[51.380268,6.24355],[51.380409,6.24457],[51.38081,6.24762],[51.381229,6.24972],[51.381771,6.25191],[51.381851,6.25218],[51.3825,6.25446],[51.382992,6.25592],[51.384571,6.25981],[51.38628,6.26362],[51.38763,6.26717],[51.387741,6.26748],[51.388821,6.27117],[51.388981,6.27186],[51.389351,6.27366],[51.389759,6.27584],[51.38987,6.27655],[51.389969,6.27729],[51.390339,6.28112],[51.390339,6.28241],[51.390339,6.28301],[51.39035,6.28613],[51.390091,6.29202],[51.389912,6.29597],[51.38982,6.29785],[51.389729,6.30039],[51.389488,6.30467],[51.389172,6.31284],[51.388729,6.32214],[51.38855,6.329],[51.388599,6.33371],[51.388821,6.33742],[51.38884,6.33765],[51.38884,6.33775],[51.389149,6.34048],[51.389622,6.34365],[51.39024,6.3467],[51.390331,6.34707],[51.390652,6.34839],[51.391491,6.35144],[51.392441,6.35452],[51.393871,6.3589],[51.394058,6.35941],[51.394421,6.3605],[51.394821,6.36159],[51.39584,6.36458],[51.39621,6.36582],[51.39698,6.36793],[51.399311,6.3749],[51.400372,6.37825],[51.400539,6.37881],[51.401581,6.38237],[51.403149,6.38824],[51.403801,6.39103],[51.404282,6.39306],[51.404369,6.39346],[51.40443,6.39371],[51.40451,6.39412],[51.405708,6.40013],[51.406979,6.40767],[51.40802,6.41569],[51.40815,6.41689],[51.40823,6.41773],[51.408329,6.41866],[51.40844,6.41988],[51.408619,6.42204],[51.408718,6.42343],[51.408958,6.42648],[51.409351,6.43376],[51.410229,6.44922],[51.410912,6.46069],[51.411388,6.46954],[51.41164,6.47208],[51.411819,6.47329],[51.41193,6.47387],[51.412102,6.47472],[51.412529,6.47644],[51.41304,6.47806],[51.413429,6.47915],[51.41362,6.47958],[51.41433,6.48118],[51.416302,6.4848],[51.418781,6.48943],[51.419121,6.4901],[51.419258,6.49035],[51.419521,6.49084],[51.419819,6.49143],[51.420101,6.49197],[51.42136,6.49432],[51.423061,6.49833],[51.42363,6.49987],[51.42461,6.50291],[51.425228,6.50535],[51.426071,6.50966],[51.426102,6.50984],[51.426151,6.51011],[51.426491,6.51252],[51.426498,6.51262],[51.42659,6.51358],[51.426762,6.51535],[51.427052,6.52207],[51.427231,6.53069],[51.427238,6.53088],[51.427368,6.53329],[51.427521,6.53609],[51.42799,6.54291],[51.42828,6.54714],[51.428631,6.55212],[51.428928,6.55589],[51.429508,6.56421],[51.43005,6.56866],[51.43092,6.57325],[51.431541,6.57603],[51.432091,6.57825],[51.432789,6.58093],[51.433418,6.58378],[51.434471,6.58956],[51.435162,6.59419],[51.435532,6.59735],[51.435841,6.60087],[51.435982,6.60295],[51.436031,6.60391],[51.436089,6.60506],[51.436169,6.60728],[51.436211,6.60933],[51.43623,6.61085],[51.436218,6.61229],[51.436211,6.61338],[51.43618,6.61485],[51.436161,6.61573],[51.436119,6.61677],[51.436001,6.61847],[51.435909,6.62006],[51.43589,6.62054],[51.435791,6.62232],[51.435719,6.6238],[51.435619,6.6272],[51.435631,6.63186],[51.435719,6.63537],[51.435928,6.63872],[51.436218,6.64277],[51.43652,6.64744],[51.43663,6.64967],[51.43671,6.65219],[51.436729,6.65546],[51.43679,6.65711],[51.43697,6.66175],[51.437,6.66234],[51.437019,6.66297],[51.437279,6.67126],[51.437321,6.67279],[51.437359,6.67531],[51.43742,6.68066],[51.437401,6.68155],[51.43737,6.68277],[51.437271,6.68504],[51.437111,6.68668],[51.43681,6.6887],[51.43618,6.69207],[51.435699,6.69477],[51.435581,6.69569],[51.435509,6.69632],[51.43541,6.69751],[51.435349,6.69886],[51.435329,6.70035],[51.435379,6.70175],[51.435509,6.70337],[51.435692,6.70467],[51.436069,6.7069],[51.43811,6.71953],[51.438358,6.72115],[51.438541,6.7228],[51.438629,6.72482],[51.438511,6.72655],[51.438271,6.72848],[51.437729,6.73069],[51.436901,6.7328],[51.436451,6.73392],[51.436169,6.73462],[51.43568,6.73624],[51.435421,6.73745],[51.435291,6.73821],[51.435051,6.73985],[51.43491,6.74152],[51.43486,6.74321],[51.434849,6.74462],[51.434929,6.74645],[51.435169,6.74879],[51.435349,6.7499],[51.435471,6.75059],[51.43568,6.75184],[51.43605,6.75345],[51.436588,6.75525],[51.437061,6.75633],[51.43734,6.75687],[51.438301,6.7584],[51.439831,6.76023],[51.44173,6.76266],[51.44257,6.76421],[51.443211,6.76552],[51.443981,6.76754],[51.444592,6.7697],[51.445171,6.77222],[51.44598,6.77676],[51.44632,6.77867],[51.446621,6.78057],[51.447021,6.78296],[51.447361,6.78519],[51.44762,6.78704],[51.4478,6.78876],[51.44783,6.79036],[51.4478,6.79163],[51.447601,6.79349],[51.447311,6.79505],[51.44696,6.79636],[51.446671,6.79732],[51.44632,6.79822],[51.446072,6.79865],[51.445259,6.80026],[51.444401,6.80188],[51.44429,6.80213],[51.443951,6.80283],[51.443432,6.80394],[51.44305,6.80456],[51.44294,6.80471],[51.442791,6.80487],[51.44265,6.80495],[51.442459,6.80499],[51.442329,6.80496],[51.442181,6.80488],[51.442081,6.80479],[51.44194,6.80458],[51.44186,6.8043],[51.441811,6.8041],[51.441792,6.8038],[51.441792,6.80368],[51.441811,6.80346],[51.441879,6.80322],[51.441959,6.80295],[51.442089,6.80256],[51.442211,6.80226],[51.442429,6.80195],[51.442871,6.80134],[51.44342,6.8007],[51.444061,6.80015],[51.444431,6.79987],[51.444641,6.79971],[51.444809,6.7996],[51.44566,6.79921],[51.446529,6.799],[51.447182,6.79889],[51.447929,6.79884],[51.449249,6.79886],[51.450062,6.79895],[51.451248,6.7991],[51.45211,6.79927],[51.45311,6.79947],[51.454029,6.79984],[51.454899,6.80039],[51.45573,6.80101],[51.45639,6.80168],[51.456959,6.80235],[51.457588,6.80329],[51.458141,6.80427],[51.45866,6.80531],[51.459122,6.80651],[51.459789,6.80861],[51.460159,6.8097],[51.460659,6.81081],[51.46172,6.81251],[51.461948,6.81283],[51.462391,6.81341],[51.462681,6.81371],[51.463501,6.81453],[51.46389,6.81483],[51.464821,6.81552],[51.465771,6.8159],[51.466869,6.81625],[51.468349,6.81658],[51.470051,6.81669],[51.471851,6.8165],[51.473011,6.81621],[51.47398,6.81587],[51.474541,6.8157],[51.47541,6.81537],[51.47633,6.81497],[51.477489,6.81446],[51.478821,6.81388],[51.47916,6.81377],[51.480099,6.81351],[51.48127,6.81332],[51.48185,6.8133],[51.483139,6.81333],[51.483341,6.81342],[51.483582,6.81349],[51.484051,6.8136],[51.484409,6.8137],[51.4851,6.814],[51.4855,6.81421],[51.485771,6.8144],[51.486031,6.8146],[51.486149,6.81473],[51.48632,6.81496],[51.486488,6.81527],[51.48661,6.81557],[51.48674,6.81603],[51.486801,6.81641],[51.48682,6.81667],[51.486832,6.81699],[51.486809,6.81731],[51.486252,6.82101],[51.486198,6.82155],[51.486191,6.82224],[51.48613,6.82305],[51.486099,6.82352],[51.486069,6.82462],[51.486118,6.82628],[51.48629,6.82779],[51.48674,6.83007],[51.4874,6.83218],[51.488831,6.836],[51.489079,6.83642],[51.48975,6.83737],[51.490349,6.83822],[51.490829,6.83886],[51.49268,6.84133],[51.492962,6.84171],[51.493629,6.84264],[51.49432,6.84385],[51.4949,6.84507],[51.495281,6.84597],[51.49572,6.84735],[51.496052,6.8486],[51.496349,6.85008],[51.496571,6.85205],[51.496651,6.85463],[51.49654,6.85815],[51.496441,6.86022],[51.496342,6.86164],[51.49622,6.8647],[51.496101,6.86872],[51.496132,6.87109],[51.496342,6.88355],[51.496422,6.88532],[51.496639,6.8891],[51.496681,6.88994],[51.496769,6.89124],[51.49688,6.89292],[51.49704,6.89456],[51.49754,6.90146],[51.49781,6.91115],[51.49823,6.9167],[51.498699,6.92018],[51.499279,6.92279],[51.49995,6.9251],[51.500381,6.92628],[51.502979,6.93204],[51.503391,6.93294],[51.50415,6.93473],[51.50428,6.93505],[51.504478,6.93559],[51.50473,6.93621],[51.505058,6.93707],[51.50531,6.93774],[51.50568,6.93884],[51.505909,6.93961],[51.506149,6.94042],[51.50634,6.94113],[51.506481,6.94171],[51.50668,6.94259],[51.506882,6.94349],[51.507061,6.94441],[51.507309,6.94577],[51.507511,6.94717],[51.507629,6.94811],[51.507679,6.9483],[51.507751,6.94906],[51.507851,6.95002],[51.507919,6.95101],[51.50798,6.95199],[51.508011,6.95296],[51.508049,6.95394],[51.508049,6.95491],[51.50803,6.95637],[51.508011,6.95741],[51.507969,6.95846],[51.5079,6.95952],[51.507809,6.96061],[51.50771,6.96166],[51.50761,6.96267],[51.507511,6.96364],[51.507401,6.96457],[51.507301,6.96548],[51.50721,6.96642],[51.507099,6.96736],[51.507011,6.96826],[51.506908,6.96914],[51.506802,6.97007],[51.506618,6.97107],[51.506481,6.97167],[51.506088,6.97303],[51.50581,6.97399],[51.50378,6.97994],[51.50354,6.9808],[51.503361,6.98158],[51.50322,6.98288],[51.503109,6.98417],[51.503059,6.98502],[51.503059,6.98587],[51.503132,6.98712],[51.503201,6.98794],[51.50338,6.98916],[51.503559,6.98996],[51.50386,6.99122],[51.50407,6.99203],[51.504471,6.99341],[51.504799,6.99441],[51.505051,6.99517],[51.50531,6.99594],[51.505661,6.99694],[51.505951,6.99787],[51.50618,6.99864],[51.50639,6.99936],[51.506611,7.0001],[51.50679,7.00076],[51.50692,7.00141],[51.50713,7.00247],[51.507252,7.0032],[51.507309,7.00377],[51.507389,7.00478],[51.507469,7.00601],[51.507511,7.00706],[51.507568,7.00815],[51.507622,7.0094],[51.50771,7.01091],[51.507778,7.01189],[51.5079,7.01303],[51.50798,7.01356],[51.50808,7.01418],[51.50853,7.01628],[51.508598,7.01657],[51.50882,7.01736],[51.508911,7.01776],[51.508991,7.01802],[51.509449,7.01924],[51.509651,7.01977],[51.51001,7.02061],[51.510441,7.0216],[51.51067,7.02212],[51.510971,7.02282],[51.511318,7.02362],[51.511749,7.02466],[51.51218,7.02575],[51.512489,7.02662],[51.51302,7.02839],[51.51318,7.02901],[51.513241,7.02923],[51.513378,7.02978],[51.5135,7.03033],[51.51379,7.03182],[51.51405,7.03356],[51.514198,7.03489],[51.514351,7.03674],[51.51437,7.03743],[51.514381,7.03811],[51.5144,7.03938],[51.51442,7.04053],[51.514431,7.04131],[51.514469,7.04353],[51.514469,7.04414],[51.514488,7.04472],[51.514542,7.04728],[51.51458,7.04906],[51.514709,7.0513],[51.514931,7.05337],[51.515228,7.05491],[51.51569,7.05666],[51.51609,7.0581],[51.51664,7.05958],[51.51804,7.06284],[51.519421,7.06611],[51.51976,7.06685],[51.520069,7.0676],[51.520451,7.06844],[51.521461,7.07034],[51.522091,7.07128],[51.522469,7.07174],[51.522919,7.07226],[51.523548,7.07292],[51.523918,7.07324],[51.524281,7.07349],[51.52504,7.07395],[51.525612,7.07422],[51.526218,7.0745],[51.52739,7.07508],[51.528431,7.07578],[51.529202,7.07652],[51.529968,7.07744],[51.530621,7.07847],[51.531349,7.07998],[51.531639,7.08085],[51.53178,7.08126],[51.532188,7.08277],[51.532478,7.08456],[51.532539,7.08514],[51.532681,7.0868],[51.532902,7.08914],[51.533161,7.09096],[51.533421,7.09249],[51.533749,7.09376],[51.534119,7.09503],[51.534389,7.09584],[51.534439,7.09597],[51.534561,7.09629],[51.53529,7.09819],[51.535419,7.09858],[51.535782,7.09977],[51.536011,7.10056],[51.536228,7.10172],[51.536419,7.10277],[51.536591,7.10419],[51.53746,7.11268],[51.537781,7.11582],[51.537899,7.117],[51.53796,7.11818],[51.537991,7.11909],[51.537979,7.12019],[51.53783,7.12271],[51.53772,7.12502],[51.537651,7.12646],[51.537651,7.12701],[51.53764,7.1282],[51.53764,7.12896],[51.537651,7.12917],[51.53764,7.12952],[51.53801,7.135],[51.538422,7.1388],[51.538589,7.1399],[51.538929,7.14149],[51.53949,7.14344],[51.540791,7.14728],[51.540798,7.14734],[51.541142,7.14849],[51.541241,7.14885],[51.541569,7.15025],[51.54187,7.15221],[51.542019,7.15344],[51.54203,7.15516],[51.541931,7.15783],[51.541889,7.15901],[51.541821,7.16064],[51.541889,7.16227],[51.541931,7.16295],[51.54224,7.16765],[51.542301,7.16893],[51.542358,7.17118],[51.542389,7.17196],[51.5424,7.17221],[51.54258,7.17451],[51.54261,7.17482],[51.54285,7.17645],[51.542992,7.17739],[51.543129,7.17809],[51.543251,7.17887],[51.543362,7.17973],[51.543541,7.18114],[51.54364,7.18225],[51.54372,7.18371],[51.54377,7.18551],[51.543739,7.18735],[51.543751,7.18831],[51.543739,7.1901],[51.54377,7.19114],[51.54377,7.19203],[51.5438,7.19345],[51.5439,7.19547],[51.54401,7.197],[51.54406,7.19781],[51.544159,7.19858],[51.544319,7.19959],[51.544491,7.20032],[51.544949,7.20227],[51.545071,7.20274],[51.545212,7.20327],[51.5453,7.20364],[51.545719,7.20504],[51.547321,7.20951],[51.548038,7.2115],[51.54821,7.21198],[51.548439,7.2125],[51.549198,7.21465],[51.5495,7.21541],[51.555611,7.23041],[51.555901,7.23109],[51.55603,7.23137],[51.556141,7.23164],[51.556469,7.23245],[51.556751,7.2331],[51.557121,7.2339],[51.557549,7.23481],[51.557961,7.23604],[51.55835,7.23732],[51.558632,7.23866],[51.55888,7.24011],[51.559021,7.24148],[51.559101,7.2429],[51.559132,7.24386],[51.55899,7.24571],[51.558868,7.24714],[51.558651,7.24856],[51.5583,7.25041],[51.55806,7.25159],[51.557812,7.25266],[51.557541,7.25399],[51.55732,7.25532],[51.557159,7.25671],[51.55706,7.25809],[51.556992,7.25947],[51.557011,7.26144],[51.55706,7.26255],[51.557159,7.26354],[51.55751,7.26621],[51.557701,7.26752],[51.557861,7.26839],[51.557949,7.26905],[51.558071,7.26972],[51.55827,7.27111],[51.558392,7.27207],[51.558529,7.27356],[51.558609,7.27506],[51.55862,7.27656],[51.55859,7.27804],[51.558529,7.27895],[51.558529,7.27951],[51.558418,7.28097],[51.558361,7.28194],[51.558289,7.28291],[51.558239,7.28386],[51.558189,7.28481],[51.558159,7.28624],[51.558189,7.28766],[51.55827,7.28906],[51.558411,7.29047],[51.558571,7.29187],[51.558601,7.29208],[51.55867,7.29261],[51.55883,7.29417],[51.558949,7.29507],[51.559071,7.29598],[51.559189,7.29688],[51.559299,7.29778],[51.559422,7.29868],[51.559528,7.29958],[51.559639,7.30045],[51.559731,7.30127],[51.55983,7.30207],[51.559929,7.30283],[51.560032,7.30362],[51.56012,7.30442],[51.560211,7.3052],[51.56031,7.30583],[51.560349,7.30618],[51.560471,7.30717],[51.560551,7.30793],[51.560669,7.30902],[51.56078,7.30999],[51.56105,7.31307],[51.561241,7.3154],[51.56147,7.31788],[51.561569,7.31974],[51.561611,7.32072],[51.56171,7.32205],[51.561779,7.32318],[51.56184,7.32389],[51.562012,7.32659],[51.562149,7.33011],[51.56229,7.3331],[51.562389,7.33599],[51.562469,7.33965],[51.562519,7.34197],[51.562519,7.34284],[51.562519,7.34333],[51.562531,7.34573],[51.562469,7.3485],[51.562328,7.35043],[51.562069,7.35259],[51.562031,7.35289],[51.561779,7.35495],[51.561531,7.35659],[51.561291,7.35808],[51.561291,7.35811],[51.561199,7.35845],[51.561008,7.35929],[51.560909,7.3595],[51.56078,7.35966],[51.560692,7.35974],[51.560589,7.35978],[51.56049,7.35978],[51.560291,7.3597],[51.5602,7.3596],[51.56007,7.35931],[51.560032,7.35916],[51.560032,7.35899],[51.560059,7.35869],[51.560101,7.35858],[51.560181,7.35841],[51.560299,7.35828],[51.560379,7.35823],[51.560551,7.3582],[51.561131,7.35833],[51.561661,7.35851],[51.561779,7.35856],[51.561939,7.35859],[51.562241,7.3587],[51.562809,7.35894],[51.563351,7.35919],[51.563709,7.35935],[51.564259,7.35961],[51.564602,7.35978],[51.564892,7.35988],[51.56517,7.35999],[51.565578,7.36019],[51.566071,7.36044],[51.56638,7.3606],[51.566589,7.36071],[51.566719,7.36077],[51.56686,7.36084],[51.566952,7.36086],[51.567051,7.36085],[51.56723,7.36094],[51.567402,7.36103],[51.567589,7.36112],[51.568249,7.36145],[51.568581,7.36161],[51.568901,7.36176],[51.569561,7.36207],[51.569901,7.36223],[51.570229,7.36237],[51.571281,7.36284],[51.571812,7.36307],[51.572319,7.36329],[51.57275,7.36346],[51.573139,7.36362],[51.573471,7.36376],[51.573818,7.3639],[51.574638,7.36421],[51.575439,7.36451],[51.576359,7.36484],[51.576591,7.36492],[51.576988,7.36506],[51.5774,7.36519],[51.57777,7.36532],[51.578259,7.36548],[51.579189,7.36578],[51.579529,7.36596],[51.579689,7.36601],[51.580959,7.36641],[51.581139,7.36647],[51.582199,7.36688],[51.58263,7.36702],[51.58305,7.36722],[51.58326,7.36734],[51.583469,7.36749],[51.583649,7.36767],[51.583839,7.36786],[51.58403,7.36812],[51.58419,7.36836],[51.584339,7.36861],[51.58448,7.36891],[51.584629,7.36921],[51.58482,7.36963],[51.584969,7.36999],[51.585041,7.37021],[51.585091,7.37044],[51.585121,7.37069],[51.585152,7.37097],[51.585159,7.37122],[51.585159,7.37148],[51.585121,7.37199],[51.584991,7.37375],[51.584991,7.374],[51.584671,7.37836],[51.584621,7.37916],[51.58432,7.38337],[51.584221,7.3848],[51.584122,7.38621],[51.584019,7.38768],[51.583721,7.39179],[51.583691,7.39218],[51.583611,7.39328],[51.583569,7.39381],[51.583542,7.39437],[51.583488,7.39536],[51.58345,7.39625],[51.583389,7.39708],[51.58334,7.39788],[51.58329,7.3991],[51.583279,7.40034],[51.58329,7.40065],[51.583309,7.40171],[51.583382,7.40315],[51.583439,7.4039],[51.5835,7.40464],[51.583519,7.40483],[51.583591,7.40521],[51.583672,7.40557],[51.583721,7.40612],[51.58382,7.40704],[51.58392,7.40807],[51.58403,7.40904],[51.584202,7.41055],[51.58432,7.41158],[51.584431,7.41267],[51.584499,7.41334],[51.584549,7.41403],[51.584579,7.4145],[51.58461,7.4151],[51.584641,7.4157],[51.58466,7.41627],[51.584671,7.41685],[51.584671,7.41771],[51.584648,7.41847],[51.584629,7.41912],[51.584599,7.41974],[51.584549,7.42059],[51.584492,7.42138],[51.584431,7.42199],[51.584351,7.42266],[51.584221,7.42369],[51.58408,7.42462],[51.583832,7.42597],[51.583691,7.42671],[51.58353,7.42746],[51.58337,7.4282],[51.58321,7.42895],[51.582531,7.43192],[51.58099,7.43861],[51.577789,7.45246],[51.576969,7.45601],[51.57658,7.45769],[51.576351,7.4587],[51.57613,7.45966],[51.575909,7.46067],[51.57571,7.46165],[51.57552,7.46265],[51.575329,7.4637],[51.57518,7.46471],[51.575039,7.46575],[51.574928,7.4668],[51.574829,7.46786],[51.57476,7.46891],[51.574718,7.47],[51.574692,7.47104],[51.57468,7.47212],[51.574699,7.47319],[51.574749,7.47434],[51.57481,7.47533],[51.57489,7.4764],[51.57494,7.47691],[51.574989,7.47742],[51.575119,7.47844],[51.57523,7.47924],[51.57539,7.48021],[51.57555,7.48119],[51.57576,7.48235],[51.57608,7.48387],[51.576271,7.48479],[51.576309,7.485],[51.576771,7.48709],[51.577591,7.49089],[51.578011,7.49299],[51.578152,7.49385],[51.57827,7.4947],[51.5784,7.49571],[51.57851,7.49673],[51.57859,7.49762],[51.578651,7.49843],[51.578701,7.49912],[51.578739,7.4999],[51.578751,7.50038],[51.57877,7.50084],[51.578781,7.50189],[51.578781,7.50282],[51.578758,7.50375],[51.578739,7.5045],[51.578701,7.5054],[51.57869,7.50576],[51.578621,7.50705],[51.57859,7.50803],[51.578571,7.50862],[51.578529,7.50941],[51.578499,7.51038],[51.57848,7.5108],[51.57843,7.51217],[51.578381,7.51321],[51.578339,7.51423],[51.5783,7.51529],[51.578281,7.51577],[51.578259,7.51615],[51.578209,7.51752],[51.578171,7.51851],[51.578129,7.5196],[51.578091,7.5207],[51.578091,7.5218],[51.57811,7.52288],[51.578152,7.52394],[51.578201,7.52478],[51.57827,7.52559],[51.578331,7.52628],[51.578369,7.5266],[51.57843,7.52711],[51.578499,7.52769],[51.57864,7.52868],[51.57877,7.5294],[51.578899,7.53008],[51.578991,7.53053],[51.579079,7.53098],[51.579281,7.53187],[51.579441,7.53249],[51.579609,7.53312],[51.57983,7.53392],[51.58007,7.53472],[51.58046,7.53605],[51.580769,7.53709],[51.58123,7.53863],[51.581451,7.53938],[51.581871,7.54081],[51.582241,7.54203],[51.583309,7.54564],[51.58363,7.54673],[51.584259,7.54883],[51.584648,7.55012],[51.584831,7.55076],[51.585011,7.5514],[51.585159,7.55197],[51.585289,7.55252],[51.585411,7.55302],[51.585529,7.55354],[51.585651,7.55411],[51.58577,7.55468],[51.585869,7.55518],[51.58596,7.55569],[51.58606,7.5563],[51.586159,7.55691],[51.5863,7.55789],[51.586411,7.55872],[51.586491,7.55944],[51.586571,7.56016],[51.586861,7.56301],[51.58717,7.56606],[51.587811,7.57225],[51.588902,7.58372],[51.58952,7.5933],[51.59026,7.6039],[51.590408,7.60583],[51.590462,7.60636],[51.590549,7.60696],[51.59111,7.61037],[51.59132,7.61134],[51.591709,7.61331],[51.59182,7.614],[51.592159,7.61592],[51.592571,7.61796],[51.592892,7.61959],[51.59317,7.62098],[51.593712,7.62371],[51.594002,7.62533],[51.594719,7.62911],[51.59486,7.62982],[51.59499,7.63051],[51.597221,7.64195],[51.59819,7.64671],[51.598789,7.6504],[51.59893,7.65125],[51.599091,7.65217],[51.599911,7.65679],[51.60001,7.65743],[51.60043,7.65993],[51.600689,7.66178],[51.600769,7.66243],[51.60088,7.66422],[51.60091,7.66476],[51.60096,7.66599],[51.600948,7.66965],[51.60091,7.67532],[51.600891,7.67944],[51.600899,7.68501],[51.600891,7.6879],[51.60088,7.69047],[51.600891,7.69413],[51.600861,7.69814],[51.600868,7.70294],[51.600868,7.70605],[51.600941,7.70745],[51.60104,7.7089],[51.601219,7.71043],[51.601521,7.71234],[51.601768,7.71369],[51.60215,7.71536],[51.602661,7.71758],[51.603401,7.72063],[51.605679,7.73041],[51.606239,7.73281],[51.60643,7.73365],[51.607349,7.73746],[51.607731,7.73907],[51.60902,7.74463],[51.609558,7.74701],[51.609879,7.74839],[51.610779,7.75216],[51.61095,7.75295],[51.61179,7.75657],[51.612148,7.75829],[51.61359,7.7652],[51.613682,7.76564],[51.614151,7.76791],[51.6143,7.76865],[51.615742,7.77577],[51.616322,7.77862],[51.617611,7.78492],[51.618111,7.78763],[51.618752,7.79107],[51.619671,7.79649],[51.62072,7.8026],[51.621819,7.80895],[51.62244,7.81259],[51.623089,7.81769],[51.623421,7.82074],[51.6236,7.82378],[51.624069,7.83272],[51.624149,7.83382],[51.624611,7.84164],[51.624901,7.8468],[51.62495,7.84767],[51.625149,7.85185],[51.625198,7.85266],[51.625301,7.85381],[51.62553,7.85567],[51.625759,7.8571],[51.62603,7.85854],[51.626621,7.86089],[51.626999,7.86221],[51.627499,7.8637],[51.628529,7.86656],[51.63028,7.87145],[51.632408,7.87746],[51.63369,7.88111],[51.634609,7.88375],[51.635479,7.88627],[51.636829,7.89005],[51.638069,7.89329],[51.63982,7.89801],[51.643669,7.90798],[51.64444,7.90994],[51.64513,7.91146],[51.645748,7.91261],[51.646309,7.91357],[51.647079,7.91479],[51.64782,7.91587],[51.649281,7.91756],[51.650162,7.9185],[51.652962,7.92068],[51.65921,7.92535],[51.66478,7.92948],[51.666481,7.93092],[51.667461,7.93197],[51.668388,7.93306],[51.669121,7.93402],[51.669701,7.93487],[51.670361,7.93596],[51.67128,7.93766],[51.67181,7.9387],[51.672089,7.93925],[51.675251,7.94549],[51.675961,7.9468],[51.676571,7.94784],[51.677509,7.94919],[51.67844,7.9504],[51.679081,7.95118],[51.68021,7.95252],[51.681889,7.95451],[51.68465,7.9577],[51.68486,7.95795],[51.688831,7.96253],[51.68943,7.96323],[51.691681,7.96587],[51.694801,7.96948],[51.694969,7.96969],[51.696449,7.97137],[51.698071,7.97327],[51.699009,7.97433],[51.69981,7.97509],[51.700691,7.97584],[51.70166,7.97653],[51.70285,7.97724],[51.703911,7.97781],[51.704929,7.97819],[51.706108,7.97849],[51.70723,7.97867],[51.709469,7.97887],[51.712429,7.97905],[51.72028,7.97964],[51.72121,7.97971],[51.721931,7.9798],[51.722488,7.97991],[51.723068,7.98007],[51.724079,7.98043],[51.725029,7.98082],[51.725941,7.98132],[51.72683,7.98186],[51.730968,7.98433],[51.735161,7.98683],[51.73597,7.98732],[51.757,7.99996],[51.75713,8.00004],[51.761951,8.00292],[51.76778,8.00644],[51.76865,8.00706],[51.769272,8.00759],[51.769791,8.00808],[51.77037,8.00867],[51.771149,8.00953],[51.771778,8.01032],[51.772381,8.01117],[51.772739,8.01171],[51.773022,8.01213],[51.77364,8.01325],[51.774139,8.01421],[51.7747,8.01539],[51.77486,8.01581],[51.775139,8.01646],[51.775558,8.01758],[51.77586,8.01844],[51.77607,8.01915],[51.776249,8.01978],[51.776482,8.0207],[51.777779,8.02621],[51.779148,8.03231],[51.77919,8.0325],[51.77935,8.03314],[51.78109,8.04068],[51.78199,8.04458],[51.782379,8.04621],[51.782761,8.04768],[51.783119,8.0489],[51.78363,8.0505],[51.785709,8.05654],[51.7859,8.05711],[51.788849,8.0656],[51.790531,8.07057],[51.790661,8.07092],[51.79266,8.07673],[51.79438,8.08179],[51.796059,8.08666],[51.79829,8.09329],[51.798752,8.09476],[51.7994,8.09704],[51.800251,8.10029],[51.801769,8.10654],[51.802818,8.11106],[51.803341,8.11329],[51.803589,8.11438],[51.804901,8.12144],[51.806179,8.12817],[51.806469,8.1297],[51.806881,8.13148],[51.807301,8.133],[51.807522,8.13369],[51.80777,8.13451],[51.8083,8.13594],[51.80957,8.13884],[51.81089,8.14193],[51.81139,8.1432],[51.81179,8.14429],[51.812328,8.14601],[51.812851,8.14795],[51.813831,8.15192],[51.815701,8.15951],[51.819611,8.17346],[51.821659,8.18062],[51.823521,8.1873],[51.824162,8.1898],[51.824612,8.19176],[51.825001,8.19363],[51.825298,8.19525],[51.825661,8.19734],[51.826599,8.20373],[51.828011,8.21375],[51.828949,8.22073],[51.8321,8.2427],[51.833431,8.25189],[51.834709,8.26084],[51.83506,8.26298],[51.835461,8.26496],[51.836048,8.26736],[51.837231,8.27094],[51.840221,8.27917],[51.842819,8.28644],[51.843109,8.28733],[51.843418,8.28839],[51.844082,8.29078],[51.84436,8.29183],[51.8452,8.29493],[51.84552,8.29616],[51.84684,8.30111],[51.847271,8.30268],[51.848518,8.30731],[51.849789,8.31204],[51.850498,8.31436],[51.85062,8.31468],[51.851238,8.31633],[51.851891,8.31787],[51.853531,8.32144],[51.854641,8.32379],[51.855209,8.32498],[51.85619,8.32714],[51.857101,8.32945],[51.857349,8.33024],[51.857601,8.33111],[51.85788,8.33211],[51.85804,8.33269],[51.858318,8.33384],[51.85857,8.33501],[51.85894,8.33723],[51.859798,8.34333],[51.860321,8.34674],[51.860401,8.34727],[51.861069,8.35194],[51.86124,8.35297],[51.86142,8.35408],[51.861752,8.35569],[51.862141,8.35716],[51.862942,8.36004],[51.86388,8.36343],[51.86396,8.36376],[51.864109,8.36425],[51.865002,8.36734],[51.866741,8.37381],[51.867729,8.37732],[51.868149,8.37884],[51.868641,8.38072],[51.869041,8.38247],[51.86937,8.38443],[51.869659,8.38654],[51.871109,8.39815],[51.871651,8.40257],[51.871948,8.40499],[51.872162,8.40643],[51.872631,8.40925],[51.872952,8.41071],[51.873329,8.41213],[51.873749,8.4135],[51.874168,8.41477],[51.874729,8.41609],[51.875431,8.41777],[51.879452,8.42606],[51.88131,8.4298],[51.88176,8.43074],[51.88216,8.43158],[51.882431,8.43212],[51.88261,8.43246],[51.883171,8.43365],[51.88406,8.43552],[51.88525,8.438],[51.886379,8.44002],[51.887032,8.44107],[51.888119,8.4428],[51.889061,8.44421],[51.889858,8.44547],[51.890759,8.44697],[51.891472,8.44826],[51.89222,8.44966],[51.892891,8.45104],[51.893501,8.45238],[51.894169,8.45389],[51.894829,8.45555],[51.89537,8.45697],[51.895889,8.45831],[51.896221,8.45935],[51.896488,8.46014],[51.89698,8.4617],[51.897369,8.46326],[51.897789,8.46489],[51.89819,8.46655],[51.89856,8.46816],[51.898918,8.47006],[51.899799,8.47499],[51.900379,8.47826],[51.901348,8.48375],[51.90192,8.48683],[51.902241,8.48842],[51.903591,8.49471],[51.903889,8.49611],[51.903938,8.49633],[51.90406,8.49683],[51.90443,8.49858],[51.90485,8.50032],[51.90535,8.50198],[51.905899,8.50358],[51.90662,8.50537],[51.907452,8.50714],[51.90823,8.50857],[51.909039,8.50989],[51.909969,8.5112],[51.911041,8.51252],[51.912109,8.5137],[51.913021,8.51467],[51.91333,8.51497],[51.91526,8.51712],[51.916302,8.51825],[51.91737,8.51944],[51.918381,8.5205],[51.91951,8.52178],[51.92281,8.52542],[51.924339,8.52709],[51.92609,8.52888],[51.926949,8.5297],[51.927811,8.53037],[51.92894,8.53128],[51.92989,8.53191],[51.931068,8.53263],[51.93187,8.53305],[51.93512,8.53467],[51.935982,8.53512],[51.93679,8.53563],[51.937489,8.53612],[51.93824,8.5367],[51.93858,8.53698],[51.93906,8.53741],[51.939301,8.53765],[51.939751,8.53815],[51.940151,8.5386],[51.940842,8.53947],[51.941341,8.54009],[51.942139,8.54127],[51.94286,8.54242],[51.94323,8.54305],[51.943459,8.5435],[51.943748,8.54411],[51.944279,8.54521],[51.944771,8.54638],[51.945148,8.54732],[51.945351,8.54789],[51.94632,8.55056],[51.94648,8.55101],[51.946869,8.55216],[51.94733,8.55343],[51.94743,8.55374],[51.950321,8.56168],[51.95089,8.56321],[51.951962,8.56566],[51.95256,8.56682],[51.953461,8.56841],[51.954559,8.57018],[51.954639,8.5703],[51.955059,8.57101],[51.95639,8.57315],[51.957119,8.57434],[51.95779,8.57562],[51.958481,8.57689],[51.959141,8.57828],[51.959751,8.57966],[51.960361,8.58111],[51.96093,8.58259],[51.961929,8.58578],[51.962639,8.58817],[51.964272,8.59382],[51.96476,8.59554],[51.965649,8.59864],[51.966709,8.60208],[51.96719,8.60341],[51.967461,8.60407],[51.969151,8.60787],[51.970402,8.61055],[51.970772,8.6113],[51.971081,8.61183],[51.97139,8.61236],[51.971828,8.6129],[51.972309,8.61345],[51.97282,8.61393],[51.973431,8.61437],[51.973961,8.61469],[51.974499,8.61493],[51.975441,8.61518],[51.97644,8.61538],[51.977409,8.61549],[51.978371,8.61561],[51.979061,8.6157],[51.979389,8.61575],[51.980129,8.61587],[51.980331,8.61591],[51.98135,8.61604],[51.982288,8.61597],[51.98317,8.61576],[51.9841,8.61553],[51.984982,8.6153],[51.985439,8.6152],[51.985882,8.61516],[51.98682,8.6152],[51.98735,8.61529],[51.987831,8.61541],[51.988739,8.61577],[51.9897,8.61619],[51.98988,8.61626],[51.99004,8.61632],[51.9907,8.6166],[51.99086,8.61666],[51.99165,8.61701],[51.992439,8.61736],[51.992611,8.61745],[51.993599,8.61787],[51.994911,8.61845],[51.995369,8.61865],[51.9958,8.61883],[51.997459,8.61953],[51.997799,8.61967],[51.99855,8.61999],[51.999088,8.62024],[51.999481,8.6204],[51.999889,8.62059],[52.00095,8.62121],[52.00148,8.62154],[52.002121,8.62197],[52.002831,8.62255],[52.003342,8.623],[52.003979,8.62353],[52.004601,8.62405],[52.005199,8.62456],[52.00592,8.62518],[52.006649,8.62579],[52.006809,8.62593],[52.007721,8.62671],[52.00893,8.62773],[52.010181,8.62879],[52.011429,8.62977],[52.012291,8.63042],[52.01255,8.63061],[52.013939,8.63147],[52.014462,8.63181],[52.0159,8.63256],[52.01722,8.63319],[52.01857,8.63373],[52.019871,8.63422],[52.021141,8.63468],[52.02203,8.63501],[52.022339,8.63513],[52.023869,8.63568],[52.024651,8.63597],[52.024811,8.63603],[52.025478,8.63629],[52.027969,8.6372],[52.02935,8.63771],[52.030788,8.63828],[52.031471,8.63861],[52.032108,8.63895],[52.032879,8.63944],[52.032982,8.63951],[52.03352,8.63991],[52.034409,8.64064],[52.03516,8.64128],[52.035961,8.64212],[52.036591,8.64282],[52.037182,8.64357],[52.03833,8.64516],[52.039349,8.64674],[52.04047,8.64829],[52.041012,8.64892],[52.041649,8.64968],[52.042881,8.6509],[52.04414,8.65191],[52.04549,8.65281],[52.04697,8.65372],[52.047981,8.65432],[52.048161,8.65444],[52.04858,8.65471],[52.050201,8.65569],[52.052029,8.65683],[52.053902,8.65782],[52.055759,8.65866],[52.056389,8.65888],[52.05896,8.65966],[52.06068,8.66016],[52.063389,8.66092],[52.0644,8.66127],[52.06546,8.66172],[52.06646,8.66223],[52.06741,8.66276],[52.06839,8.6634],[52.06934,8.66409],[52.070309,8.66492],[52.07122,8.66574],[52.072128,8.66665],[52.073071,8.66769],[52.073898,8.6687],[52.074791,8.66986],[52.075588,8.67106],[52.076389,8.67232],[52.07716,8.67369],[52.077351,8.67404],[52.077431,8.67419],[52.077881,8.67505],[52.07856,8.67651],[52.07914,8.67787],[52.079689,8.67926],[52.080231,8.68064],[52.080742,8.68195],[52.081032,8.68267],[52.081261,8.68324],[52.081749,8.68446],[52.082199,8.68568],[52.08271,8.68697],[52.083191,8.68823],[52.083801,8.68973],[52.084461,8.69108],[52.085018,8.69204],[52.08551,8.69285],[52.085701,8.69313],[52.086071,8.69366],[52.086941,8.69476],[52.087109,8.69495],[52.088348,8.69625],[52.08963,8.69755],[52.08987,8.69779],[52.091042,8.69914],[52.091331,8.69947],[52.091862,8.70014],[52.092861,8.70151],[52.093109,8.70187],[52.093811,8.70295],[52.094212,8.70363],[52.094769,8.70458],[52.095451,8.70579],[52.09568,8.70625],[52.09721,8.70946],[52.097439,8.70994],[52.099529,8.71434],[52.101131,8.71777],[52.101261,8.71805],[52.101479,8.71853],[52.102081,8.7198],[52.102921,8.72151],[52.103481,8.72259],[52.10397,8.72343],[52.104481,8.72428],[52.104969,8.72507],[52.105549,8.72595],[52.108551,8.73051],[52.10973,8.73234],[52.110168,8.73303],[52.110771,8.7339],[52.111389,8.73469],[52.111851,8.73522],[52.112289,8.73566],[52.11285,8.73615],[52.11338,8.73657],[52.11377,8.73683],[52.114021,8.73698],[52.11462,8.73728],[52.115231,8.73755],[52.115681,8.73768],[52.116249,8.73781],[52.116859,8.73788],[52.117432,8.7379],[52.118141,8.73783],[52.118759,8.7377],[52.119438,8.73752],[52.120628,8.73726],[52.124889,8.73636],[52.12582,8.73621],[52.126659,8.73614],[52.127281,8.73615],[52.12785,8.73619],[52.128529,8.73633],[52.12936,8.73659],[52.129959,8.73687],[52.130539,8.73717],[52.131649,8.73792],[52.132839,8.739],[52.133789,8.74002],[52.13435,8.74077],[52.13456,8.74107],[52.135368,8.74246],[52.135929,8.74357],[52.136349,8.74463],[52.136742,8.74578],[52.137001,8.74657],[52.13744,8.74827],[52.137718,8.74973],[52.138359,8.75359],[52.13842,8.75398],[52.13879,8.75656],[52.13903,8.75876],[52.139229,8.76081],[52.139389,8.76305],[52.139408,8.76347],[52.13969,8.76717],[52.139919,8.76944],[52.140049,8.77036],[52.14016,8.77109],[52.14027,8.77176],[52.140659,8.77359],[52.1409,8.77464],[52.141029,8.77515],[52.1413,8.77632],[52.14188,8.77859],[52.141918,8.77874],[52.142818,8.7822],[52.143681,8.78554],[52.14452,8.78879],[52.14492,8.79018],[52.145649,8.79237],[52.146839,8.79541],[52.147991,8.7985],[52.148628,8.80016],[52.149361,8.80197],[52.14946,8.80217],[52.149792,8.80289],[52.150139,8.80355],[52.150181,8.80361],[52.150688,8.8044],[52.151588,8.80559],[52.152279,8.80629],[52.15361,8.80748],[52.155849,8.80938],[52.157341,8.81068],[52.15818,8.81133],[52.158909,8.81174],[52.159672,8.81207],[52.160351,8.81231],[52.164749,8.8136],[52.164989,8.81368],[52.16539,8.81381],[52.168892,8.8148],[52.170528,8.81523],[52.171021,8.81539],[52.17152,8.81563],[52.172192,8.816],[52.173,8.81661],[52.178951,8.82136],[52.179169,8.82156],[52.181911,8.82381],[52.18261,8.82431],[52.183281,8.82466],[52.18404,8.82497],[52.184589,8.82513],[52.18552,8.82528],[52.18766,8.82536],[52.18837,8.82545],[52.18885,8.8255],[52.189201,8.82555],[52.189449,8.82561],[52.190498,8.82589],[52.191158,8.82615],[52.191971,8.82656],[52.192581,8.8269],[52.193588,8.82747],[52.195042,8.82846],[52.195419,8.82872],[52.198071,8.83052],[52.198551,8.83085],[52.19976,8.83166],[52.200359,8.83217],[52.201069,8.83284],[52.20174,8.83362],[52.202339,8.83453],[52.202961,8.83556],[52.203571,8.83691],[52.204048,8.83833],[52.20438,8.83961],[52.204609,8.8406],[52.20483,8.84169],[52.20512,8.84355],[52.205269,8.84427],[52.20536,8.84474],[52.205509,8.84547],[52.205669,8.84615],[52.205929,8.84722],[52.20607,8.84783],[52.206478,8.84943],[52.206982,8.85093],[52.2075,8.8524],[52.208408,8.85498],[52.208771,8.85602],[52.209572,8.85826],[52.209862,8.85908],[52.21014,8.85993],[52.210258,8.86032],[52.210461,8.86108],[52.210659,8.86194],[52.210812,8.86277],[52.21093,8.86365],[52.210999,8.8642],[52.211048,8.86475],[52.211102,8.86559],[52.211151,8.86791],[52.21125,8.87073],[52.21125,8.87193],[52.211231,8.87273],[52.211189,8.87377],[52.211128,8.87522],[52.210911,8.88039],[52.210892,8.88137],[52.210911,8.88202],[52.21101,8.88493],[52.211239,8.89031],[52.211189,8.89171],[52.211079,8.89306],[52.210781,8.89507],[52.210609,8.8961],[52.210159,8.89882],[52.209759,8.90154],[52.209518,8.90427],[52.209461,8.90684],[52.209499,8.91353],[52.209549,8.91769],[52.209549,8.9181],[52.20956,8.92176],[52.20961,8.92312],[52.209671,8.92455],[52.209728,8.92545],[52.20982,8.92636],[52.209881,8.92682],[52.210041,8.92827],[52.210369,8.93009],[52.21067,8.93149],[52.2113,8.93413],[52.211449,8.93478],[52.211849,8.93633],[52.212269,8.9384],[52.212502,8.9396],[52.212711,8.94083],[52.212879,8.94212],[52.213051,8.94348],[52.21323,8.94536],[52.213539,8.94827],[52.21368,8.94928],[52.213951,8.9507],[52.214329,8.95231],[52.214691,8.95385],[52.21526,8.95603],[52.215549,8.95712],[52.21579,8.95823],[52.216141,8.96002],[52.21645,8.96171],[52.21664,8.96307],[52.21677,8.96447],[52.216881,8.96608],[52.21693,8.96771],[52.21693,8.96872],[52.21693,8.96993],[52.216831,8.97907],[52.216808,8.98151],[52.216759,8.9851],[52.21674,8.98697],[52.216728,8.98927],[52.21674,8.98993],[52.216789,8.99054],[52.21682,8.9912],[52.2169,8.99186],[52.21706,8.99292],[52.21714,8.99333],[52.217258,8.994],[52.2174,8.99456],[52.2178,8.99593],[52.21825,8.9975],[52.218712,8.99906],[52.218948,9.00004],[52.21912,9.00089],[52.219189,9.00138],[52.219311,9.00233],[52.21941,9.00328],[52.219521,9.00466],[52.219589,9.00562],[52.219669,9.00663],[52.21978,9.00785],[52.219929,9.00907],[52.2201,9.01008],[52.220291,9.01108],[52.220409,9.01157],[52.220791,9.01314],[52.221321,9.01521],[52.22142,9.01562],[52.221661,9.01673],[52.22184,9.01791],[52.22197,9.01901],[52.22205,9.02011],[52.222061,9.02136],[52.222,9.02263],[52.221901,9.02388],[52.221291,9.03157],[52.221218,9.0324],[52.22113,9.03318],[52.22102,9.03388],[52.220772,9.03518],[52.220249,9.03779],[52.220051,9.03881],[52.218788,9.04554],[52.218609,9.04663],[52.218441,9.04758],[52.218288,9.04868],[52.21817,9.04986],[52.218128,9.05084],[52.218151,9.0517],[52.218262,9.05309],[52.218342,9.05377],[52.218441,9.05453],[52.218689,9.056],[52.218891,9.05675],[52.2192,9.05781],[52.219662,9.05924],[52.22028,9.06112],[52.220879,9.06312],[52.221062,9.0639],[52.22123,9.0648],[52.221329,9.06549],[52.221409,9.06617],[52.221458,9.0669],[52.2215,9.06774],[52.2215,9.06863],[52.22147,9.06938],[52.221409,9.07029],[52.221149,9.07354],[52.22068,9.07999],[52.22049,9.08252],[52.220291,9.08523],[52.2202,9.08661],[52.22015,9.08735],[52.220131,9.08799],[52.2201,9.08931],[52.220139,9.09049],[52.220242,9.09183],[52.22039,9.09328],[52.22102,9.09803],[52.221352,9.10071],[52.221519,9.10211],[52.221649,9.10343],[52.221699,9.10437],[52.22171,9.10532],[52.221729,9.10629],[52.221691,9.1071],[52.221649,9.10781],[52.22155,9.10848],[52.221439,9.10903],[52.22131,9.10977],[52.22086,9.11192],[52.220482,9.11371],[52.22023,9.11495],[52.22002,9.11628],[52.21994,9.11706],[52.219879,9.11793],[52.21983,9.11944],[52.21991,9.12097],[52.219971,9.12181],[52.22007,9.12263],[52.22028,9.12413],[52.22049,9.12557],[52.220619,9.12718],[52.22065,9.12849],[52.220619,9.12928],[52.220581,9.13004],[52.22047,9.13138],[52.220119,9.13498],[52.21981,9.13805],[52.21973,9.13917],[52.219669,9.14079],[52.219551,9.14517],[52.219551,9.1457],[52.219479,9.14736],[52.219379,9.14908],[52.21817,9.15879],[52.218029,9.15981],[52.21785,9.16074],[52.217449,9.16232],[52.21669,9.16492],[52.216209,9.16663],[52.216,9.16779],[52.215839,9.16909],[52.215771,9.17014],[52.215752,9.17206],[52.215698,9.17478],[52.21563,9.17699],[52.215611,9.17739],[52.21545,9.18024],[52.215431,9.18139],[52.215511,9.18293],[52.215641,9.18409],[52.215759,9.1848],[52.2159,9.18562],[52.216171,9.18673],[52.216579,9.1883],[52.217991,9.19375],[52.218449,9.19555],[52.219471,9.19907],[52.21983,9.20038],[52.220951,9.20474],[52.221272,9.20601],[52.22147,9.20691],[52.221619,9.20768],[52.221802,9.20891],[52.221901,9.20997],[52.221958,9.21096],[52.22197,9.21188],[52.22187,9.21513],[52.22184,9.21685],[52.221901,9.21811],[52.22197,9.21912],[52.222031,9.21982],[52.222252,9.22108],[52.222549,9.22248],[52.222809,9.22344],[52.223091,9.22428],[52.223412,9.22504],[52.223789,9.2259],[52.224602,9.22741],[52.225891,9.22959],[52.22863,9.23392],[52.228882,9.23433],[52.23019,9.23661],[52.230541,9.23736],[52.230862,9.23816],[52.231152,9.23898],[52.231621,9.24076],[52.232052,9.24308],[52.232349,9.2454],[52.232571,9.24712],[52.23275,9.24839],[52.232841,9.24905],[52.23315,9.25142],[52.233521,9.25422],[52.233898,9.2571],[52.234241,9.25995],[52.234612,9.26276],[52.234951,9.26555],[52.235222,9.26732],[52.23531,9.26785],[52.235649,9.26968],[52.236031,9.27126],[52.236721,9.27361],[52.237251,9.27518],[52.23777,9.2765],[52.23822,9.27756],[52.23859,9.27833],[52.239071,9.27929],[52.23954,9.2801],[52.240299,9.28136],[52.241081,9.2825],[52.24173,9.2833],[52.24263,9.28436],[52.24453,9.28641],[52.24649,9.28847],[52.247452,9.28956],[52.24828,9.29058],[52.248501,9.29089],[52.249249,9.29197],[52.249989,9.29312],[52.250622,9.29429],[52.25116,9.2954],[52.254822,9.30336],[52.256031,9.30584],[52.256618,9.30694],[52.257198,9.3079],[52.25774,9.30869],[52.258369,9.30952],[52.259209,9.31058],[52.26017,9.31164],[52.261101,9.31259],[52.26149,9.31296],[52.26339,9.31468],[52.26498,9.31612],[52.26535,9.31651],[52.26646,9.31788],[52.267059,9.31869],[52.267681,9.31962],[52.268299,9.32062],[52.268822,9.32155],[52.269459,9.32285],[52.273449,9.33127],[52.274132,9.33276],[52.274872,9.3343],[52.275391,9.33547],[52.278141,9.34138],[52.278709,9.34251],[52.279369,9.34372],[52.280022,9.34479],[52.28017,9.34507],[52.28112,9.34654],[52.28614,9.3543],[52.287659,9.35666],[52.288509,9.35787],[52.289421,9.35901],[52.289719,9.35935],[52.291088,9.36072],[52.292488,9.36198],[52.292671,9.36213],[52.302601,9.37094],[52.319118,9.38574],[52.321159,9.38775],[52.322319,9.38908],[52.32336,9.39044],[52.324322,9.39183],[52.325069,9.39299],[52.32523,9.39327],[52.325859,9.39436],[52.326618,9.39575],[52.327579,9.39764],[52.328411,9.39929],[52.32859,9.39964],[52.329109,9.4006],[52.329769,9.40172],[52.330891,9.40352],[52.332241,9.40555],[52.333649,9.4077],[52.333889,9.40806],[52.33432,9.40873],[52.335529,9.41062],[52.335838,9.41112],[52.336159,9.41163],[52.337959,9.41435],[52.338539,9.41519],[52.339409,9.41632],[52.340111,9.41712],[52.34082,9.41784],[52.34166,9.4186],[52.342659,9.41942],[52.343609,9.42004],[52.344292,9.42046],[52.347092,9.42214],[52.34774,9.42256],[52.348728,9.4233],[52.349461,9.42388],[52.350231,9.42454],[52.351101,9.42534],[52.353039,9.42715],[52.357361,9.43114],[52.35881,9.43264],[52.359692,9.43366],[52.367809,9.44407],[52.369389,9.4463],[52.37072,9.44836],[52.370861,9.44859],[52.37278,9.45184],[52.37532,9.45624],[52.377548,9.4601],[52.38052,9.46524],[52.38113,9.46629],[52.381649,9.46712],[52.382561,9.46848],[52.383499,9.4698],[52.388901,9.4772],[52.39045,9.47932],[52.396099,9.48702],[52.39711,9.48859],[52.398029,9.49015],[52.401131,9.49559],[52.406521,9.50506],[52.407982,9.50763],[52.409161,9.50972],[52.410191,9.51151],[52.41164,9.51406],[52.413311,9.51703],[52.41428,9.51884],[52.415138,9.52054],[52.41576,9.52185],[52.416382,9.52326],[52.416969,9.52472],[52.417488,9.52615],[52.41803,9.52775],[52.41877,9.53015],[52.419331,9.53233],[52.419689,9.53391],[52.419991,9.53553],[52.420319,9.53729],[52.42057,9.53902],[52.42078,9.54093],[52.420971,9.54285],[52.421131,9.54533],[52.42131,9.54945],[52.421459,9.55652],[52.421551,9.55856],[52.42165,9.56019],[52.421909,9.56349],[52.422329,9.56859],[52.42276,9.57334],[52.42281,9.57401],[52.423309,9.58008],[52.423458,9.58243],[52.423489,9.58307],[52.423561,9.58555],[52.423592,9.5876],[52.42358,9.58984],[52.423519,9.59303],[52.423229,9.59739],[52.421131,9.61986],[52.42091,9.62265],[52.420811,9.62446],[52.420792,9.62634],[52.420811,9.62772],[52.420872,9.6294],[52.421051,9.63173],[52.421242,9.63346],[52.421619,9.63605],[52.422058,9.6385],[52.424,9.64852],[52.42527,9.6551],[52.42683,9.66314],[52.427429,9.66629],[52.4282,9.67028],[52.428421,9.67169],[52.428612,9.67311],[52.428921,9.67626],[52.429321,9.68156],[52.429611,9.68496],[52.430241,9.69297],[52.430389,9.69674],[52.43042,9.69946],[52.430401,9.70035],[52.430248,9.70318],[52.43,9.70612],[52.42923,9.71208],[52.429001,9.71376],[52.42823,9.72024],[52.427898,9.72294],[52.427872,9.72335],[52.427551,9.72654],[52.427441,9.72852],[52.427441,9.72884],[52.427391,9.73166],[52.427391,9.73378],[52.42738,9.74271],[52.42725,9.74974],[52.427189,9.75209],[52.427189,9.75226],[52.427071,9.75852],[52.427059,9.75878],[52.426979,9.76416],[52.426979,9.76718],[52.42709,9.7718],[52.427219,9.77332],[52.427471,9.77608],[52.42757,9.77697],[52.42802,9.78012],[52.42849,9.78298],[52.42894,9.78534],[52.4296,9.78852],[52.43013,9.7913],[52.430309,9.79236],[52.43084,9.79586],[52.431061,9.79878],[52.43108,9.80093],[52.43108,9.80136],[52.431061,9.80156],[52.431011,9.80331],[52.430851,9.80506],[52.43058,9.80699],[52.429859,9.81081],[52.42926,9.81314],[52.427879,9.81772],[52.42767,9.81826],[52.427589,9.81848],[52.42622,9.82272],[52.42561,9.82427],[52.425179,9.8253],[52.4244,9.82718],[52.42313,9.82991],[52.421791,9.83242],[52.421059,9.83371],[52.420341,9.83493],[52.419991,9.83549],[52.41695,9.84032],[52.41547,9.84266],[52.414028,9.84502],[52.41272,9.84724],[52.412521,9.84753],[52.412201,9.84809],[52.411758,9.84889],[52.410969,9.85049],[52.40963,9.8534],[52.40897,9.85474],[52.4067,9.85982],[52.406231,9.8608],[52.404419,9.8647],[52.402882,9.86814],[52.4021,9.87012],[52.40136,9.87221],[52.40065,9.87454],[52.40015,9.87635],[52.399601,9.87873],[52.39933,9.88],[52.399101,9.8813],[52.398849,9.88279],[52.39864,9.88436],[52.398048,9.88966],[52.39793,9.89076],[52.397449,9.89538],[52.39716,9.89822],[52.396938,9.90041],[52.39613,9.90822],[52.39547,9.91468],[52.39489,9.91989],[52.394291,9.92539],[52.392899,9.93625],[52.392502,9.93943],[52.391991,9.94348],[52.391129,9.95032],[52.390652,9.95501],[52.390388,9.95814],[52.389771,9.96834],[52.38966,9.97063],[52.38961,9.97158],[52.389488,9.97431],[52.38945,9.97521],[52.389271,9.97919],[52.389179,9.98179],[52.388851,9.98807],[52.388741,9.98972],[52.38866,9.99068],[52.38855,9.99183],[52.388371,9.99334],[52.38826,9.9942],[52.388031,9.99557],[52.38776,9.99715],[52.387428,9.99872],[52.38665,10.00213],[52.386589,10.00236],[52.384411,10.01166],[52.384232,10.01243],[52.383591,10.01513],[52.38287,10.01818],[52.38216,10.02108],[52.381931,10.02194],[52.380798,10.02608],[52.37854,10.03394],[52.37793,10.03613],[52.375851,10.0434],[52.36834,10.06986],[52.367668,10.07246],[52.367241,10.07433],[52.366859,10.07654],[52.366489,10.079],[52.366112,10.08264],[52.364349,10.10102],[52.363918,10.10537],[52.363731,10.10793],[52.363621,10.11056],[52.363522,10.11825],[52.363491,10.12034],[52.363461,10.12095],[52.3634,10.12439],[52.36322,10.12821],[52.362869,10.13312],[52.362389,10.13806],[52.361851,10.14326],[52.361752,10.14428],[52.36092,10.15225],[52.36026,10.15861],[52.3587,10.17429],[52.358459,10.17639],[52.35775,10.18056],[52.357601,10.18136],[52.35696,10.18402],[52.356331,10.18616],[52.355492,10.18883],[52.35437,10.19165],[52.34618,10.20908],[52.342449,10.21785],[52.341831,10.21931],[52.340672,10.22211],[52.340179,10.22335],[52.33963,10.2249],[52.339489,10.22534],[52.33881,10.22759],[52.33831,10.2295],[52.337898,10.23125],[52.33733,10.23424],[52.336891,10.23742],[52.336781,10.23822],[52.33654,10.24093],[52.336449,10.2429],[52.336418,10.24385],[52.336399,10.24622],[52.33654,10.25446],[52.33659,10.25766],[52.336559,10.2601],[52.33646,10.2636],[52.336189,10.26843],[52.335072,10.28774],[52.334919,10.29107],[52.334919,10.29154],[52.335011,10.29579],[52.33514,10.29783],[52.33543,10.30059],[52.33551,10.30138],[52.338169,10.32413],[52.339352,10.33431],[52.339642,10.33706],[52.339771,10.33882],[52.339809,10.33951],[52.339931,10.3423],[52.339939,10.34619],[52.339771,10.35151],[52.339378,10.36378],[52.339321,10.36578],[52.339298,10.36685],[52.339039,10.3733],[52.33876,10.37846],[52.338699,10.37918],[52.33749,10.39397],[52.33744,10.39459],[52.337231,10.39709],[52.337078,10.39883],[52.33704,10.39933],[52.33699,10.39991],[52.336658,10.40373],[52.336601,10.40446],[52.335541,10.41656],[52.33511,10.41984],[52.33482,10.42191],[52.33448,10.42399],[52.33408,10.42626],[52.333401,10.43028],[52.331501,10.44129],[52.330391,10.44793],[52.32967,10.4525],[52.32896,10.45634],[52.326759,10.46555],[52.32547,10.47095],[52.324322,10.4756],[52.321678,10.48679],[52.320992,10.48957],[52.320641,10.49099],[52.316238,10.50933],[52.315941,10.51061],[52.314949,10.51487],[52.314602,10.51663],[52.314301,10.51826],[52.31406,10.51997],[52.313622,10.52316],[52.31337,10.52554],[52.313339,10.5259],[52.313229,10.52723],[52.31316,10.52956],[52.313171,10.53276],[52.31321,10.53498],[52.313221,10.53566],[52.313061,10.55503],[52.313049,10.55618],[52.31303,10.55924],[52.31303,10.56007],[52.313,10.56157],[52.312969,10.5638],[52.31292,10.56636],[52.312801,10.57008],[52.312691,10.57225],[52.31237,10.57724],[52.312019,10.58152],[52.310211,10.60278],[52.310032,10.60504],[52.309978,10.60568],[52.309872,10.60751],[52.30978,10.60984],[52.3097,10.61282],[52.309689,10.61409],[52.3097,10.61489],[52.309761,10.61923],[52.309769,10.62277],[52.309761,10.62736],[52.30975,10.62812],[52.30975,10.62927],[52.3097,10.63306],[52.309689,10.63377],[52.309689,10.63433],[52.309471,10.65566],[52.30938,10.66094],[52.308651,10.68318],[52.308578,10.6847],[52.308189,10.6965],[52.30817,10.69703],[52.30814,10.6977],[52.307961,10.70307],[52.307949,10.70368],[52.307869,10.70846],[52.30788,10.7108],[52.307961,10.71448],[52.307968,10.71477],[52.30806,10.71921],[52.30817,10.7233],[52.3083,10.72591],[52.308521,10.72918],[52.309261,10.736],[52.31052,10.74826],[52.31287,10.76876],[52.313519,10.77534],[52.313702,10.77924],[52.313702,10.7817],[52.313629,10.78393],[52.312489,10.79746],[52.312439,10.79808],[52.312309,10.79964],[52.311661,10.80753],[52.31155,10.80886],[52.311489,10.80955],[52.311218,10.81283],[52.310982,10.81575],[52.310928,10.81642],[52.310619,10.82023],[52.310299,10.82408],[52.31007,10.82577],[52.309681,10.82813],[52.30938,10.82972],[52.308922,10.83178],[52.308781,10.8324],[52.308571,10.83322],[52.307831,10.83578],[52.30703,10.83832],[52.306911,10.83871],[52.30648,10.84012],[52.30463,10.84596],[52.29977,10.86152],[52.299469,10.8625],[52.29797,10.86634],[52.29623,10.87042],[52.29607,10.8708],[52.290569,10.88392],[52.290298,10.88454],[52.289761,10.88581],[52.287991,10.89006],[52.286442,10.89384],[52.28561,10.89616],[52.284981,10.89818],[52.28405,10.90174],[52.283741,10.90314],[52.283581,10.90391],[52.283199,10.90601],[52.283039,10.90711],[52.282848,10.90841],[52.2827,10.9098],[52.28249,10.91186],[52.282211,10.91447],[52.28194,10.91689],[52.281818,10.91823],[52.281689,10.91955],[52.281521,10.92115],[52.281342,10.92276],[52.281239,10.92347],[52.281101,10.92451],[52.280941,10.92543],[52.28067,10.92687],[52.280579,10.92729],[52.280411,10.92808],[52.280281,10.92867],[52.27998,10.92985],[52.279621,10.93119],[52.278999,10.93321],[52.278809,10.93376],[52.27845,10.93479],[52.27808,10.93571],[52.277599,10.93683],[52.274021,10.94491],[52.272881,10.94751],[52.272579,10.94815],[52.272388,10.94866],[52.271629,10.95055],[52.271149,10.95184],[52.270691,10.9532],[52.270409,10.95412],[52.269989,10.9559],[52.269711,10.95711],[52.269402,10.95878],[52.269051,10.96101],[52.26873,10.96379],[52.268589,10.96511],[52.268459,10.96648],[52.26825,10.96781],[52.268051,10.96897],[52.267792,10.97028],[52.26746,10.97173],[52.267109,10.97311],[52.266541,10.97495],[52.2659,10.97686],[52.26535,10.97857],[52.264729,10.98044],[52.264431,10.98125],[52.264069,10.98226],[52.263611,10.98342],[52.26334,10.98406],[52.26302,10.9848],[52.26265,10.98559],[52.262428,10.98599],[52.261951,10.98683],[52.261559,10.98751],[52.260738,10.98882],[52.26009,10.98974],[52.25935,10.99068],[52.258259,10.99194],[52.258091,10.99214],[52.25774,10.99256],[52.25737,10.99298],[52.256519,10.99397],[52.25563,10.99497],[52.254391,10.99625],[52.25322,10.99741],[52.25264,10.99793],[52.25235,10.99823],[52.251209,10.99934],[52.250229,11.00027],[52.250031,11.00046],[52.24955,11.00092],[52.247181,11.0032],[52.246609,11.00382],[52.246151,11.00434],[52.245621,11.00498],[52.24514,11.0056],[52.244751,11.00613],[52.244381,11.00663],[52.24419,11.0069],[52.243999,11.00721],[52.24379,11.00755],[52.24321,11.00858],[52.242661,11.00965],[52.242088,11.01079],[52.241951,11.01111],[52.24165,11.01174],[52.240669,11.01376],[52.24049,11.01413],[52.24007,11.01488],[52.239738,11.01546],[52.23951,11.01586],[52.239281,11.01623],[52.238449,11.01743],[52.237862,11.01826],[52.237492,11.01872],[52.23708,11.01926],[52.236061,11.02047],[52.235901,11.02068],[52.235519,11.02112],[52.23484,11.02197],[52.23436,11.02264],[52.233879,11.0233],[52.232819,11.02502],[52.23238,11.02578],[52.232151,11.02621],[52.2318,11.02692],[52.231319,11.02796],[52.23064,11.02948],[52.22974,11.03148],[52.226608,11.03863],[52.224251,11.04442],[52.222542,11.04881],[52.22213,11.04988],[52.221722,11.0509],[52.21994,11.05556],[52.219559,11.05661],[52.219021,11.05819],[52.218639,11.05949],[52.218262,11.06097],[52.217609,11.06406],[52.217312,11.06595],[52.21701,11.06904],[52.216759,11.07434],[52.216389,11.08081],[52.21616,11.08396],[52.21582,11.08679],[52.215549,11.08848],[52.215321,11.08966],[52.215,11.091],[52.21471,11.09206],[52.21439,11.09308],[52.214119,11.09393],[52.213581,11.09541],[52.213032,11.097],[52.212528,11.09842],[52.2122,11.09948],[52.211971,11.10029],[52.211639,11.10148],[52.21032,11.10647],[52.209942,11.10794],[52.209572,11.10945],[52.209259,11.11086],[52.209019,11.11196],[52.208809,11.11301],[52.20853,11.11437],[52.20821,11.11676],[52.208031,11.11851],[52.20726,11.1314],[52.207218,11.13201],[52.20718,11.1333],[52.20715,11.13446],[52.207142,11.13474],[52.207142,11.13663],[52.20723,11.13807],[52.207298,11.1391],[52.208012,11.14741],[52.20826,11.1505],[52.208382,11.15266],[52.208431,11.15428],[52.208389,11.15683],[52.20826,11.15952],[52.20808,11.16168],[52.207748,11.16434],[52.207439,11.16667],[52.207272,11.16756],[52.204609,11.17897],[52.204288,11.18041],[52.20369,11.18307],[52.20295,11.18697],[52.202518,11.19054],[52.202309,11.19309],[52.201889,11.20136],[52.201839,11.20206],[52.200691,11.22617],[52.200531,11.23064],[52.20031,11.23465],[52.20018,11.23625],[52.19997,11.23853],[52.199551,11.24218],[52.199379,11.24359],[52.198601,11.24932],[52.198441,11.2506],[52.196831,11.26289],[52.196758,11.26343],[52.19664,11.26425],[52.19611,11.2682],[52.195919,11.26956],[52.195831,11.27021],[52.192509,11.29526],[52.192451,11.29572],[52.191921,11.2998],[52.191681,11.30193],[52.191631,11.30242],[52.19038,11.31644],[52.188,11.34272],[52.18729,11.35063],[52.18716,11.35227],[52.187069,11.35391],[52.187012,11.35556],[52.186981,11.35735],[52.186951,11.35924],[52.186958,11.36334],[52.187,11.36713],[52.18713,11.38555],[52.18718,11.38968],[52.18718,11.38998],[52.187191,11.39058],[52.187191,11.39091],[52.18721,11.39275],[52.18779,11.41141],[52.187809,11.41185],[52.187962,11.41739],[52.18808,11.42094],[52.188099,11.42154],[52.18819,11.425],[52.18829,11.42803],[52.188339,11.43127],[52.18832,11.43313],[52.18821,11.43495],[52.188049,11.43668],[52.187771,11.43853],[52.18734,11.44089],[52.186981,11.44246],[52.186001,11.44599],[52.185928,11.44622],[52.185829,11.44653],[52.183041,11.45638],[52.181412,11.46197],[52.17691,11.47781],[52.176159,11.4802],[52.175781,11.48138],[52.175251,11.48278],[52.174389,11.48491],[52.173431,11.48724],[52.17202,11.49069],[52.168011,11.50037],[52.16666,11.50414],[52.166458,11.50475],[52.16629,11.50537],[52.16589,11.50676],[52.165611,11.50802],[52.165359,11.50931],[52.165161,11.51038],[52.16502,11.51134],[52.164791,11.51371],[52.1647,11.51587],[52.16468,11.5163],[52.16465,11.51743],[52.164669,11.5184],[52.164742,11.51996],[52.16489,11.52163],[52.165058,11.52326],[52.165119,11.52365],[52.165421,11.52569],[52.166439,11.53267],[52.166611,11.53392],[52.167339,11.53867],[52.167439,11.53937],[52.169441,11.55281],[52.16991,11.55575],[52.170231,11.55711],[52.170559,11.55839],[52.171291,11.56133],[52.17382,11.57087],[52.175751,11.57812],[52.178219,11.58746],[52.182308,11.603],[52.183929,11.60919],[52.185032,11.61315],[52.185822,11.61628],[52.186619,11.61919],[52.187531,11.62238],[52.188011,11.62375],[52.18858,11.62524],[52.18866,11.62546],[52.18959,11.62733],[52.190868,11.62959],[52.192478,11.63237],[52.199959,11.6454],[52.200359,11.64613],[52.20084,11.64695],[52.201038,11.64729],[52.20842,11.66016],[52.208679,11.66065],[52.209332,11.66179],[52.21109,11.66484],[52.21154,11.66565],[52.211788,11.66607],[52.213799,11.66959],[52.215851,11.67339],[52.216461,11.67478],[52.217049,11.67633],[52.217369,11.67731],[52.217579,11.67796],[52.217838,11.67877],[52.218311,11.68052],[52.21854,11.68151],[52.21909,11.6844],[52.219452,11.68751],[52.219749,11.69092],[52.220051,11.69427],[52.221161,11.70682],[52.22168,11.71211],[52.222061,11.71632],[52.223511,11.73166],[52.223629,11.73272],[52.223759,11.73362],[52.225361,11.74258],[52.22699,11.75169],[52.22805,11.75741],[52.228409,11.75924],[52.228741,11.76117],[52.229019,11.76374],[52.229149,11.76571],[52.229179,11.76778],[52.22897,11.77192],[52.227791,11.7904],[52.22768,11.79214],[52.2276,11.79329],[52.227291,11.79804],[52.226688,11.80733],[52.22665,11.80793],[52.226009,11.81791],[52.225689,11.82334],[52.225529,11.82563],[52.22541,11.82819],[52.22543,11.83002],[52.225471,11.83125],[52.225559,11.83267],[52.225651,11.83379],[52.227291,11.84773],[52.232201,11.88916],[52.23251,11.89181],[52.232639,11.89276],[52.232731,11.89358],[52.233051,11.89658],[52.23336,11.89995],[52.233601,11.90274],[52.233768,11.90531],[52.233879,11.90798],[52.234348,11.92429],[52.234779,11.94053],[52.235249,11.95714],[52.235409,11.96376],[52.2356,11.97119],[52.235748,11.97729],[52.23579,11.97894],[52.235771,11.98051],[52.235699,11.98249],[52.235432,11.98812],[52.235081,11.99699],[52.234341,12.01401],[52.233761,12.02773],[52.233421,12.03474],[52.233101,12.04213],[52.232632,12.05301],[52.232609,12.0542],[52.23262,12.05541],[52.23267,12.05675],[52.232841,12.0587],[52.23296,12.06002],[52.233101,12.06113],[52.233459,12.06384],[52.233681,12.06548],[52.233768,12.0661],[52.24308,12.13948],[52.2439,12.14593],[52.249649,12.19065],[52.252121,12.21038],[52.25235,12.21264],[52.252441,12.2143],[52.252491,12.21691],[52.252319,12.2199],[52.249069,12.25665],[52.248631,12.26174],[52.24828,12.2661],[52.24699,12.28226],[52.24678,12.28543],[52.246658,12.2885],[52.24675,12.29159],[52.246891,12.29349],[52.247169,12.29568],[52.24765,12.29831],[52.24847,12.30145],[52.248791,12.30246],[52.249241,12.30368],[52.2495,12.30437],[52.249821,12.30523],[52.253349,12.31351],[52.253639,12.31419],[52.26292,12.33628],[52.263882,12.33891],[52.264481,12.34107],[52.26495,12.34305],[52.265339,12.34523],[52.267719,12.36252],[52.277241,12.4319],[52.27755,12.43401],[52.278061,12.43658],[52.278561,12.43851],[52.279259,12.4407],[52.2799,12.44244],[52.280529,12.44386],[52.281189,12.44522],[52.281849,12.4464],[52.28727,12.45523],[52.289341,12.45825],[52.290829,12.46031],[52.292488,12.46235],[52.295609,12.46595],[52.299759,12.47067],[52.304459,12.47609],[52.30703,12.47905],[52.30975,12.48217],[52.312519,12.48525],[52.314991,12.48782],[52.318409,12.49088],[52.323139,12.49511],[52.326832,12.49837],[52.33028,12.50148],[52.333721,12.50458],[52.335201,12.50586],[52.335838,12.50645],[52.336571,12.50723],[52.337528,12.5084],[52.33836,12.50953],[52.339062,12.51066],[52.340118,12.51264],[52.340401,12.51326],[52.340809,12.51413],[52.341591,12.51603],[52.342892,12.51968],[52.344269,12.52359],[52.347919,12.53389],[52.348782,12.53666],[52.349419,12.53922],[52.349751,12.54055],[52.349819,12.5409],[52.350552,12.54517],[52.35088,12.54797],[52.351059,12.55027],[52.351181,12.55295],[52.351189,12.55519],[52.351158,12.55847],[52.35107,12.56422],[52.350922,12.57661],[52.350681,12.59304],[52.350632,12.59599],[52.35059,12.59717],[52.350498,12.5986],[52.35041,12.59981],[52.350182,12.60171],[52.349911,12.60367],[52.349659,12.60507],[52.34938,12.60644],[52.348999,12.60803],[52.348122,12.61133],[52.344818,12.62296],[52.34457,12.62384],[52.344391,12.62446],[52.34346,12.62779],[52.342911,12.62973],[52.34272,12.63038],[52.33942,12.64209],[52.339191,12.64297],[52.338009,12.64715],[52.33754,12.64889],[52.33662,12.65224],[52.33625,12.6537],[52.335899,12.65536],[52.33567,12.65673],[52.335419,12.65854],[52.3353,12.65974],[52.335209,12.66093],[52.335152,12.66218],[52.335121,12.66309],[52.335129,12.66403],[52.335171,12.6655],[52.33527,12.66721],[52.335411,12.66883],[52.336739,12.68137],[52.336811,12.68207],[52.33744,12.68802],[52.337521,12.68873],[52.338161,12.69472],[52.33852,12.6982],[52.338631,12.69936],[52.338799,12.70087],[52.339081,12.70356],[52.339729,12.70973],[52.339951,12.71174],[52.340092,12.71322],[52.34016,12.7143],[52.34021,12.71555],[52.340221,12.71697],[52.340179,12.71834],[52.340111,12.71968],[52.34005,12.72069],[52.34,12.72143],[52.339859,12.72375],[52.33979,12.72533],[52.339771,12.72611],[52.339729,12.72804],[52.339642,12.73175],[52.339588,12.73409],[52.339611,12.73499],[52.339661,12.73628],[52.339729,12.73744],[52.340691,12.75166],[52.341099,12.7577],[52.341141,12.75848],[52.341209,12.75966],[52.34127,12.76134],[52.341259,12.76291],[52.341171,12.76464],[52.341049,12.76608],[52.340149,12.7758],[52.339111,12.78689],[52.338871,12.78991],[52.338409,12.79716],[52.338299,12.79892],[52.338009,12.80411],[52.33791,12.80584],[52.33783,12.80681],[52.337711,12.80768],[52.337509,12.80871],[52.33728,12.8097],[52.33696,12.8107],[52.33646,12.81194],[52.336109,12.81268],[52.33569,12.81338],[52.33519,12.81405],[52.33503,12.81426],[52.334839,12.81447],[52.334141,12.81513],[52.333599,12.81561],[52.332981,12.81612],[52.332359,12.81673],[52.331921,12.81723],[52.331402,12.81794],[52.330929,12.81869],[52.330479,12.81961],[52.33017,12.8204],[52.32988,12.82124],[52.328949,12.82439],[52.327759,12.82837],[52.324871,12.83843],[52.322739,12.84587],[52.320759,12.85271],[52.320202,12.85459],[52.319859,12.85564],[52.31958,12.85649],[52.31926,12.85738],[52.318802,12.85852],[52.318409,12.85941],[52.317501,12.8613],[52.31609,12.86413],[52.313278,12.86984],[52.31123,12.874],[52.31044,12.87558],[52.310322,12.87582],[52.309509,12.87753],[52.306961,12.8826],[52.305679,12.88513],[52.298168,12.90026],[52.297329,12.90199],[52.29649,12.90364],[52.295471,12.90573],[52.292488,12.9117],[52.291592,12.91353],[52.291409,12.91394],[52.291069,12.91483],[52.29092,12.9154],[52.290779,12.91593],[52.29063,12.91674],[52.29052,12.91769],[52.290482,12.91831],[52.290451,12.91879],[52.290451,12.91924],[52.290482,12.91992],[52.290581,12.92099],[52.290749,12.92183],[52.29097,12.92274],[52.291271,12.92371],[52.291809,12.92508],[52.29211,12.92599],[52.292511,12.92743],[52.292961,12.92949],[52.298199,12.95228],[52.299309,12.95707],[52.301849,12.96836],[52.30249,12.97116],[52.302849,12.97277],[52.30302,12.97345],[52.303169,12.9741],[52.303341,12.97503],[52.303471,12.97595],[52.303539,12.97658],[52.3036,12.97733],[52.303638,12.97817],[52.303379,13.00804],[52.303349,13.00964],[52.303322,13.01115],[52.303261,13.01224],[52.303169,13.01321],[52.30304,13.01414],[52.302879,13.01503],[52.30267,13.01593],[52.30154,13.01991],[52.30014,13.02485],[52.299999,13.02532],[52.299839,13.02589],[52.29945,13.0273],[52.299179,13.02828],[52.298981,13.029],[52.298851,13.02948],[52.298691,13.03007],[52.298599,13.03051],[52.298489,13.031],[52.298409,13.0315],[52.298351,13.03191],[52.298302,13.03235],[52.29826,13.03275],[52.298229,13.03316],[52.298222,13.03357],[52.29821,13.03402],[52.29821,13.03448],[52.29821,13.03477],[52.298229,13.03535],[52.298248,13.03579],[52.298309,13.03639],[52.29837,13.03689],[52.29847,13.0375],[52.29858,13.03805],[52.298691,13.0386],[52.298889,13.0393],[52.299019,13.03977],[52.29924,13.04038],[52.30006,13.04263],[52.300331,13.04338],[52.30048,13.04386],[52.300621,13.04441],[52.300739,13.04491],[52.300819,13.04535],[52.300911,13.04586],[52.30098,13.04634],[52.301041,13.04686],[52.30109,13.04735],[52.301121,13.04784],[52.30114,13.04834],[52.30114,13.04896],[52.300999,13.05311],[52.300701,13.06163],[52.300671,13.06223],[52.300499,13.06709],[52.300159,13.07772],[52.30011,13.07952],[52.300049,13.08123],[52.30003,13.08219],[52.30006,13.08293],[52.300091,13.08362],[52.300129,13.08421],[52.300179,13.08472],[52.300228,13.0852],[52.300331,13.08582],[52.300541,13.08696],[52.30196,13.09434],[52.302139,13.09526],[52.302261,13.09585],[52.302559,13.09734],[52.30267,13.09799],[52.30275,13.09857],[52.30283,13.09933],[52.30286,13.09979],[52.302898,13.10039],[52.302921,13.10091],[52.302929,13.10139],[52.302921,13.10196],[52.302879,13.10399],[52.302631,13.11285],[52.30257,13.11635],[52.30254,13.11712],[52.302391,13.12387],[52.302311,13.12553],[52.301029,13.14169],[52.300968,13.14249],[52.30085,13.14398],[52.300831,13.14447],[52.300812,13.14488],[52.300812,13.14539],[52.3008,13.14592],[52.30085,13.15346],[52.300819,13.15558],[52.3008,13.15612],[52.300781,13.15662],[52.300739,13.15714],[52.300209,13.16418],[52.299351,13.17524],[52.298931,13.18064],[52.29892,13.18097],[52.298908,13.18142],[52.298908,13.1821],[52.29892,13.18257],[52.298931,13.18301],[52.298962,13.18349],[52.299,13.18391],[52.299042,13.18431],[52.299091,13.18475],[52.299149,13.18519],[52.299221,13.18569],[52.299301,13.18608],[52.29937,13.18646],[52.299431,13.18678],[52.299561,13.18732],[52.30003,13.18925],[52.30019,13.18995],[52.30151,13.1953],[52.301579,13.19566],[52.30167,13.19612],[52.301731,13.19652],[52.3018,13.19693],[52.301849,13.1973],[52.301899,13.19773],[52.301929,13.19806],[52.30196,13.19841],[52.301979,13.19887],[52.30201,13.19935],[52.302021,13.19977],[52.302021,13.20011],[52.30201,13.20053],[52.30201,13.20089],[52.301998,13.20135],[52.301891,13.20437],[52.301739,13.20819],[52.30159,13.21251],[52.30143,13.21658],[52.301399,13.21761],[52.30101,13.22814],[52.300629,13.23876],[52.300362,13.24577],[52.300339,13.24618],[52.300331,13.24667],[52.30032,13.24713],[52.30032,13.24761],[52.30032,13.24802],[52.300331,13.24849],[52.30035,13.24896],[52.300369,13.24944],[52.300419,13.24996],[52.300461,13.25048],[52.300529,13.25102],[52.300598,13.25154],[52.300701,13.25207],[52.300812,13.25259],[52.300919,13.25312],[52.301041,13.2536],[52.30117,13.25409],[52.301331,13.25467],[52.302052,13.25682],[52.303631,13.26149],[52.306171,13.26909],[52.306549,13.27018],[52.307129,13.27192],[52.307289,13.27238],[52.30743,13.27285],[52.307571,13.27335],[52.307701,13.27383],[52.307819,13.2743],[52.307941,13.27481],[52.308048,13.27532],[52.30814,13.27581],[52.308239,13.27632],[52.308319,13.2768],[52.308392,13.27732],[52.308449,13.27784],[52.30851,13.27835],[52.308559,13.27889],[52.30859,13.27942],[52.308601,13.27994],[52.308609,13.28048],[52.30862,13.281],[52.308601,13.28153],[52.308571,13.28206],[52.308552,13.28255],[52.308498,13.28311],[52.30801,13.28764],[52.30764,13.2907],[52.307468,13.2923],[52.30743,13.29283],[52.307388,13.29332],[52.307369,13.29385],[52.30735,13.29491],[52.307259,13.2995],[52.307259,13.29988],[52.30722,13.30167],[52.307178,13.30244],[52.306789,13.30749],[52.30616,13.31553],[52.30563,13.32229],[52.305561,13.32336],[52.305519,13.32442],[52.3055,13.32547],[52.3055,13.32656],[52.305531,13.3276],[52.30558,13.32869],[52.30566,13.32976],[52.305771,13.33087],[52.305901,13.33203],[52.305969,13.33278],[52.306438,13.33712],[52.30653,13.33803],[52.307461,13.3466],[52.307571,13.34768],[52.307659,13.34873],[52.307709,13.34979],[52.307739,13.35073],[52.307751,13.35086],[52.307758,13.35191],[52.30769,13.36154],[52.30769,13.36237],[52.30761,13.37333],[52.30759,13.37434],[52.307549,13.37523],[52.307499,13.37612],[52.30743,13.37713],[52.306961,13.38394],[52.3069,13.38485],[52.306709,13.38766],[52.306549,13.38997],[52.30653,13.39038],[52.306259,13.39469],[52.30616,13.39737],[52.30603,13.40509],[52.305882,13.4151],[52.305882,13.41575],[52.305851,13.41721],[52.30584,13.41831],[52.305801,13.42242],[52.305828,13.42609],[52.305851,13.42757],[52.305931,13.43275],[52.30603,13.43915],[52.30608,13.44054],[52.306141,13.44131],[52.30616,13.4416],[52.306229,13.44238],[52.30629,13.4429],[52.306641,13.44551],[52.306839,13.4466],[52.307899,13.45187],[52.308128,13.45298],[52.30838,13.45421],[52.308769,13.45611],[52.30912,13.45786],[52.309681,13.46055],[52.309719,13.46078],[52.310341,13.4639],[52.310459,13.4645],[52.311951,13.47177],[52.312611,13.47496],[52.312679,13.47535],[52.314789,13.48567],[52.315231,13.48783],[52.316971,13.49645],[52.317291,13.49799],[52.317951,13.50123],[52.3186,13.50442],[52.31881,13.50564],[52.318932,13.50642],[52.319031,13.50718],[52.319141,13.50822],[52.31921,13.50916],[52.31926,13.51001],[52.319302,13.51074],[52.319309,13.51155],[52.319321,13.51231],[52.319309,13.51293],[52.31929,13.51368],[52.319229,13.51505],[52.318851,13.52142],[52.318569,13.52585],[52.318359,13.52936],[52.31831,13.53107],[52.318279,13.53268],[52.31834,13.53601],[52.318371,13.53704],[52.318588,13.54471],[52.318771,13.55087],[52.31889,13.55457],[52.31889,13.55478],[52.318951,13.55658],[52.31897,13.55785],[52.319111,13.56125],[52.319141,13.56241],[52.319351,13.56982],[52.319481,13.57375],[52.319611,13.57905],[52.319679,13.58139],[52.319679,13.58179],[52.319672,13.58228],[52.319649,13.58274],[52.31963,13.58324],[52.319592,13.58371],[52.31953,13.58429],[52.319469,13.58477],[52.319401,13.5853],[52.319302,13.58579],[52.319199,13.5863],[52.319111,13.58674],[52.318981,13.58716],[52.318878,13.58758],[52.318771,13.588],[52.3186,13.58854],[52.318409,13.58908],[52.314541,13.59834],[52.313011,13.60187],[52.312778,13.60244],[52.31237,13.60355],[52.312092,13.60442],[52.311699,13.60583],[52.311562,13.60662],[52.31144,13.60741],[52.31134,13.60828],[52.311218,13.60965],[52.311131,13.61102],[52.310959,13.61394],[52.310749,13.61685],[52.310581,13.61942],[52.31041,13.62219],[52.310219,13.62503],[52.310089,13.62699],[52.31007,13.6275],[52.31007,13.62845],[52.31007,13.62939],[52.310169,13.63121],[52.310249,13.63253],[52.31028,13.63349],[52.310299,13.63427],[52.31039,13.63698],[52.31065,13.64389],[52.310699,13.64603],[52.310829,13.64817],[52.31089,13.64904],[52.311039,13.65133],[52.311359,13.65437],[52.311451,13.65497],[52.311939,13.65849],[52.312649,13.66256],[52.312679,13.6627],[52.312778,13.66331],[52.31284,13.66363],[52.313709,13.66821],[52.31422,13.67078],[52.316711,13.68074],[52.318481,13.68853],[52.32093,13.69869],[52.323811,13.71061],[52.324039,13.71157],[52.324181,13.71243],[52.324329,13.71357],[52.324421,13.7144],[52.324478,13.71538],[52.324501,13.7164],[52.32439,13.72013],[52.32423,13.72539],[52.324211,13.72651],[52.324032,13.73115],[52.323959,13.73364],[52.323719,13.73806],[52.323471,13.74205],[52.32333,13.74668],[52.32317,13.75164],[52.323151,13.75306],[52.323158,13.7541],[52.3232,13.75505],[52.323231,13.75592],[52.323261,13.7567],[52.32328,13.75751],[52.32328,13.75826],[52.323261,13.75934],[52.323231,13.76009],[52.32309,13.76171],[52.323009,13.76277],[52.32291,13.76362],[52.322769,13.76464],[52.322479,13.76632],[52.321991,13.76899],[52.321259,13.77266],[52.320969,13.7741],[52.319851,13.77939],[52.31921,13.78262],[52.318939,13.78396],[52.318501,13.78613],[52.317551,13.79078],[52.317509,13.79102],[52.317341,13.79181],[52.317108,13.7929],[52.31657,13.79519],[52.315449,13.79977],[52.315079,13.80129],[52.313332,13.80844],[52.31131,13.81651],[52.310841,13.81912],[52.310638,13.82042],[52.31049,13.8217],[52.310379,13.82292],[52.310299,13.8241],[52.310242,13.82523],[52.310211,13.82659],[52.310211,13.82763],[52.31028,13.82919],[52.31039,13.83102],[52.310612,13.83456],[52.310829,13.83808],[52.311031,13.84117],[52.312199,13.85973],[52.312481,13.86492],[52.31292,13.8716],[52.313129,13.87394],[52.3134,13.87599],[52.31377,13.87848],[52.315659,13.8905],[52.316002,13.89283],[52.316109,13.89382],[52.316139,13.89395],[52.316231,13.89513],[52.316341,13.89711],[52.31636,13.89782],[52.316368,13.89843],[52.316368,13.89941],[52.316368,13.89974],[52.316319,13.9008],[52.316299,13.90126],[52.31628,13.90146],[52.316231,13.90217],[52.3162,13.90265],[52.31612,13.9035],[52.316051,13.90423],[52.315929,13.90506],[52.315769,13.90622],[52.31554,13.90753],[52.315449,13.90808],[52.31525,13.90935],[52.314678,13.91243],[52.313839,13.91717],[52.313591,13.91856],[52.313251,13.9206],[52.313,13.92272],[52.312859,13.92457],[52.312672,13.92828],[52.312469,13.93198],[52.31221,13.93685],[52.31189,13.94362],[52.311821,13.94501],[52.311699,13.94711],[52.3116,13.94925],[52.311531,13.95186],[52.311501,13.95388],[52.31152,13.95569],[52.31155,13.95647],[52.31155,13.95723],[52.31155,13.95759],[52.3116,13.95848],[52.311649,13.95939],[52.31171,13.96051],[52.31189,13.9633],[52.311958,13.96403],[52.312031,13.96476],[52.312111,13.96553],[52.312309,13.9676],[52.312679,13.97042],[52.313519,13.97695],[52.31419,13.98221],[52.315079,13.98901],[52.31559,13.99114],[52.316631,13.99535],[52.320641,14.01003],[52.321388,14.01278],[52.32254,14.01699],[52.327091,14.03302],[52.327888,14.03549],[52.32877,14.03817],[52.329361,14.03994],[52.329639,14.04085],[52.329868,14.04185],[52.330509,14.0449],[52.331181,14.04833],[52.332371,14.05431],[52.333389,14.0594],[52.33419,14.0635],[52.334278,14.06416],[52.334389,14.06499],[52.33445,14.06608],[52.33448,14.06779],[52.334492,14.06882],[52.334499,14.06961],[52.33453,14.0718],[52.33461,14.07611],[52.334621,14.07673],[52.334629,14.07948],[52.334641,14.0799],[52.33469,14.08319],[52.334709,14.08396],[52.33493,14.09404],[52.335129,14.10164],[52.335171,14.10379],[52.3353,14.10977],[52.33532,14.11047],[52.335442,14.1153],[52.335579,14.12059],[52.335781,14.12908],[52.335941,14.13594],[52.336109,14.14278],[52.336159,14.14419],[52.336269,14.14563],[52.336399,14.14698],[52.33659,14.14847],[52.336849,14.15005],[52.33704,14.15106],[52.337559,14.15323],[52.33905,14.15899],[52.33989,14.16224],[52.340832,14.16591],[52.342758,14.17332],[52.343319,14.17564],[52.343731,14.17809],[52.34388,14.18072],[52.343811,14.18341],[52.34338,14.18688],[52.342838,14.18988],[52.341709,14.19427],[52.340618,14.19713],[52.338531,14.20352],[52.337429,14.20914],[52.337021,14.2144],[52.336578,14.22596],[52.335991,14.24164],[52.33585,14.24464],[52.335499,14.24766],[52.334919,14.2509],[52.334171,14.25369],[52.333778,14.25489],[52.333649,14.25527],[52.332611,14.25821],[52.330059,14.2653],[52.328659,14.26944],[52.328289,14.27081],[52.32753,14.27394],[52.327179,14.27573],[52.326401,14.27954],[52.325371,14.28448],[52.324718,14.2877],[52.324291,14.29105],[52.32399,14.29796],[52.323471,14.31189],[52.32296,14.32586],[52.322208,14.34336],[52.322159,14.3474],[52.322029,14.35058],[52.321739,14.359],[52.321239,14.37253],[52.32095,14.37974],[52.320938,14.38024],[52.320881,14.38183],[52.32056,14.39143],[52.32029,14.39804],[52.32019,14.40253],[52.320221,14.41164],[52.32032,14.42128],[52.3204,14.43098],[52.320591,14.44889],[52.32069,14.45717],[52.320679,14.46126],[52.320641,14.46375],[52.320591,14.46598],[52.32053,14.46934],[52.320431,14.47422],[52.320419,14.475],[52.320358,14.47841],[52.32019,14.48646],[52.320011,14.49741],[52.31992,14.50324],[52.319832,14.50629],[52.319721,14.50929],[52.319519,14.51284],[52.319302,14.51651],[52.319069,14.51992],[52.318989,14.5207],[52.31889,14.52167],[52.318729,14.52265],[52.318451,14.52381],[52.318111,14.52488],[52.317699,14.52601],[52.316898,14.52836],[52.316601,14.52915],[52.316311,14.52992],[52.31617,14.53036],[52.315948,14.53115],[52.315681,14.53209],[52.315552,14.53266],[52.315231,14.53412],[52.314899,14.53588],[52.31472,14.53705],[52.314548,14.53846],[52.314442,14.53961],[52.31435,14.54102],[52.314289,14.54354],[52.31432,14.54571],[52.314381,14.54728],[52.314388,14.54786],[52.31451,14.55143],[52.314579,14.55382],[52.31461,14.55563],[52.314621,14.55709],[52.31459,14.56008],[52.314548,14.56303],[52.314499,14.56659],[52.314579,14.56822],[52.314789,14.57063],[52.314919,14.57244],[52.315189,14.57603],[52.31538,14.57823],[52.31575,14.582],[52.316051,14.5845],[52.316212,14.58597],[52.316299,14.58661],[52.316368,14.58724],[52.316441,14.58844],[52.316521,14.58954],[52.316681,14.59023],[52.316879,14.59181],[52.31699,14.59264],[52.31889,14.59981],[52.320629,14.60601],[52.322411,14.61267],[52.323078,14.6152],[52.32394,14.61827],[52.32452,14.62057],[52.324692,14.62123],[52.325001,14.62245],[52.325611,14.62534],[52.32589,14.6274],[52.326092,14.6291],[52.326199,14.63064],[52.326248,14.63312],[52.32616,14.63536],[52.325989,14.63746],[52.325851,14.63898],[52.325691,14.64077],[52.325489,14.64297],[52.325272,14.64536],[52.324631,14.65187],[52.324131,14.65751],[52.323959,14.66148],[52.32394,14.66456],[52.324268,14.66852],[52.324959,14.67386],[52.325951,14.68193],[52.32679,14.68798],[52.32782,14.69577],[52.328308,14.69948],[52.3284,14.69984],[52.3288,14.70276],[52.32935,14.70716],[52.329762,14.71018],[52.33012,14.71311],[52.33057,14.71611],[52.330719,14.71743],[52.33099,14.71987],[52.331348,14.72298],[52.331509,14.72419],[52.332329,14.73033],[52.33297,14.7351],[52.333672,14.73998],[52.334278,14.74597],[52.334839,14.74961],[52.335121,14.75285],[52.33532,14.75599],[52.335251,14.76015],[52.335251,14.76259],[52.335251,14.76802],[52.335281,14.77738],[52.335312,14.78783],[52.335312,14.79524],[52.335312,14.8001],[52.335121,14.80287],[52.33474,14.80595],[52.334,14.80992],[52.3326,14.81719],[52.331188,14.82469],[52.33181,14.82495],[52.332211,14.82512],[52.336479,14.82671],[52.33667,14.82695],[52.3367,14.82708],[52.336899,14.82746],[52.337959,14.83174],[52.33971,14.84149],[52.339722,14.8423],[52.339249,14.84258],[52.337952,14.84265],[52.33688,14.84286],[52.33585,14.8435],[52.334579,14.84484],[52.332611,14.84689],[52.33099,14.84875],[52.329708,14.84906],[52.329891,14.85048],[52.32983,14.85069],[52.329731,14.85084],[52.329269,14.85094],[52.32988,14.85503],[52.331451,14.8649],[52.332531,14.87174],[52.333229,14.87593],[52.333488,14.87793],[52.333511,14.87955],[52.333382,14.88108],[52.33308,14.8827],[52.33213,14.88645],[52.329849,14.89468],[52.327461,14.90341],[52.32626,14.90796],[52.325859,14.90951],[52.324551,14.91448],[52.323891,14.91709],[52.32333,14.92519],[52.322842,14.93262],[52.32272,14.93431],[52.32272,14.93545],[52.322701,14.93746],[52.322601,14.94129],[52.322571,14.94231],[52.322529,14.94388],[52.322491,14.94485],[52.3223,14.94668],[52.322048,14.94901],[52.322102,14.95146],[52.32214,14.95324],[52.323261,14.96119],[52.323551,14.96432],[52.32428,14.96949],[52.324532,14.97133],[52.325459,14.97816],[52.325851,14.98161],[52.326069,14.98478],[52.326172,14.9859],[52.326431,14.99044],[52.32671,14.9952],[52.327068,15.00165],[52.327141,15.00297],[52.32748,15.00926],[52.327492,15.01057],[52.3274,15.01196],[52.327202,15.0133],[52.326889,15.01427],[52.32626,15.01541],[52.326038,15.01612],[52.325581,15.01866],[52.325211,15.01991],[52.323639,15.02362],[52.321442,15.02881],[52.319618,15.03303],[52.31826,15.03632],[52.317959,15.03744],[52.317749,15.03856],[52.317539,15.03964],[52.317451,15.04015],[52.317299,15.04102],[52.3172,15.04158],[52.31712,15.04197],[52.31575,15.05026],[52.314671,15.05675],[52.31459,15.05757],[52.314362,15.0613],[52.314308,15.06239],[52.314129,15.06768],[52.314129,15.06804],[52.314018,15.07221],[52.314011,15.07287],[52.314011,15.07321],[52.31406,15.07634],[52.31406,15.07645],[52.31403,15.07699],[52.313969,15.07741],[52.313759,15.07815],[52.31358,15.07869],[52.313381,15.07915],[52.313061,15.07986],[52.31271,15.08079],[52.312401,15.08214],[52.312351,15.08315],[52.312359,15.0838],[52.3125,15.0857],[52.312778,15.08879],[52.313099,15.09145],[52.313129,15.09244],[52.313122,15.09307],[52.312889,15.09459],[52.312592,15.09667],[52.31163,15.10237],[52.311291,15.10456],[52.311131,15.10562],[52.3102,15.11167],[52.309429,15.1158],[52.309212,15.11783],[52.307449,15.12917],[52.305851,15.13853],[52.305531,15.14046],[52.305679,15.1434],[52.30682,15.15571],[52.307621,15.16481],[52.30814,15.16976],[52.308449,15.17354],[52.308491,15.17476],[52.30835,15.17634],[52.307598,15.18076],[52.30743,15.18192],[52.30706,15.18441],[52.306221,15.19006],[52.305679,15.19367],[52.305141,15.19727],[52.304531,15.20115],[52.304321,15.20249],[52.30415,15.20363],[52.304161,15.20518],[52.304138,15.2125],[52.304081,15.21744],[52.30415,15.22173],[52.304062,15.22459],[52.30323,15.22903],[52.302021,15.23598],[52.300991,15.24142],[52.300159,15.24576],[52.299431,15.24963],[52.299141,15.25119],[52.298908,15.25245],[52.298779,15.25318],[52.297981,15.25758],[52.296871,15.26387],[52.296539,15.26546],[52.296162,15.26735],[52.29599,15.26859],[52.296009,15.27042],[52.296291,15.27157],[52.296638,15.27262],[52.297279,15.27445],[52.29789,15.27607],[52.29921,15.27976],[52.299759,15.28133],[52.300079,15.28318],[52.300201,15.28427],[52.300282,15.28585],[52.30032,15.28881],[52.30032,15.29367],[52.300098,15.30026],[52.29995,15.30136],[52.29969,15.30273],[52.29908,15.30553],[52.296902,15.31165],[52.29541,15.31585],[52.293541,15.32154],[52.29134,15.32788],[52.290749,15.32981],[52.290359,15.33222],[52.290199,15.33807],[52.28923,15.34195],[52.286598,15.34702],[52.282909,15.35303],[52.28138,15.35526],[52.28064,15.35622],[52.279541,15.35927],[52.278992,15.36026],[52.278389,15.36093],[52.277431,15.36179],[52.276669,15.36254],[52.276081,15.36362],[52.274551,15.36875],[52.272739,15.37466],[52.2714,15.37907],[52.270931,15.38053],[52.270679,15.38137],[52.269402,15.38597],[52.268921,15.38743],[52.26889,15.38753],[52.268349,15.38872],[52.267929,15.38954],[52.266949,15.39075],[52.265129,15.39281],[52.263699,15.39487],[52.262249,15.39781],[52.26144,15.39949],[52.260139,15.4022],[52.258701,15.40485],[52.257919,15.40721],[52.257301,15.41013],[52.257069,15.41427],[52.25671,15.41949],[52.256142,15.42734],[52.255051,15.44218],[52.254669,15.44881],[52.253799,15.45979],[52.253811,15.46035],[52.253769,15.4612],[52.25412,15.46642],[52.254219,15.46799],[52.254169,15.469],[52.254028,15.47212],[52.25436,15.47424],[52.254292,15.47588],[52.25423,15.47617],[52.253578,15.47933],[52.25301,15.48252],[52.25317,15.4857],[52.253681,15.488],[52.255531,15.49359],[52.256592,15.49689],[52.25745,15.49939],[52.258282,15.50201],[52.25943,15.50561],[52.259819,15.50713],[52.260269,15.51073],[52.26046,15.51246],[52.26078,15.51575],[52.26115,15.5193],[52.261292,15.52025],[52.261452,15.52155],[52.262089,15.5273],[52.262291,15.52977],[52.262249,15.53163],[52.26223,15.53312],[52.26202,15.5332],[52.261929,15.53345],[52.261971,15.53376],[52.26215,15.53395],[52.261848,15.5347],[52.260761,15.53751],[52.260719,15.53759],[52.260151,15.53888],[52.256161,15.5487],[52.255932,15.54923],[52.255569,15.5501],[52.252998,15.55644],[52.252178,15.55843],[52.251789,15.56074],[52.2519,15.56195],[52.25211,15.56461],[52.253609,15.57056],[52.2556,15.57819],[52.256821,15.58265],[52.256802,15.5835],[52.257481,15.5857],[52.25787,15.58713],[52.25988,15.59026],[52.26302,15.5945],[52.266281,15.5992],[52.268742,15.60275],[52.271172,15.6061],[52.272129,15.60787],[52.272579,15.60917],[52.273281,15.61221],[52.274811,15.61984],[52.275711,15.62407],[52.277569,15.63269],[52.278252,15.63792],[52.27877,15.64118],[52.279442,15.64462],[52.280972,15.64746],[52.283218,15.64905],[52.285912,15.65071],[52.287239,15.65119],[52.289459,15.6513],[52.293442,15.6511],[52.295109,15.65142],[52.297279,15.65219],[52.299271,15.65359],[52.30196,15.65767],[52.303341,15.65965],[52.305401,15.66148],[52.308849,15.66356],[52.31028,15.66424],[52.311329,15.66496],[52.312618,15.66619],[52.31633,15.66969],[52.31855,15.67166],[52.319462,15.67272],[52.320271,15.67374],[52.320709,15.67491],[52.321201,15.67633],[52.32132,15.67753],[52.321419,15.67846],[52.321331,15.68024],[52.32106,15.68229],[52.32103,15.68387],[52.321301,15.68584],[52.321831,15.68795],[52.322472,15.69054],[52.322781,15.69181],[52.32394,15.69626],[52.3269,15.70543],[52.32933,15.71288],[52.33041,15.71597],[52.33242,15.72132],[52.332859,15.72245],[52.332901,15.72256],[52.332939,15.72267],[52.333858,15.72466],[52.33744,15.73182],[52.33881,15.73474],[52.33939,15.73652],[52.339828,15.73898],[52.341141,15.74844],[52.341801,15.75126],[52.342041,15.75225],[52.342319,15.75323],[52.342739,15.75468],[52.34322,15.75633],[52.34446,15.76096],[52.344971,15.76281],[52.345161,15.7647],[52.34523,15.76731],[52.344761,15.77811],[52.344379,15.78276],[52.34428,15.78559],[52.344429,15.78784],[52.344711,15.78962],[52.3451,15.79201],[52.345829,15.7957],[52.346882,15.7995],[52.347641,15.8022],[52.3503,15.81156],[52.3531,15.82158],[52.353291,15.82229],[52.353619,15.82347],[52.356079,15.83324],[52.35796,15.84103],[52.358109,15.84228],[52.35828,15.84537],[52.358429,15.84972],[52.35873,15.85273],[52.358829,15.85334],[52.358891,15.85361],[52.359669,15.85557],[52.36055,15.85676],[52.36179,15.85789],[52.36377,15.8595],[52.36541,15.86088],[52.366211,15.86172],[52.36718,15.86298],[52.36763,15.86378],[52.36797,15.86447],[52.368431,15.86563],[52.368519,15.86592],[52.36887,15.86689],[52.370312,15.87259],[52.37077,15.87381],[52.37096,15.87428],[52.37191,15.87661],[52.372532,15.87872],[52.372829,15.88037],[52.37294,15.88168],[52.372929,15.88325],[52.372398,15.88678],[52.37236,15.88699],[52.371841,15.89046],[52.371609,15.89246],[52.371269,15.89542],[52.371078,15.89704],[52.371719,15.903],[52.37233,15.9084],[52.372551,15.90929],[52.373058,15.91025],[52.373959,15.91201],[52.37439,15.9134],[52.37508,15.91632],[52.375851,15.91963],[52.376381,15.92256],[52.377209,15.92803],[52.37722,15.92961],[52.376469,15.93341],[52.37648,15.93775],[52.3764,15.93848],[52.375511,15.94449],[52.375252,15.94754],[52.375278,15.94982],[52.375629,15.95385],[52.375751,15.95709],[52.375839,15.95888],[52.375851,15.9591],[52.375912,15.96079],[52.37608,15.96312],[52.37645,15.96516],[52.377838,15.97023],[52.379761,15.97643],[52.379902,15.97828],[52.37991,15.97955],[52.379452,15.98388],[52.380009,15.99173],[52.380421,15.99552],[52.380459,15.99832],[52.38055,16.001459],[52.380169,16.00466],[52.379589,16.007641],[52.378349,16.01523],[52.376911,16.02301],[52.376369,16.02775],[52.376301,16.02907],[52.376301,16.03022],[52.376331,16.032221],[52.376431,16.035379],[52.376789,16.04607],[52.377239,16.057249],[52.377392,16.06572],[52.377522,16.07852],[52.37772,16.09374],[52.37756,16.09358],[52.377369,16.093679],[52.377289,16.09392],[52.3773,16.09408],[52.375912,16.09433],[52.374691,16.094549],[52.3713,16.09503],[52.37112,16.09507],[52.366039,16.096029],[52.36264,16.096661],[52.36253,16.097219],[52.362289,16.09865],[52.36216,16.099291],[52.361931,16.099661],[52.36129,16.09997],[52.360569,16.100269],[52.360031,16.10107],[52.359779,16.102039],[52.359699,16.10269],[52.3596,16.103861],[52.359631,16.104851],[52.36039,16.10857],[52.36195,16.117229],[52.362999,16.123461],[52.36385,16.130489],[52.364521,16.136801],[52.365608,16.147249],[52.367062,16.161501],[52.367298,16.16527],[52.36742,16.168301],[52.367451,16.172119],[52.367611,16.185591],[52.36763,16.187149],[52.367821,16.19273],[52.368038,16.19655],[52.368622,16.20146],[52.36945,16.20701],[52.372471,16.222179],[52.375481,16.238211],[52.375839,16.24123],[52.376221,16.244749],[52.376629,16.249599],[52.37714,16.26313],[52.37738,16.270679],[52.377781,16.279659],[52.37822,16.288481],[52.379379,16.309139],[52.380039,16.32155],[52.38118,16.34289],[52.381981,16.356291],[52.38266,16.36916],[52.38324,16.37723],[52.383869,16.383631],[52.38559,16.396589],[52.38728,16.408449],[52.388142,16.41563],[52.388851,16.42271],[52.389351,16.428341],[52.38969,16.434139],[52.39006,16.44529],[52.390018,16.448879],[52.389881,16.453251],[52.389729,16.45645],[52.3895,16.459141],[52.38924,16.46138],[52.388569,16.46607],[52.387341,16.47382],[52.38707,16.47554],[52.386841,16.477989],[52.386749,16.479481],[52.3867,16.48031],[52.386551,16.483351],[52.386478,16.486731],[52.38657,16.491039],[52.386761,16.494961],[52.387081,16.49999],[52.387459,16.50783],[52.387501,16.511551],[52.387451,16.514919],[52.387249,16.520399],[52.3867,16.52607],[52.38604,16.531031],[52.385269,16.5352],[52.384708,16.53763],[52.383999,16.540649],[52.38084,16.55183],[52.37812,16.56093],[52.3773,16.563681],[52.376591,16.56605],[52.373539,16.575661],[52.370152,16.584909],[52.3647,16.59923],[52.360741,16.60952],[52.357101,16.61961],[52.35582,16.62454],[52.355042,16.628139],[52.353432,16.638],[52.35215,16.64694],[52.350979,16.654249],[52.35059,16.656679],[52.349979,16.660419],[52.349369,16.664169],[52.34903,16.66687],[52.348579,16.67141],[52.348389,16.67975],[52.34893,16.691719],[52.349468,16.70499],[52.349819,16.713869],[52.349899,16.715731],[52.35001,16.718731],[52.350319,16.726601],[52.350422,16.729759],[52.350491,16.73181],[52.350491,16.73185],[52.350491,16.731979],[52.350491,16.736811],[52.350491,16.74202],[52.350479,16.75079],[52.350521,16.761419],[52.350479,16.77059],[52.35043,16.778931],[52.35046,16.795071],[52.35033,16.81012],[52.3503,16.826269],[52.350319,16.83869],[52.35041,16.841261],[52.350609,16.84532],[52.350651,16.846121],[52.35088,16.849079],[52.35112,16.85165],[52.35257,16.863581],[52.354179,16.876539],[52.3545,16.879709],[52.354691,16.88483],[52.354698,16.88644],[52.354641,16.888269],[52.354519,16.89225],[52.354389,16.89537],[52.354179,16.897949],[52.35379,16.901699],[52.353741,16.90243],[52.353352,16.90744],[52.35313,16.91028],[52.35281,16.914261],[52.352631,16.916651],[52.352428,16.91897],[52.3521,16.923109],[52.350979,16.937201],[52.349918,16.94964],[52.3494,16.956039],[52.348999,16.961029],[52.348652,16.9655],[52.348,16.973419],[52.347019,16.98617],[52.346531,16.99177],[52.345741,17.0009],[52.345322,17.004881],[52.345009,17.007601],[52.344269,17.01376],[52.34333,17.0207],[52.342529,17.0254],[52.34095,17.034031],[52.337791,17.049919],[52.334721,17.0646],[52.331821,17.078711],[52.329639,17.087839],[52.32906,17.090099],[52.32856,17.09207],[52.327869,17.094801],[52.326542,17.099489],[52.324188,17.107441],[52.32201,17.114479],[52.318722,17.12499],[52.31752,17.12882],[52.31514,17.136431],[52.312561,17.144501],[52.311531,17.1478],[52.311031,17.14967],[52.310692,17.150949],[52.310612,17.1513],[52.310101,17.15361],[52.309872,17.15439],[52.309158,17.157721],[52.308281,17.163059],[52.307789,17.166821],[52.307411,17.170919],[52.307159,17.17539],[52.307072,17.179951],[52.307159,17.18524],[52.30761,17.190941],[52.307919,17.19392],[52.30904,17.201851],[52.309639,17.20735],[52.310059,17.212879],[52.310219,17.223009],[52.310131,17.24172],[52.310131,17.25379],[52.310059,17.265499],[52.310009,17.2722],[52.31004,17.278469],[52.310001,17.296169],[52.309929,17.305731],[52.309929,17.32172],[52.309841,17.34235],[52.309818,17.35442],[52.30991,17.357189],[52.310108,17.362419],[52.311218,17.376181],[52.311531,17.37855],[52.312019,17.38233],[52.312881,17.38825],[52.314861,17.399639],[52.317001,17.41197],[52.317711,17.417191],[52.318211,17.421301],[52.318691,17.42766],[52.31892,17.4317],[52.319038,17.436029],[52.31905,17.440769],[52.318821,17.454201],[52.31863,17.468769],[52.318409,17.48267],[52.31818,17.49605],[52.317921,17.50906],[52.317699,17.51322],[52.316971,17.521919],[52.316311,17.526711],[52.31567,17.530861],[52.315208,17.53367],[52.31498,17.53483],[52.314461,17.53759],[52.31406,17.539631],[52.313801,17.540899],[52.31295,17.54521],[52.312279,17.548889],[52.31216,17.549549],[52.311619,17.55254],[52.31144,17.553499],[52.310799,17.55788],[52.31052,17.56024],[52.3102,17.563971],[52.30999,17.56748],[52.30975,17.57126],[52.30954,17.574511],[52.30933,17.57836],[52.309101,17.58201],[52.30883,17.58531],[52.308441,17.588831],[52.307899,17.592569],[52.30722,17.596371],[52.306309,17.600479],[52.305389,17.6045],[52.304482,17.60854],[52.303532,17.612631],[52.302601,17.61665],[52.301689,17.620621],[52.300812,17.624559],[52.299938,17.628269],[52.299042,17.63216],[52.298119,17.6362],[52.297241,17.639971],[52.29636,17.64382],[52.295509,17.64756],[52.294621,17.65148],[52.293709,17.65538],[52.29277,17.659121],[52.29174,17.662821],[52.290619,17.666571],[52.289539,17.66995],[52.288361,17.673321],[52.287079,17.67683],[52.285419,17.68096],[52.284302,17.683741],[52.282619,17.687811],[52.281368,17.690929],[52.279861,17.694639],[52.27853,17.697969],[52.27705,17.70166],[52.275711,17.70507],[52.274361,17.70862],[52.272991,17.712521],[52.271801,17.716221],[52.270828,17.719391],[52.26992,17.72262],[52.269112,17.72566],[52.268009,17.73033],[52.267029,17.73484],[52.266171,17.739389],[52.26545,17.74361],[52.264851,17.74773],[52.264339,17.75156],[52.26395,17.755159],[52.263531,17.75952],[52.2631,17.764071],[52.262661,17.76853],[52.262291,17.77253],[52.261848,17.776291],[52.261261,17.780161],[52.260521,17.78458],[52.259731,17.78904],[52.25893,17.7936],[52.258129,17.79822],[52.25724,17.80298],[52.256351,17.80759],[52.25547,17.81222],[52.254551,17.81682],[52.25354,17.82229],[52.25312,17.824261],[52.252941,17.82514],[52.25259,17.82683],[52.252419,17.827629],[52.251381,17.83252],[52.2509,17.83478],[52.249779,17.83993],[52.248749,17.84458],[52.247639,17.84947],[52.246498,17.85438],[52.245319,17.8594],[52.24419,17.86404],[52.24305,17.868641],[52.24176,17.8738],[52.240639,17.87789],[52.239029,17.88295],[52.23682,17.889059],[52.235039,17.894119],[52.23349,17.898911],[52.23222,17.903549],[52.23119,17.90774],[52.23016,17.91255],[52.229259,17.91707],[52.228359,17.921789],[52.22744,17.92672],[52.226559,17.931179],[52.225601,17.935749],[52.224491,17.940611],[52.223751,17.943661],[52.22287,17.946989],[52.222279,17.949011],[52.221851,17.95014],[52.221439,17.951441],[52.221069,17.953329],[52.22031,17.956221],[52.218899,17.96109],[52.2174,17.966471],[52.216011,17.97163],[52.21492,17.97599],[52.21381,17.980471],[52.212631,17.98546],[52.21167,17.98987],[52.210781,17.99387],[52.20961,17.99971],[52.20866,18.004471],[52.20779,18.008881],[52.206749,18.013941],[52.20602,18.017241],[52.205151,18.02088],[52.204651,18.02261],[52.204361,18.023609],[52.203629,18.026171],[52.20158,18.032551],[52.199871,18.03726],[52.198181,18.04203],[52.196732,18.046591],[52.19548,18.051359],[52.19442,18.056259],[52.19352,18.06118],[52.19257,18.06632],[52.19146,18.07118],[52.190239,18.075649],[52.18866,18.080429],[52.187099,18.085381],[52.18586,18.09009],[52.1847,18.094481],[52.183529,18.099291],[52.182571,18.10388],[52.181751,18.108379],[52.180939,18.11359],[52.180149,18.11895],[52.17931,18.124451],[52.178391,18.12904],[52.177391,18.133511],[52.176289,18.13798],[52.175289,18.142071],[52.174252,18.146379],[52.173119,18.15097],[52.172169,18.15522],[52.171021,18.160151],[52.17004,18.164909],[52.169079,18.1696],[52.168129,18.17441],[52.16724,18.179291],[52.166359,18.18424],[52.165501,18.18927],[52.164799,18.193991],[52.164261,18.19729],[52.163601,18.201611],[52.163479,18.202221],[52.163288,18.203501],[52.162941,18.205879],[52.162628,18.20842],[52.162441,18.210489],[52.162209,18.212669],[52.162029,18.21505],[52.161758,18.218439],[52.161381,18.223881],[52.161018,18.229349],[52.160629,18.234871],[52.160221,18.24069],[52.15979,18.24567],[52.15921,18.250759],[52.158298,18.256281],[52.157089,18.26198],[52.15686,18.262859],[52.156521,18.264111],[52.156021,18.26605],[52.155621,18.26754],[52.155529,18.267851],[52.153629,18.273861],[52.151821,18.279779],[52.151131,18.28227],[52.150261,18.28594],[52.149189,18.29163],[52.14827,18.299],[52.147739,18.303749],[52.147419,18.307131],[52.146671,18.31233],[52.145721,18.31716],[52.14344,18.32645],[52.1422,18.33209],[52.141201,18.3377],[52.14061,18.342541],[52.140171,18.348499],[52.14003,18.353571],[52.140141,18.359501],[52.140388,18.36388],[52.14098,18.369869],[52.141541,18.37516],[52.141998,18.381081],[52.142281,18.386061],[52.142429,18.390619],[52.142551,18.39543],[52.142719,18.40027],[52.14312,18.40498],[52.143608,18.409361],[52.144421,18.414459],[52.145329,18.419029],[52.1464,18.42411],[52.14727,18.42831],[52.148239,18.432989],[52.14922,18.437771],[52.15012,18.4422],[52.150902,18.446541],[52.151581,18.450729],[52.1521,18.4548],[52.152512,18.46007],[52.152641,18.46566],[52.152561,18.470949],[52.152241,18.476339],[52.15163,18.48201],[52.150822,18.487101],[52.149769,18.492439],[52.148651,18.497259],[52.147419,18.502279],[52.1464,18.50639],[52.145149,18.511869],[52.144218,18.516371],[52.14336,18.521139],[52.142601,18.526649],[52.14204,18.531811],[52.14164,18.5376],[52.141411,18.54336],[52.141399,18.54904],[52.141472,18.55442],[52.141609,18.55991],[52.141731,18.565041],[52.141842,18.569691],[52.141979,18.57476],[52.142101,18.57938],[52.14212,18.584629],[52.14204,18.589439],[52.141811,18.594589],[52.141441,18.59964],[52.141029,18.603769],[52.140869,18.60504],[52.140541,18.607731],[52.140091,18.610941],[52.140011,18.61146],[52.139519,18.614491],[52.138969,18.617519],[52.13818,18.62149],[52.13723,18.62561],[52.135731,18.631559],[52.135681,18.63175],[52.134151,18.63732],[52.13364,18.63928],[52.13271,18.64283],[52.13187,18.6465],[52.13039,18.654449],[52.129341,18.660379],[52.128231,18.66544],[52.127201,18.669399],[52.12553,18.674879],[52.123859,18.680531],[52.12262,18.685539],[52.121559,18.691231],[52.121071,18.694349],[52.120071,18.702909],[52.1194,18.708441],[52.118649,18.71439],[52.118198,18.71767],[52.1171,18.723419],[52.116119,18.727289],[52.115021,18.731091],[52.114159,18.733749],[52.112358,18.73856],[52.110241,18.74337],[52.10701,18.74958],[52.104431,18.75449],[52.102268,18.75923],[52.1003,18.76413],[52.09827,18.769489],[52.096371,18.7742],[52.09589,18.775391],[52.094379,18.77862],[52.093109,18.781071],[52.091259,18.78434],[52.089241,18.7875],[52.08601,18.791849],[52.082939,18.79541],[52.080631,18.79825],[52.077099,18.80315],[52.07399,18.80831],[52.072338,18.811621],[52.071739,18.81282],[52.070518,18.81525],[52.0704,18.8155],[52.068199,18.82025],[52.06596,18.82456],[52.063099,18.82938],[52.0588,18.835791],[52.055489,18.840611],[52.052441,18.845091],[52.049061,18.850071],[52.045551,18.85527],[52.042881,18.859631],[52.04081,18.8634],[52.03949,18.8661],[52.038158,18.86907],[52.03714,18.8715],[52.035439,18.8759],[52.034222,18.879629],[52.033932,18.880529],[52.0327,18.88485],[52.031189,18.89113],[52.029381,18.899929],[52.02813,18.906179],[52.026958,18.911909],[52.025688,18.916809],[52.024479,18.92082],[52.02261,18.926399],[52.019821,18.93458],[52.017609,18.941151],[52.015862,18.94672],[52.014771,18.950951],[52.013149,18.95867],[52.011902,18.96446],[52.01046,18.969851],[52.008881,18.974689],[52.006538,18.98114],[52.00449,18.987221],[52.003071,18.991859],[52.001549,18.997669],[52.00045,19.002541],[51.999458,19.00773],[51.998039,19.01741],[51.99765,19.02055],[51.997459,19.02207],[51.99728,19.02351],[51.996399,19.0298],[51.995399,19.035801],[51.995022,19.03763],[51.994659,19.039221],[51.994148,19.04134],[51.99337,19.04438],[51.992531,19.047159],[51.991379,19.050579],[51.989731,19.054779],[51.98848,19.05761],[51.987129,19.0604],[51.985611,19.06324],[51.984531,19.06517],[51.97858,19.075291],[51.975769,19.08061],[51.973869,19.08461],[51.971889,19.08955],[51.970181,19.0944],[51.96793,19.10198],[51.966339,19.10762],[51.964859,19.112471],[51.96376,19.11552],[51.96101,19.12225],[51.95937,19.12607],[51.957458,19.13121],[51.95565,19.137289],[51.954498,19.142019],[51.952572,19.151661],[51.951248,19.15736],[51.94973,19.162621],[51.946812,19.171141],[51.94466,19.177509],[51.94305,19.183149],[51.941799,19.188761],[51.94101,19.193199],[51.940472,19.19698],[51.939911,19.20273],[51.93969,19.20854],[51.93964,19.214411],[51.93972,19.222719],[51.93969,19.22901],[51.93951,19.23262],[51.939289,19.235571],[51.93895,19.239189],[51.938301,19.244301],[51.937191,19.25193],[51.93644,19.25717],[51.935619,19.262699],[51.935001,19.266729],[51.934132,19.271299],[51.932522,19.278561],[51.931179,19.284679],[51.930161,19.289539],[51.92918,19.29582],[51.928619,19.301411],[51.928188,19.309851],[51.92783,19.31459],[51.927368,19.31875],[51.92696,19.321699],[51.92617,19.32612],[51.925098,19.33124],[51.924011,19.336901],[51.92337,19.34087],[51.922699,19.345881],[51.922249,19.349649],[51.922031,19.351789],[51.922001,19.35211],[51.921799,19.354139],[51.9217,19.35556],[51.921539,19.35808],[51.921391,19.360901],[51.921329,19.36195],[51.9212,19.36455],[51.921082,19.37055],[51.921101,19.375401],[51.921139,19.383471],[51.921082,19.38681],[51.920979,19.390619],[51.92075,19.393961],[51.920269,19.39966],[51.91922,19.40678],[51.918449,19.4112],[51.917461,19.41625],[51.91684,19.41865],[51.916069,19.42169],[51.912361,19.432541],[51.910278,19.43788],[51.90992,19.438749],[51.909222,19.44047],[51.90802,19.44343],[51.905972,19.44853],[51.90398,19.45363],[51.902161,19.45896],[51.901321,19.46212],[51.90086,19.464001],[51.900398,19.46608],[51.899971,19.46797],[51.89933,19.4711],[51.898151,19.47998],[51.89793,19.483231],[51.897812,19.48616],[51.89777,19.49305],[51.898151,19.51585],[51.898129,19.516371],[51.898041,19.5182],[51.897861,19.522011],[51.896622,19.536489],[51.889702,19.57382],[51.888969,19.57979],[51.88868,19.58357],[51.888618,19.585079],[51.888519,19.58819],[51.88858,19.591181],[51.888599,19.591881],[51.888729,19.594959],[51.888889,19.598301],[51.889099,19.601311],[51.88942,19.60549],[51.889549,19.60721],[51.88998,19.612881],[51.890079,19.614189],[51.890732,19.623899],[51.89077,19.62446],[51.891209,19.626949],[51.891251,19.627399],[51.891319,19.627939],[51.891418,19.62862],[51.891602,19.62936],[51.89183,19.630011],[51.89201,19.63035],[51.892159,19.63055],[51.892429,19.63093],[51.892792,19.63135],[51.893051,19.631559],[51.893471,19.6318],[51.89389,19.631929],[51.894218,19.631941],[51.894482,19.63191],[51.894711,19.63187],[51.894878,19.631781],[51.895161,19.631651],[51.89534,19.631531],[51.89547,19.631451],[51.895649,19.6313],[51.896198,19.630911],[51.89645,19.63073],[51.896679,19.63059],[51.896992,19.630381],[51.89743,19.630079],[51.898602,19.629339],[51.899212,19.628929],[51.900139,19.628349],[51.901081,19.62775],[51.90221,19.627171],[51.904461,19.62602],[51.90659,19.625019],[51.90855,19.624161],[51.910789,19.62328],[51.911888,19.62302],[51.912621,19.62285],[51.912819,19.62285],[51.913059,19.623051],[51.914322,19.625601],[51.914452,19.62591],[51.914661,19.626341],[51.9161,19.628691],[51.925201,19.644131],[51.925949,19.64506],[51.92897,19.647631],[51.93063,19.64908],[51.931019,19.649509],[51.931149,19.6497],[51.932259,19.652],[51.932751,19.65308],[51.943272,19.676041],[51.94331,19.676121],[51.94688,19.68264],[51.949989,19.68832],[51.95681,19.700911],[51.958549,19.704069],[51.9589,19.70484],[51.959049,19.705549],[51.95969,19.71069],[51.960819,19.723619],[51.96109,19.726681],[51.961231,19.728161],[51.961239,19.728291],[51.961361,19.7293],[51.961571,19.7299],[51.961811,19.7304],[51.962719,19.731529],[51.96312,19.732019],[51.963539,19.73242],[51.964809,19.733271],[51.965191,19.733509],[51.965439,19.73369],[51.965641,19.7339],[51.96574,19.73403],[51.9664,19.735121],[51.970589,19.742229],[51.973179,19.74663],[51.979118,19.75663],[51.993279,19.7805],[51.99371,19.781219],[52.001862,19.79495],[52.002369,19.79583],[52.0056,19.80126],[52.005829,19.8018],[52.006008,19.802219],[52.006229,19.802891],[52.006248,19.802971],[52.006939,19.8053],[52.00761,19.8076],[52.008629,19.811211],[52.008709,19.811489],[52.008808,19.811819],[52.0089,19.812111],[52.00927,19.81325],[52.009628,19.81402],[52.01593,19.82633],[52.023281,19.84086],[52.02507,19.84432],[52.026192,19.846519],[52.039162,19.87204],[52.039261,19.87224],[52.040749,19.87517],[52.041199,19.87606],[52.041538,19.87673],[52.042561,19.878771],[52.042839,19.87924],[52.044312,19.88221],[52.048222,19.88994],[52.04845,19.890381],[52.048969,19.89139],[52.04916,19.891769],[52.049259,19.89193],[52.04937,19.89213],[52.049419,19.892179],[52.04969,19.89249],[52.050049,19.892771],[52.050961,19.893471],[52.05225,19.89448],[52.05455,19.89625],[52.05455,19.896259],[52.059502,19.900061],[52.060539,19.90085],[52.06316,19.90287],[52.068199,19.90674],[52.068508,19.906981],[52.069099,19.907419],[52.07645,19.91301],[52.076649,19.91317],[52.0769,19.91337],[52.076969,19.913429],[52.077579,19.9139],[52.07782,19.91408],[52.07843,19.91453],[52.079029,19.91498],[52.080231,19.915899],[52.08263,19.917749],[52.083,19.91802],[52.08308,19.918079],[52.084671,19.919279],[52.08535,19.9198],[52.085579,19.919941],[52.085819,19.920059],[52.08609,19.920179],[52.086391,19.92024],[52.086731,19.920271],[52.087021,19.920231],[52.087231,19.920231],[52.087421,19.920259],[52.087471,19.920349],[52.087521,19.920389],[52.087582,19.920401],[52.08765,19.92037],[52.087688,19.920309],[52.08773,19.920231],[52.08786,19.92013],[52.088089,19.920059],[52.088181,19.92005],[52.09103,19.91968],[52.091709,19.91959],[52.092682,19.91946],[52.094219,19.919241],[52.095741,19.919029],[52.096741,19.9189],[52.09774,19.91877],[52.09972,19.918501],[52.10078,19.91835],[52.101028,19.91835],[52.101631,19.918409],[52.10215,19.91857],[52.1026,19.918779],[52.10284,19.91894],[52.103149,19.919161],[52.103401,19.91938],[52.103729,19.919701],[52.10397,19.919991],[52.104198,19.92029],[52.10445,19.920679],[52.104691,19.921129],[52.104961,19.92174],[52.105209,19.92234],[52.105961,19.924509],[52.106411,19.92577],[52.107052,19.92757],[52.107109,19.927719],[52.107231,19.928011],[52.107349,19.928221],[52.10754,19.928579],[52.107731,19.92885],[52.107929,19.929119],[52.108089,19.929279],[52.108452,19.929609],[52.10873,19.929819],[52.109039,19.929991],[52.109371,19.93012],[52.109699,19.930189],[52.111229,19.93025],[52.111641,19.930269],[52.11277,19.930321],[52.112801,19.930321],[52.114609,19.930401],[52.116451,19.93051],[52.116501,19.930519],[52.117069,19.93054],[52.11721,19.930559],[52.117699,19.930639],[52.117962,19.93071],[52.118198,19.93082],[52.118259,19.930849],[52.118629,19.931061],[52.1189,19.93124],[52.119511,19.93181],[52.119598,19.93195],[52.11964,19.93211],[52.119652,19.93228],[52.11964,19.932501],[52.11948,19.93355],[52.1194,19.934561],[52.11937,19.934799],[52.119209,19.9359],[52.11879,19.938721],[52.11866,19.939581],[52.118591,19.94043],[52.118462,19.943199],[52.11832,19.94618],[52.118279,19.947439],[52.118191,19.94982],[52.118069,19.952339],[52.118,19.95396],[52.117882,19.95689],[52.11755,19.96439],[52.117512,19.965401],[52.117512,19.96545],[52.117512,19.9655],[52.117458,19.966459],[52.11742,19.967331],[52.117371,19.968451],[52.117241,19.971201],[52.11721,19.97176],[52.11705,19.974291],[52.11705,19.974951],[52.117062,19.97537],[52.117069,19.97596],[52.11718,19.976419],[52.118179,19.980631],[52.12101,19.99221],[52.12315,20.00086],[52.124432,20.006109],[52.125622,20.010969],[52.125771,20.0116],[52.128719,20.02354],[52.13121,20.03376],[52.137619,20.05954],[52.137859,20.06052],[52.140442,20.07085],[52.14724,20.097931],[52.14912,20.105459],[52.150661,20.111549],[52.151909,20.11652],[52.15295,20.120399],[52.153191,20.12104],[52.153542,20.121799],[52.154518,20.12351],[52.155048,20.12418],[52.15556,20.12472],[52.156071,20.125191],[52.163651,20.130739],[52.16431,20.131229],[52.169559,20.13509],[52.17205,20.136921],[52.18475,20.14629],[52.185478,20.146959],[52.18557,20.147079],[52.186081,20.147791],[52.190811,20.155861],[52.195271,20.163349],[52.199051,20.169781],[52.20237,20.17544],[52.203159,20.176781],[52.21146,20.19092],[52.215248,20.197371],[52.217178,20.20079],[52.2178,20.20186],[52.218819,20.203791],[52.21891,20.204121],[52.218868,20.20435],[52.218529,20.2052],[52.21241,20.216709],[52.21188,20.21773],[52.211472,20.218559],[52.211281,20.21888],[52.210812,20.2201],[52.210548,20.22089],[52.210312,20.221519],[52.20911,20.22497],[52.20903,20.22521],[52.207981,20.228109],[52.206749,20.23156],[52.20615,20.23431],[52.206039,20.235769],[52.20602,20.237249],[52.206169,20.23875],[52.206409,20.240061],[52.20697,20.2428],[52.207569,20.24559],[52.207909,20.246861],[52.20834,20.248211],[52.20892,20.249411],[52.209549,20.250441],[52.20974,20.250799],[52.209721,20.250919],[52.20974,20.25104],[52.209789,20.251129],[52.209862,20.251181],[52.20993,20.251181],[52.209969,20.25116],[52.21006,20.2512],[52.210258,20.25141],[52.210758,20.251921],[52.210999,20.252069],[52.212631,20.253281],[52.214298,20.254391],[52.223068,20.26042],[52.22393,20.26133],[52.224411,20.26195],[52.224731,20.26248],[52.225361,20.2637],[52.22538,20.263929],[52.225479,20.264299],[52.225689,20.26482],[52.226009,20.265989],[52.226021,20.26605],[52.226261,20.267429],[52.226398,20.267891],[52.226471,20.26993],[52.226421,20.270821],[52.225651,20.27956],[52.22266,20.312559],[52.220852,20.33256],[52.220421,20.33741],[52.220032,20.34166],[52.219318,20.349609],[52.218319,20.36063],[52.217331,20.371441],[52.21656,20.37977],[52.215939,20.38644],[52.21373,20.41028],[52.2132,20.416161],[52.21209,20.42832],[52.211891,20.430229],[52.2117,20.432301],[52.209419,20.45714],[52.208721,20.46471],[52.206589,20.488091],[52.205059,20.50466],[52.20435,20.512369],[52.204269,20.51329],[52.202881,20.52837],[52.201641,20.54178],[52.201469,20.54582],[52.20039,20.571939],[52.199059,20.60359],[52.19899,20.60586],[52.19899,20.605989],[52.198978,20.60627],[52.198841,20.60903],[52.198799,20.610081],[52.198711,20.612419],[52.198582,20.61577],[52.198528,20.616989],[52.198528,20.61718],[52.198502,20.6178],[52.199001,20.61994],[52.19936,20.62149],[52.19968,20.62286],[52.199902,20.62373],[52.199982,20.62405],[52.200249,20.62512],[52.20163,20.6308],[52.20644,20.650591],[52.207199,20.653879],[52.207699,20.656031],[52.207859,20.656719],[52.208321,20.659109],[52.208889,20.66353],[52.208988,20.66445],[52.21006,20.673531],[52.2113,20.68404],[52.21133,20.684271],[52.211842,20.688919],[52.212139,20.691401],[52.21273,20.69622],[52.212811,20.701071],[52.2118,20.74048],[52.21143,20.75633],[52.211239,20.7649],[52.211151,20.76845],[52.211121,20.769911],[52.21088,20.778219],[52.210678,20.78578],[52.210579,20.788231],[52.21056,20.788971],[52.21051,20.791401],[52.210468,20.793091],[52.210419,20.794769],[52.210381,20.79623],[52.210331,20.797279],[52.210232,20.801121],[52.21014,20.804319],[52.210041,20.80776],[52.209999,20.809271],[52.209999,20.80971],[52.21003,20.81019],[52.210091,20.81061],[52.210178,20.81123],[52.211182,20.817699],[52.21244,20.82584],[52.212551,20.826891],[52.2131,20.83094],[52.213821,20.835529],[52.214272,20.83843],[52.214321,20.838869],[52.214359,20.839069],[52.214451,20.83972],[52.214741,20.841749],[52.21489,20.843809],[52.21524,20.84981],[52.215832,20.859699],[52.215839,20.85993],[52.2159,20.861],[52.215961,20.861971],[52.216,20.8626],[52.216141,20.86487],[52.216148,20.86503],[52.21632,20.86783],[52.216351,20.86927],[52.21637,20.871429],[52.216381,20.873899],[52.216389,20.874929],[52.216381,20.877769],[52.216381,20.880011],[52.21637,20.88043],[52.216381,20.885969],[52.216389,20.8887],[52.216381,20.89061],[52.216358,20.89253],[52.21637,20.89607],[52.216389,20.896629],[52.216431,20.89715],[52.21648,20.89769],[52.216572,20.89847],[52.21677,20.90044],[52.216808,20.90089],[52.216869,20.90147],[52.21693,20.90193],[52.217159,20.904011],[52.217209,20.90428],[52.217579,20.906019],[52.218021,20.90799],[52.218342,20.90933],[52.218399,20.90958],[52.218559,20.910271],[52.219501,20.914419],[52.219879,20.91584],[52.219921,20.91605],[52.219971,20.91625],[52.220039,20.91663],[52.220539,20.91868],[52.221008,20.92062],[52.221161,20.921289],[52.22171,20.92355],[52.221939,20.92453],[52.22208,20.925131],[52.2225,20.926991],[52.222778,20.9282],[52.22319,20.929831],[52.22324,20.930031],[52.223289,20.93021],[52.223671,20.93152],[52.223881,20.93219],[52.224041,20.932739],[52.224998,20.93623],[52.22514,20.93675],[52.225189,20.93696],[52.22562,20.93853],[52.225719,20.939369],[52.225761,20.939659],[52.225788,20.940701],[52.225868,20.941589],[52.22588,20.94166],[52.225929,20.94198],[52.226311,20.94463],[52.226921,20.948071],[52.22739,20.951281],[52.227451,20.95166],[52.227482,20.95199],[52.227638,20.95425],[52.22773,20.95582],[52.22773,20.956141],[52.227692,20.956659],[52.227692,20.95694],[52.227539,20.95694],[52.226009,20.95731],[52.225349,20.957581],[52.2243,20.957781],[52.22422,20.957821],[52.22353,20.957991],[52.22324,20.95809],[52.22245,20.95833],[52.222252,20.95842],[52.222012,20.95859],[52.22086,20.95952],[52.220581,20.95965],[52.22002,20.95978],[52.21814,20.959909],[52.217659,20.95998],[52.216461,20.9606],[52.216331,20.96073],[52.21619,20.96109],[52.216179,20.961399],[52.216221,20.96166],[52.216572,20.962601],[52.21703,20.963711],[52.21759,20.96524],[52.219391,20.970369],[52.219479,20.97084],[52.219479,20.971251],[52.219471,20.971371],[52.21946,20.97147],[52.218948,20.972969],[52.218861,20.973249],[52.21875,20.973551],[52.217621,20.976971],[52.217541,20.977221],[52.217461,20.977461],[52.2164,20.980619],[52.216301,20.980909],[52.21624,20.98107],[52.216228,20.9811],[52.216179,20.981239],[52.21611,20.981449],[52.216042,20.981649],[52.215981,20.981911],[52.215961,20.982149],[52.215969,20.98246],[52.215981,20.982679],[52.216042,20.983801],[52.216061,20.9842],[52.216091,20.98497],[52.216221,20.987],[52.216228,20.98728],[52.216221,20.987591],[52.216209,20.98782],[52.21619,20.98806],[52.216179,20.98838],[52.216179,20.98884],[52.216259,20.989929],[52.21627,20.990259],[52.21632,20.99095],[52.216511,20.99444],[52.216801,20.999901],[52.21682,21.000429],[52.217121,21.004539],[52.21719,21.00563],[52.21727,21.00716],[52.217281,21.00845],[52.217209,21.01022],[52.217159,21.01169],[52.216999,21.01438],[52.216999,21.0149],[52.21703,21.015421],[52.217079,21.01594],[52.217171,21.01647],[52.217449,21.0177],[52.21759,21.01844],[52.21767,21.018801],[52.217861,21.019581],[52.21793,21.01984],[52.218399,21.021761],[52.219059,21.024469],[52.219372,21.02578],[52.219742,21.027309],[52.21994,21.0282],[52.220669,21.03112],[52.221458,21.034109],[52.222229,21.037251],[52.22266,21.03857],[52.223,21.03944],[52.223148,21.039841],[52.223301,21.040211],[52.223511,21.040739],[52.223701,21.04143],[52.223789,21.04184],[52.22403,21.0431],[52.22443,21.045059],[52.225712,21.05121],[52.22612,21.053249],[52.226509,21.055201],[52.22686,21.056789],[52.2271,21.057699],[52.228149,21.061621],[52.228378,21.06255],[52.228901,21.06455],[52.229111,21.065319],[52.229401,21.0665],[52.229889,21.06831],[52.23035,21.07052],[52.230652,21.07151],[52.230831,21.07196],[52.23233,21.074381],[52.233021,21.07556],[52.235081,21.078911],[52.235271,21.079479],[52.235401,21.0802],[52.23547,21.080629],[52.235531,21.081091],[52.235661,21.08217],[52.235889,21.08399],[52.236061,21.08552],[52.236099,21.08663],[52.236099,21.08683],[52.236038,21.087641],[52.235958,21.088421],[52.235771,21.089439],[52.2351,21.093491],[52.234951,21.09482],[52.234871,21.095501],[52.23468,21.097151],[52.234661,21.09741],[52.234631,21.097679],[52.23444,21.099489],[52.23436,21.10021],[52.2342,21.101629],[52.233971,21.10355],[52.23386,21.10463],[52.233768,21.10532],[52.233459,21.10816],[52.233349,21.109051],[52.233059,21.111691],[52.232899,21.113239],[52.232861,21.11352],[52.232681,21.115021],[52.232571,21.116529],[52.232521,21.118191],[52.232521,21.11837],[52.23251,21.118799],[52.232571,21.12027],[52.23259,21.121389],[52.232601,21.12254],[52.23262,21.12421],[52.232639,21.125429],[52.232639,21.126711],[52.232658,21.12788],[52.232651,21.12854],[52.232639,21.129089],[52.232559,21.12974],[52.23243,21.130461],[52.23225,21.131069],[52.23201,21.13171],[52.231602,21.13269],[52.230782,21.134729],[52.23003,21.136499],[52.22971,21.137251],[52.22934,21.138109],[52.22908,21.138691],[52.228691,21.13958],[52.2286,21.139799],[52.228352,21.140369],[52.228039,21.14101],[52.22784,21.14147],[52.227188,21.142929],[52.226871,21.143669],[52.226669,21.14419],[52.226551,21.144661],[52.22644,21.145149],[52.226372,21.14566],[52.226341,21.146231],[52.22628,21.148359],[52.22628,21.14887],[52.226231,21.14978],[52.226181,21.15131],[52.226158,21.152491],[52.22612,21.15346],[52.226101,21.153851],[52.226059,21.15535],[52.225922,21.158939],[52.225891,21.15937],[52.225819,21.161421],[52.225689,21.165609],[52.22551,21.17029],[52.225189,21.17864],[52.224819,21.18928],[52.224529,21.196859],[52.224491,21.198009],[52.22427,21.20554],[52.224072,21.21101],[52.223911,21.21578],[52.223782,21.219891],[52.22369,21.22279],[52.223679,21.22303],[52.223671,21.223289],[52.223629,21.22451],[52.223469,21.229271],[52.223381,21.230721],[52.223301,21.23295],[52.223259,21.23402],[52.22324,21.235041],[52.223179,21.23679],[52.22316,21.237249],[52.223049,21.23951],[52.22303,21.240021],[52.22295,21.243151],[52.222832,21.24703],[52.22274,21.24946],[52.22271,21.24983],[52.222691,21.249929],[52.222679,21.25062],[52.222511,21.255859],[52.222351,21.26104],[52.222309,21.26218],[52.22221,21.26466],[52.222179,21.26539],[52.222149,21.266211],[52.22208,21.267851],[52.22205,21.26918],[52.222038,21.26963],[52.222031,21.26977],[52.222,21.27087],[52.221771,21.277281],[52.2215,21.284731],[52.221481,21.28517],[52.221371,21.287571],[52.221321,21.288719],[52.22113,21.2906],[52.220459,21.293631],[52.219471,21.298019],[52.218601,21.301941],[52.21851,21.302389],[52.21767,21.306379],[52.216961,21.30962],[52.216648,21.311029],[52.215851,21.314739],[52.215611,21.315929],[52.215149,21.3183],[52.213772,21.32457],[52.21249,21.33049],[52.21233,21.331261],[52.211109,21.337],[52.210251,21.34096],[52.209511,21.34437],[52.207809,21.35216],[52.206211,21.35932],[52.20467,21.366529],[52.203072,21.374001],[52.202629,21.377239],[52.202209,21.380011],[52.202202,21.380091],[52.201889,21.38555],[52.201691,21.389219],[52.201439,21.3937],[52.201118,21.401541],[52.200611,21.410839],[52.200291,21.41663],[52.200119,21.42065],[52.199989,21.42417],[52.19978,21.427259],[52.199459,21.43342],[52.19923,21.43766],[52.199169,21.439381],[52.1992,21.44058],[52.1992,21.44236],[52.19923,21.443769],[52.199299,21.446381],[52.199429,21.44973],[52.199451,21.450439],[52.19952,21.452971],[52.19965,21.45809],[52.199871,21.46624],[52.20023,21.475121],[52.20052,21.484421],[52.20063,21.48831],[52.200581,21.490219],[52.200359,21.492001],[52.19994,21.49367],[52.198551,21.49864],[52.19664,21.505899],[52.194981,21.51228],[52.193371,21.51828],[52.192188,21.522989],[52.19175,21.52454],[52.190979,21.527349],[52.190819,21.527321],[52.190689,21.52746],[52.19062,21.527731],[52.19067,21.527941],[52.1908,21.528099],[52.190659,21.52861],[52.190048,21.530781],[52.18895,21.534809],[52.188709,21.53578],[52.188171,21.537849],[52.187778,21.539431],[52.18734,21.540939],[52.187061,21.54196],[52.18692,21.54249],[52.186329,21.544649],[52.18631,21.54475],[52.185612,21.54744],[52.185341,21.54867],[52.18454,21.55163],[52.184219,21.55286],[52.18388,21.55415],[52.183281,21.556311],[52.182911,21.55773],[52.182652,21.55871],[52.18248,21.55938],[52.181751,21.56234],[52.181149,21.564791],[52.18074,21.566441],[52.180698,21.56658],[52.180592,21.566999],[52.18029,21.568159],[52.179909,21.5697],[52.179588,21.571011],[52.179539,21.571159],[52.179329,21.57198],[52.179031,21.57312],[52.17873,21.574301],[52.178398,21.575541],[52.178059,21.57678],[52.178082,21.577339],[52.178169,21.580919],[52.178242,21.58276],[52.178291,21.58411],[52.178299,21.58423],[52.178421,21.589001],[52.178619,21.59437],[52.178791,21.59881],[52.17915,21.609301],[52.17923,21.611561],[52.179581,21.62187],[52.17976,21.626841],[52.18013,21.629681],[52.180229,21.630461],[52.182049,21.644159],[52.183769,21.64847],[52.184509,21.65386],[52.188019,21.68083],[52.192032,21.710409],[52.192532,21.723101],[52.195358,21.743959],[52.20295,21.80003],[52.203152,21.80052],[52.20396,21.802349],[52.206169,21.80718],[52.206692,21.808411],[52.208061,21.81164],[52.208801,21.813181],[52.209278,21.81419],[52.209461,21.81456],[52.210251,21.816771],[52.2104,21.81769],[52.210442,21.820499],[52.210419,21.82181],[52.210251,21.832239],[52.209831,21.861191],[52.209389,21.886351],[52.20929,21.89757],[52.208271,21.907749],[52.20443,21.94763],[52.203869,21.953699],[52.20055,21.98842],[52.197842,22.01725],[52.196651,22.0296],[52.196602,22.0301],[52.195881,22.03702],[52.19558,22.04031],[52.195709,22.042641],[52.197639,22.05447],[52.197762,22.055639],[52.197701,22.05674],[52.197571,22.057659],[52.196949,22.06188],[52.196949,22.061899],[52.19656,22.06428],[52.195641,22.069839],[52.19046,22.100559],[52.18803,22.11499],[52.187031,22.12093],[52.186642,22.123289],[52.184971,22.13299],[52.183868,22.140181],[52.18354,22.14233],[52.18045,22.16251],[52.18042,22.16272],[52.179218,22.170521],[52.178082,22.17807],[52.177551,22.18157],[52.17654,22.188499],[52.176029,22.191971],[52.175301,22.19693],[52.1745,22.202379],[52.173512,22.20912],[52.173241,22.21105],[52.172321,22.217211],[52.172031,22.21862],[52.171841,22.219561],[52.171371,22.221001],[52.171101,22.221569],[52.1707,22.2222],[52.170269,22.222759],[52.169971,22.223061],[52.169651,22.22337],[52.168919,22.223761],[52.16806,22.22397],[52.157452,22.223801],[52.149818,22.223669],[52.149181,22.223841],[52.148411,22.22414],[52.14703,22.225031],[52.145828,22.22603],[52.145191,22.226721],[52.14463,22.22753],[52.14407,22.228821],[52.143768,22.22994],[52.143559,22.23114],[52.143471,22.232981],[52.14365,22.236931],[52.14365,22.24024],[52.14352,22.242979],[52.143341,22.245081],[52.1427,22.24972],[52.14188,22.254181],[52.14146,22.256161],[52.141121,22.25769],[52.1409,22.25869],[52.14072,22.259331],[52.140381,22.26058],[52.13974,22.26259],[52.138321,22.266199],[52.137569,22.26819],[52.137032,22.26984],[52.136089,22.273109],[52.13562,22.275169],[52.13472,22.28014],[52.1339,22.284821],[52.133598,22.28676],[52.132912,22.29147],[52.13261,22.29401],[52.132191,22.29804],[52.131882,22.302031],[52.13163,22.307911],[52.13158,22.309839],[52.13158,22.315981],[52.131672,22.318979],[52.131882,22.323021],[52.132011,22.325979],[52.132011,22.327101],[52.131931,22.328251],[52.131882,22.328659],[52.131802,22.329201],[52.131672,22.32984],[52.131241,22.331301],[52.130268,22.33366],[52.1297,22.335079],[52.128479,22.338051],[52.1273,22.34091],[52.12524,22.34581],[52.124432,22.34767],[52.122318,22.35253],[52.122181,22.352859],[52.120171,22.35787],[52.11734,22.364731],[52.114368,22.371731],[52.112019,22.377439],[52.108501,22.385799],[52.105831,22.3922],[52.103809,22.39706],[52.102531,22.400141],[52.09618,22.415409],[52.0909,22.42794],[52.090092,22.43022],[52.08979,22.432711],[52.089741,22.43593],[52.089531,22.43782],[52.08934,22.4384],[52.08786,22.44297],[52.086208,22.45097],[52.08498,22.457041],[52.08387,22.46246],[52.083172,22.466141],[52.08202,22.476231],[52.081631,22.479191],[52.08065,22.482149],[52.0779,22.48863],[52.076649,22.49193],[52.074421,22.5],[52.072891,22.505619],[52.071678,22.51009],[52.06942,22.51827],[52.069012,22.51996],[52.06884,22.5236],[52.068878,22.526569],[52.068501,22.5291],[52.066872,22.534929],[52.06464,22.5427],[52.06356,22.54652],[52.063011,22.550079],[52.062531,22.55407],[52.061378,22.563471],[52.059921,22.57184],[52.059441,22.574579],[52.057259,22.58708],[52.057041,22.589569],[52.056999,22.591801],[52.057301,22.59729],[52.057678,22.608959],[52.05785,22.614059],[52.057991,22.618019],[52.058109,22.622311],[52.05743,22.62789],[52.055672,22.63789],[52.053139,22.652349],[52.050991,22.664709],[52.050049,22.67042],[52.049622,22.67214],[52.048592,22.67454],[52.045151,22.68055],[52.039101,22.691231],[52.03442,22.699511],[52.029881,22.707371],[52.02383,22.71763],[52.019051,22.72547],[52.015331,22.73226],[52.007431,22.74612],[52.0047,22.75083],[52.00449,22.75119],[52.004169,22.75172],[52.003368,22.753139],[52.002972,22.75382],[52.00243,22.75474],[52.001228,22.756901],[52.00069,22.75861],[52.000469,22.759689],[52.000408,22.76021],[52.000332,22.76083],[52.000301,22.763399],[52.00029,22.764009],[52.00029,22.76417],[52.00029,22.76475],[52.000259,22.766911],[52.000271,22.767811],[52.00029,22.7693],[52.000271,22.77309],[52.000092,22.78389],[51.999699,22.81146],[51.999771,22.813219],[51.999809,22.813709],[51.999969,22.814501],[52.000389,22.815821],[52.001049,22.817221],[52.002491,22.819941],[52.019131,22.850771],[52.02018,22.85272],[52.026829,22.86499],[52.027561,22.86714],[52.027748,22.86878],[52.02803,22.87328],[52.02816,22.876579],[52.028591,22.880751],[52.034531,22.91885],[52.036671,22.9328],[52.038502,22.94478],[52.038651,22.94701],[52.03661,22.99505],[52.034679,23.03936],[52.034382,23.04616],[52.033852,23.060539],[52.033821,23.06105],[52.033779,23.061331],[52.033741,23.06406],[52.033779,23.06502],[52.033932,23.066481],[52.03397,23.06702],[52.034039,23.06745],[52.03413,23.068199],[52.034382,23.069441],[52.034851,23.07103],[52.035332,23.072411],[52.035728,23.073481],[52.035858,23.07374],[52.035912,23.07374],[52.037621,23.077749],[52.038502,23.07987],[52.042339,23.08906],[52.045219,23.09586],[52.047531,23.10133],[52.049171,23.10528],[52.049759,23.107201],[52.05061,23.10993],[52.05101,23.11146],[52.05143,23.1134],[52.051769,23.115351],[52.052139,23.118019],[52.05233,23.120081],[52.052441,23.12163],[52.05254,23.1243],[52.05249,23.126431],[52.05241,23.128111],[52.05225,23.13044],[52.052052,23.132139],[52.051689,23.134399],[52.05138,23.136129],[52.051079,23.137541],[52.05014,23.14085],[52.049431,23.14304],[52.046921,23.149401],[52.046329,23.150881],[52.046249,23.151091],[52.041649,23.16205],[52.04108,23.16349],[52.040989,23.163771],[52.040878,23.16407],[52.040722,23.16494],[52.040668,23.165991],[52.040699,23.166901],[52.040852,23.16884],[52.04092,23.17067],[52.040909,23.170799],[52.040352,23.17984],[52.040001,23.184799],[52.039848,23.18705],[52.03894,23.19945],[52.038151,23.211281],[52.037041,23.226919],[52.036201,23.23984],[52.035629,23.247259],[52.035198,23.254669],[52.034111,23.268709],[52.034019,23.270809],[52.0341,23.278021],[52.034279,23.285179],[52.03437,23.289591],[52.034679,23.30765],[52.03487,23.319969],[52.03503,23.33103],[52.035431,23.352261],[52.035568,23.36269],[52.035751,23.37554],[52.036121,23.39966],[52.03648,23.423731],[52.03669,23.44198],[52.037102,23.471069],[52.056198,23.47821],[52.057281,23.479031],[52.062019,23.48612],[52.06966,23.497549],[52.07505,23.50531],[52.074341,23.506451],[52.074478,23.507071],[52.075321,23.508471],[52.076199,23.51207],[52.077019,23.517269],[52.078541,23.523121],[52.079208,23.52372],[52.080021,23.527479],[52.080372,23.52845],[52.080971,23.52993],[52.08247,23.531771],[52.097488,23.550831],[52.100391,23.55324],[52.115749,23.565399],[52.116249,23.565861],[52.116879,23.566429],[52.119869,23.56897],[52.12009,23.569189],[52.121159,23.570431],[52.1236,23.573311],[52.123859,23.57374],[52.124371,23.57469],[52.124889,23.57572],[52.125641,23.577629],[52.12632,23.580099],[52.128811,23.59057],[52.135269,23.61853],[52.136452,23.62384],[52.137909,23.62999],[52.139091,23.63512],[52.140079,23.63932],[52.143768,23.6551],[52.148842,23.67742],[52.150139,23.68292],[52.15052,23.68453],[52.15115,23.687281],[52.151402,23.68865],[52.151531,23.68964],[52.151569,23.69029],[52.151539,23.6905],[52.151482,23.69071],[52.151371,23.69096],[52.151291,23.69117],[52.151199,23.691401],[52.15115,23.69166],[52.15118,23.69203],[52.15126,23.69227],[52.151371,23.69243],[52.15147,23.69253],[52.151539,23.69256],[52.151619,23.692869],[52.151661,23.69306],[52.151661,23.693319],[52.151409,23.69803],[52.15023,23.716619],[52.149399,23.72999],[52.149052,23.73517],[52.148842,23.736971],[52.148689,23.73807],[52.14843,23.739651],[52.147911,23.741989],[52.14674,23.74641],[52.145618,23.750441],[52.14502,23.75275],[52.143379,23.758739],[52.140732,23.768591],[52.13792,23.778919],[52.134338,23.792219],[52.133091,23.796761],[52.13205,23.80051],[52.131889,23.80109],[52.131039,23.803761],[52.13002,23.807489],[52.12822,23.81422],[52.127369,23.81785],[52.125999,23.823071],[52.125622,23.824289],[52.125111,23.82625],[52.124451,23.82873],[52.123501,23.83223],[52.122688,23.83518],[52.119701,23.846319],[52.119282,23.84778],[52.11903,23.84841],[52.118832,23.848749],[52.11869,23.84897],[52.118542,23.84914],[52.117519,23.849951],[52.115879,23.85117],[52.1157,23.85137],[52.11554,23.85165],[52.115459,23.85203],[52.11549,23.852341],[52.11557,23.852631],[52.115791,23.85289],[52.116161,23.85309],[52.11647,23.85318],[52.116699,23.85335],[52.116909,23.853609],[52.11705,23.85391],[52.117249,23.85433],[52.117489,23.85548],[52.118221,23.859249],[52.119019,23.863449],[52.120411,23.870689],[52.122372,23.880699],[52.123039,23.88419],[52.12328,23.88542],[52.123749,23.887831],[52.124321,23.89076],[52.124779,23.893221],[52.125229,23.895611],[52.125561,23.897301],[52.126678,23.902849],[52.127029,23.904711],[52.128262,23.91103],[52.129269,23.91626],[52.132622,23.933611],[52.13448,23.94289],[52.136089,23.951241],[52.136509,23.953409],[52.142052,23.98245],[52.146332,24.00466],[52.150719,24.02721],[52.15287,24.038589],[52.153019,24.03994],[52.153469,24.04154],[52.156288,24.056391],[52.156681,24.058439],[52.161079,24.08123],[52.162399,24.089331],[52.174301,24.15033],[52.17466,24.152189],[52.174889,24.153469],[52.175442,24.15617],[52.18956,24.230101],[52.196079,24.264339],[52.199089,24.28031],[52.19923,24.281],[52.19944,24.282619],[52.199551,24.28367],[52.199581,24.284281],[52.199612,24.284599],[52.19965,24.28643],[52.199619,24.288059],[52.19957,24.28903],[52.199471,24.290131],[52.19928,24.291771],[52.199009,24.293159],[52.198792,24.29434],[52.198509,24.29549],[52.197891,24.297371],[52.197289,24.29891],[52.196892,24.29986],[52.196411,24.300791],[52.195591,24.302271],[52.188881,24.313999],[52.183769,24.323021],[52.183262,24.324051],[52.182659,24.32563],[52.181591,24.328341],[52.181141,24.32947],[52.179619,24.33334],[52.178951,24.33515],[52.178391,24.337999],[52.178268,24.339239],[52.17823,24.340731],[52.17831,24.34374],[52.179089,24.34906],[52.183552,24.378071],[52.183861,24.38007],[52.18441,24.38382],[52.18655,24.39747],[52.186989,24.399099],[52.187328,24.400299],[52.187931,24.40176],[52.18853,24.40288],[52.189732,24.40468],[52.20063,24.41729],[52.20261,24.4191],[52.204411,24.42038],[52.206039,24.42116],[52.211021,24.422621],[52.212681,24.42293],[52.214001,24.42318],[52.215591,24.42333],[52.217979,24.423161],[52.2192,24.42297],[52.22105,24.422831],[52.222321,24.42293],[52.22385,24.423321],[52.225868,24.42404],[52.228271,24.425619],[52.230419,24.427509],[52.231529,24.428801],[52.232738,24.430429],[52.233681,24.43189],[52.235142,24.434719],[52.23634,24.437719],[52.241661,24.452061],[52.242008,24.453091],[52.253422,24.4839],[52.26458,24.51351],[52.268871,24.525961],[52.269901,24.529051],[52.271702,24.53377],[52.28355,24.560369],[52.285519,24.564409],[52.287491,24.567841],[52.292042,24.574789],[52.306461,24.59617],[52.30748,24.59763],[52.30904,24.599939],[52.319759,24.616079],[52.32431,24.622601],[52.330669,24.632299],[52.33255,24.635481],[52.335209,24.64028],[52.337109,24.64397],[52.342079,24.654699],[52.343632,24.65839],[52.345772,24.66363],[52.349812,24.673929],[52.350559,24.676041],[52.35154,24.67881],[52.353062,24.68375],[52.354408,24.688789],[52.357021,24.69972],[52.35873,24.707319],[52.362679,24.72423],[52.363628,24.72757],[52.364658,24.730659],[52.367229,24.736759],[52.368778,24.739759],[52.373501,24.74791],[52.38131,24.761391],[52.383621,24.765249],[52.388451,24.773621],[52.38855,24.77379],[52.39101,24.77809],[52.393539,24.78227],[52.3965,24.78685],[52.41954,24.822229],[52.422569,24.827021],[52.424461,24.830351],[52.426479,24.834499],[52.427849,24.83754],[52.429131,24.840481],[52.430511,24.84441],[52.4314,24.8477],[52.441212,24.883829],[52.44294,24.88942],[52.443958,24.89241],[52.445389,24.896049],[52.44688,24.89949],[52.448021,24.90184],[52.449162,24.904119],[52.451,24.907551],[52.453011,24.910851],[52.455921,24.9151],[52.461411,24.922119],[52.467789,24.93049],[52.470421,24.934071],[52.473919,24.93903],[52.476212,24.942381],[52.479328,24.947491],[52.482948,24.95442],[52.48391,24.956329],[52.48698,24.96279],[52.48798,24.964991],[52.48925,24.967751],[52.490189,24.96986],[52.492401,24.97484],[52.492649,24.975401],[52.49403,24.978621],[52.49469,24.980169],[52.496922,24.98489],[52.498718,24.988501],[52.519588,25.0278],[52.520592,25.02973],[52.521301,25.031099],[52.52507,25.03837],[52.527649,25.04274],[52.52961,25.0455],[52.53075,25.046949],[52.53273,25.04933],[52.534431,25.051411],[52.5364,25.053301],[52.539749,25.056129],[52.541809,25.05759],[52.545658,25.059971],[52.547218,25.06094],[52.54744,25.061069],[52.549191,25.062229],[52.55151,25.064199],[52.551819,25.064489],[52.553219,25.06583],[52.553829,25.066351],[52.555779,25.068609],[52.558262,25.0716],[52.560169,25.07407],[52.561642,25.076389],[52.563782,25.07999],[52.56601,25.084459],[52.567131,25.08695],[52.568508,25.090639],[52.572731,25.10277],[52.57513,25.109541],[52.57803,25.11776],[52.579449,25.12146],[52.580349,25.1236],[52.582748,25.128571],[52.585499,25.1339],[52.587391,25.13707],[52.603531,25.16132],[52.60696,25.16728],[52.619831,25.19175],[52.62933,25.20981],[52.638729,25.2279],[52.642921,25.235781],[52.646118,25.24214],[52.648548,25.247339],[52.650021,25.250879],[52.65147,25.254431],[52.655708,25.26573],[52.657131,25.26956],[52.663799,25.28743],[52.670471,25.305389],[52.67519,25.317829],[52.676392,25.32058],[52.677589,25.323071],[52.678539,25.324949],[52.685322,25.33684],[52.686031,25.338091],[52.686932,25.33967],[52.690979,25.34693],[52.694809,25.35368],[52.696079,25.356079],[52.69733,25.35858],[52.698761,25.36157],[52.6996,25.363581],[52.701019,25.366541],[52.701279,25.3671],[52.705292,25.375839],[52.7066,25.37879],[52.70787,25.38176],[52.708672,25.383801],[52.709251,25.385441],[52.709419,25.38592],[52.709709,25.38682],[52.710079,25.388],[52.711231,25.392071],[52.716991,25.4137],[52.7183,25.418739],[52.720131,25.42551],[52.721111,25.428499],[52.739941,25.479],[52.741951,25.48362],[52.744061,25.487761],[52.746841,25.49316],[52.751289,25.501659],[52.755569,25.509899],[52.759911,25.518129],[52.764179,25.526369],[52.766369,25.530569],[52.768459,25.534611],[52.771091,25.53908],[52.77211,25.540621],[52.774021,25.54327],[52.775429,25.545059],[52.776859,25.546721],[52.779099,25.549101],[52.782619,25.552271],[52.783932,25.5534],[52.792992,25.56155],[52.80965,25.57682],[52.814861,25.581841],[52.819981,25.586889],[52.82056,25.58742],[52.823421,25.59034],[52.82497,25.59215],[52.82642,25.59403],[52.827709,25.59584],[52.829689,25.59893],[52.831699,25.6026],[52.848228,25.63558],[52.84856,25.636141],[52.851398,25.64073],[52.85294,25.64296],[52.854359,25.64463],[52.85601,25.64657],[52.856602,25.647209],[52.85952,25.65036],[52.862049,25.652399],[52.86385,25.65369],[52.87775,25.66201],[52.87981,25.66321],[52.909302,25.680429],[52.915451,25.684071],[52.91869,25.686131],[52.92049,25.68742],[52.922901,25.68939],[52.924961,25.69128],[52.942982,25.70956],[52.96899,25.73591],[52.97192,25.73875],[52.972931,25.73988],[52.974899,25.741449],[52.977322,25.743719],[52.979759,25.74596],[52.99173,25.756599],[52.995258,25.760201],[53.016541,25.78355],[53.019798,25.787149],[53.022121,25.7899],[53.023918,25.792471],[53.025719,25.795219],[53.027699,25.798651],[53.0289,25.80097],[53.03817,25.820801],[53.04126,25.827749],[53.04269,25.8312],[53.046341,25.83993],[53.048012,25.843889],[53.050179,25.84898],[53.05201,25.85334],[53.052311,25.85404],[53.05312,25.85597],[53.053879,25.857531],[53.05418,25.85813],[53.05508,25.85981],[53.055511,25.86055],[53.055969,25.861361],[53.057049,25.86311],[53.05798,25.8645],[53.058998,25.865959],[53.062111,25.870159],[53.065109,25.8743],[53.066399,25.87586],[53.067471,25.877171],[53.068508,25.878229],[53.07008,25.87978],[53.071529,25.88101],[53.072281,25.88184],[53.073898,25.88307],[53.075279,25.88385],[53.077129,25.88483],[53.079182,25.88578],[53.080479,25.8862],[53.083389,25.88695],[53.085979,25.8874],[53.087601,25.88747],[53.089241,25.8874],[53.09404,25.886721],[53.0961,25.886629],[53.096451,25.886629],[53.09988,25.88706],[53.102112,25.887569],[53.103748,25.88818],[53.105808,25.88912],[53.108028,25.89032],[53.112411,25.89315],[53.115761,25.895639],[53.119362,25.898821],[53.121681,25.90131],[53.123829,25.903879],[53.126228,25.907141],[53.132069,25.916241],[53.13332,25.918301],[53.13414,25.91993],[53.134918,25.92161],[53.135571,25.92318],[53.1362,25.92485],[53.13686,25.926741],[53.137531,25.92907],[53.13768,25.929621],[53.138199,25.93149],[53.143181,25.94968],[53.14468,25.955219],[53.145969,25.959669],[53.147171,25.96319],[53.148121,25.96542],[53.149151,25.967569],[53.150089,25.96937],[53.151649,25.971849],[53.15337,25.974279],[53.155159,25.97641],[53.157219,25.97847],[53.15992,25.981119],[53.1605,25.98172],[53.161949,25.983271],[53.162571,25.983999],[53.163448,25.985069],[53.16431,25.986231],[53.164928,25.98716],[53.165539,25.988171],[53.166439,25.989811],[53.167469,25.99184],[53.168159,25.993349],[53.169361,25.996111],[53.170769,25.99935],[53.172871,26.004181],[53.17337,26.005409],[53.17395,26.006849],[53.17477,26.00901],[53.175369,26.010719],[53.176022,26.012739],[53.177299,26.01713],[53.178398,26.020969],[53.17889,26.022751],[53.17992,26.02721],[53.18042,26.03027],[53.180641,26.031981],[53.180962,26.03536],[53.18111,26.03808],[53.18124,26.04175],[53.181339,26.044069],[53.181412,26.045179],[53.181511,26.04649],[53.181641,26.047819],[53.181862,26.049601],[53.182152,26.0516],[53.18261,26.05405],[53.183041,26.056061],[53.183689,26.05863],[53.184799,26.06218],[53.185841,26.06506],[53.186329,26.06621],[53.18679,26.067221],[53.18766,26.06904],[53.190399,26.073931],[53.191769,26.076349],[53.19278,26.078159],[53.193851,26.08016],[53.194691,26.08189],[53.195339,26.08326],[53.199032,26.09133],[53.202541,26.098961],[53.205929,26.106091],[53.20739,26.10952],[53.208809,26.113569],[53.2094,26.115471],[53.210152,26.118019],[53.21088,26.120831],[53.211411,26.12294],[53.214512,26.135269],[53.21537,26.138359],[53.216911,26.14283],[53.218201,26.146351],[53.220181,26.150721],[53.221458,26.15321],[53.222752,26.155701],[53.225071,26.159559],[53.231251,26.16943],[53.233479,26.17347],[53.235538,26.177759],[53.238289,26.184879],[53.25219,26.22514],[53.252789,26.2272],[53.254162,26.231581],[53.256481,26.24033],[53.265919,26.283159],[53.266911,26.28706],[53.26712,26.28784],[53.267841,26.290371],[53.268761,26.293369],[53.26973,26.29624],[53.270748,26.29887],[53.271671,26.301069],[53.27219,26.302299],[53.284641,26.32745],[53.286011,26.33037],[53.287338,26.33342],[53.289612,26.33955],[53.298111,26.368389],[53.2994,26.37191],[53.300369,26.374399],[53.301029,26.37586],[53.303261,26.380489],[53.304722,26.38315],[53.306862,26.386669],[53.32317,26.41036],[53.327122,26.41663],[53.333561,26.42787],[53.34557,26.44907],[53.353561,26.46315],[53.36377,26.481091],[53.38026,26.5079],[53.382992,26.512329],[53.384769,26.51553],[53.385658,26.51713],[53.388828,26.52306],[53.403172,26.549919],[53.410461,26.5634],[53.41235,26.56649],[53.413979,26.56889],[53.416801,26.57254],[53.419128,26.575069],[53.421341,26.57732],[53.42445,26.57979],[53.444881,26.594299],[53.445061,26.594469],[53.448471,26.597139],[53.450371,26.598591],[53.454659,26.60228],[53.47768,26.625601],[53.478031,26.62594],[53.478981,26.626881],[53.485222,26.633181],[53.488049,26.63652],[53.489861,26.63876],[53.492352,26.642191],[53.494888,26.646099],[53.508911,26.67008],[53.509418,26.67103],[53.511311,26.674629],[53.512939,26.678129],[53.514229,26.68124],[53.515598,26.68502],[53.51675,26.68894],[53.52256,26.710939],[53.525829,26.724689],[53.52702,26.72982],[53.528221,26.73597],[53.52869,26.738371],[53.529221,26.74115],[53.529961,26.745029],[53.530151,26.745899],[53.532902,26.76289],[53.533401,26.76598],[53.535519,26.779091],[53.536121,26.78458],[53.536461,26.789391],[53.53664,26.79497],[53.53664,26.7978],[53.536251,26.805441],[53.53595,26.80879],[53.535339,26.813669],[53.534401,26.819],[53.534229,26.819771],[53.530708,26.83737],[53.530209,26.83996],[53.52985,26.8426],[53.52951,26.84527],[53.529251,26.849039],[53.529171,26.852131],[53.529289,26.856291],[53.529591,26.86054],[53.530048,26.86355],[53.530369,26.86561],[53.53059,26.86692],[53.531738,26.872299],[53.536381,26.8929],[53.538391,26.90213],[53.543839,26.9268],[53.551048,26.95891],[53.551739,26.961479],[53.552341,26.963369],[53.55397,26.96689],[53.556889,26.9729],[53.569759,26.99976],[53.584961,27.03109],[53.588219,27.037609],[53.58942,27.03907],[53.590111,27.039761],[53.59095,27.040529],[53.592159,27.04105],[53.595341,27.04215],[53.595509,27.04221],[53.598179,27.043249],[53.60865,27.047779],[53.61459,27.050211],[53.619888,27.05237],[53.625561,27.05632],[53.642429,27.06823],[53.649181,27.073],[53.650631,27.074301],[53.651821,27.07575],[53.652611,27.076799],[53.654018,27.0788],[53.655418,27.08147],[53.656712,27.08456],[53.65757,27.087391],[53.65834,27.090401],[53.659031,27.095289],[53.659199,27.097521],[53.65937,27.11211],[53.659458,27.11709],[53.65971,27.12756],[53.660141,27.132629],[53.661091,27.137951],[53.661598,27.14044],[53.663151,27.14567],[53.666531,27.155149],[53.674389,27.17734],[53.675251,27.1798],[53.675869,27.182501],[53.676491,27.18531],[53.67712,27.189251],[53.677551,27.19454],[53.67757,27.19717],[53.677399,27.20146],[53.676708,27.20841],[53.676109,27.216311],[53.675758,27.223089],[53.675591,27.230471],[53.675758,27.243179],[53.676022,27.247549],[53.676449,27.25416],[53.676971,27.26008],[53.678001,27.267981],[53.679451,27.277531],[53.685551,27.31776],[53.686409,27.32394],[53.688721,27.340521],[53.691151,27.358589],[53.691441,27.36087],[53.694908,27.38806],[53.697571,27.409691],[53.698601,27.415951],[53.699711,27.42239],[53.701248,27.42951],[53.702412,27.434111],[53.703892,27.439819],[53.709179,27.45775],[53.709728,27.459539],[53.710258,27.461411],[53.723,27.503969],[53.723629,27.506109],[53.72496,27.51058],[53.72691,27.517099],[53.727348,27.51852],[53.72789,27.520281],[53.729149,27.52442],[53.729729,27.526529],[53.730129,27.528099],[53.73082,27.53133],[53.731548,27.534981],[53.73214,27.53829],[53.732651,27.54188],[53.733139,27.54612],[53.734119,27.55578],[53.736309,27.57708],[53.73687,27.58239],[53.737789,27.5914],[53.738548,27.59878],[53.739639,27.609711],[53.740021,27.61257],[53.740139,27.613449],[53.740749,27.61706],[53.741371,27.620041],[53.742371,27.62392],[53.743832,27.628731],[53.745338,27.632971],[53.746071,27.634689],[53.746868,27.6364],[53.747452,27.637609],[53.748058,27.63879],[53.749298,27.641029],[53.751671,27.64571],[53.752972,27.64875],[53.754261,27.65201],[53.75613,27.657351],[53.75626,27.657721],[53.756908,27.659731],[53.757381,27.6609],[53.7579,27.66235],[53.75832,27.663469],[53.759029,27.665319],[53.759819,27.66711],[53.7607,27.669029],[53.76162,27.67108],[53.762192,27.67214],[53.762901,27.673441],[53.78426,27.712919],[53.786491,27.71736],[53.78846,27.721979],[53.790089,27.726471],[53.79097,27.72916],[53.791382,27.73045],[53.79229,27.733801],[53.793221,27.73777],[53.793499,27.73922],[53.793591,27.739651],[53.793678,27.740191],[53.797211,27.759199],[53.797871,27.76277],[53.79966,27.77269],[53.799881,27.773951],[53.80064,27.778521],[53.802368,27.786659],[53.803139,27.78932],[53.804249,27.793011],[53.80431,27.79318],[53.804878,27.794809],[53.805222,27.795771],[53.80621,27.798479],[53.807301,27.801189],[53.807899,27.80257],[53.80859,27.80405],[53.809689,27.806351],[53.811291,27.80949],[53.813919,27.81415],[53.814121,27.81451],[53.81707,27.81988],[53.81773,27.82114],[53.825401,27.835051],[53.829479,27.842819],[53.833488,27.85062],[53.84153,27.866261],[53.84193,27.86705],[53.843239,27.86961],[53.843891,27.87084],[53.84454,27.872101],[53.845829,27.87459],[53.848412,27.879601],[53.849861,27.882389],[53.85133,27.885229],[53.854252,27.89086],[53.8601,27.902121],[53.861439,27.90472],[53.861599,27.90501],[53.861832,27.90547],[53.863529,27.90876],[53.867081,27.915569],[53.868511,27.91836],[53.86998,27.92103],[53.871288,27.923189],[53.87262,27.925261],[53.874321,27.92758],[53.87606,27.929779],[53.87867,27.93269],[53.878841,27.93284],[53.879501,27.933479],[53.88142,27.93531],[53.88348,27.936951],[53.885021,27.938061],[53.88905,27.94046],[53.891708,27.941771],[53.900379,27.94578],[53.90905,27.949909],[53.92561,27.957621],[53.929649,27.95952],[53.93251,27.960819],[53.935322,27.962351],[53.9361,27.96287],[53.93803,27.96422],[53.939861,27.96578],[53.943039,27.96896],[53.945961,27.972651],[53.946449,27.9734],[53.948139,27.976049],[53.948669,27.97698],[53.949188,27.97789],[53.949478,27.978399],[53.951279,27.98192],[53.952648,27.98527],[53.954319,27.98984],[53.955662,27.99394],[53.963131,28.020201],[53.967251,28.03454],[53.97094,28.047319],[53.973339,28.05479],[53.979519,28.07144],[53.98209,28.078051],[53.98476,28.08552],[53.986301,28.09041],[53.9869,28.09239],[53.98888,28.09968],[53.989651,28.103109],[53.992908,28.116159],[53.995659,28.12775],[53.99601,28.129181],[53.997028,28.13341],[53.998138,28.137791],[54.000198,28.144911],[54.001411,28.148689],[54.003471,28.154779],[54.005531,28.16062],[54.007931,28.167139],[54.009392,28.17161],[54.01128,28.17779],[54.011459,28.178431],[54.012642,28.18281],[54.013149,28.18469],[54.01342,28.18568],[54.014881,28.19212],[54.015739,28.19615],[54.01757,28.206301],[54.01849,28.21307],[54.019348,28.22019],[54.020149,28.22949],[54.020199,28.23004],[54.02026,28.230841],[54.025688,28.30113],[54.02647,28.30962],[54.026981,28.313141],[54.02906,28.32885],[54.03334,28.357349],[54.033852,28.36507],[54.035309,28.373911],[54.035309,28.374081],[54.037109,28.38241],[54.039768,28.39279],[54.041309,28.398251],[54.045609,28.413481],[54.04776,28.420601],[54.049469,28.425579],[54.050381,28.427641],[54.052132,28.431589],[54.054089,28.435329],[54.058441,28.443689],[54.062519,28.4515],[54.06673,28.458969],[54.068951,28.46274],[54.07069,28.465349],[54.07119,28.466089],[54.075909,28.47262],[54.08123,28.47879],[54.083618,28.481319],[54.090328,28.488411],[54.119419,28.518909],[54.120449,28.519991],[54.123631,28.523769],[54.132729,28.535789],[54.137619,28.54188],[54.141651,28.546431],[54.14526,28.550119],[54.148689,28.553471],[54.153591,28.55793],[54.157619,28.56119],[54.166599,28.56822],[54.172371,28.572741],[54.174809,28.574551],[54.177021,28.576191],[54.179588,28.5781],[54.183971,28.581619],[54.18663,28.58419],[54.194271,28.59235],[54.194778,28.592859],[54.207661,28.60651],[54.209042,28.60816],[54.211609,28.611231],[54.213921,28.614321],[54.217701,28.61964],[54.225941,28.632429],[54.237782,28.650801],[54.239159,28.652691],[54.242161,28.65612],[54.245602,28.65913],[54.24791,28.660931],[54.250912,28.662531],[54.251759,28.662979],[54.257092,28.665819],[54.258808,28.666759],[54.25959,28.66728],[54.260441,28.668051],[54.261471,28.669081],[54.262852,28.670799],[54.264141,28.672859],[54.265079,28.67457],[54.266201,28.677059],[54.266911,28.679251],[54.267231,28.680241],[54.268341,28.685101],[54.269032,28.688141],[54.26947,28.691031],[54.269539,28.691481],[54.269588,28.691971],[54.270061,28.69663],[54.270061,28.7071],[54.270111,28.708799],[54.27026,28.710541],[54.270401,28.711769],[54.270569,28.712681],[54.270908,28.71414],[54.271351,28.715691],[54.27232,28.718201],[54.272541,28.718781],[54.282761,28.738779],[54.28997,28.752939],[54.291,28.755939],[54.291599,28.758169],[54.291859,28.761259],[54.291931,28.763109],[54.29155,28.77039],[54.29108,28.780661],[54.29015,28.800529],[54.289959,28.804581],[54.289879,28.806379],[54.289688,28.810459],[54.289631,28.811729],[54.28904,28.8241],[54.288971,28.826241],[54.288971,28.82822],[54.289219,28.83215],[54.290699,28.85079],[54.291061,28.86319],[54.291309,28.87359],[54.29155,28.876591],[54.292801,28.884689],[54.295979,28.904261],[54.297779,28.916269],[54.29821,28.919451],[54.29855,28.923229],[54.300251,28.947069],[54.30027,28.948721],[54.300468,28.950411],[54.301041,28.95756],[54.301842,28.969],[54.301991,28.97043],[54.30262,28.97678],[54.30302,28.979361],[54.30756,29.00271],[54.308418,29.007339],[54.30928,29.01326],[54.31057,29.022791],[54.3116,29.029831],[54.31271,29.036091],[54.31366,29.04081],[54.31572,29.04871],[54.318378,29.056259],[54.331249,29.092911],[54.334259,29.099689],[54.3358,29.10261],[54.336319,29.10347],[54.339409,29.10836],[54.345329,29.11635],[54.347988,29.120119],[54.349541,29.12261],[54.35194,29.127251],[54.35434,29.13282],[54.355801,29.1366],[54.362148,29.155661],[54.362839,29.15814],[54.364391,29.16415],[54.364811,29.166031],[54.36499,29.167061],[54.36573,29.171209],[54.366531,29.17643],[54.370911,29.20389],[54.371681,29.209299],[54.3722,29.21393],[54.37244,29.217501],[54.372532,29.220209],[54.37252,29.22753],[54.371471,29.281111],[54.371391,29.285179],[54.371319,29.28879],[54.37125,29.291611],[54.37133,29.29336],[54.371422,29.295219],[54.37159,29.297819],[54.371891,29.300289],[54.37254,29.304399],[54.37331,29.30826],[54.374168,29.3111],[54.374729,29.312901],[54.375938,29.316811],[54.377258,29.321051],[54.377522,29.32234],[54.378811,29.3274],[54.379921,29.332979],[54.380428,29.336161],[54.380871,29.338989],[54.384121,29.36319],[54.38438,29.36491],[54.385578,29.37075],[54.39082,29.39521],[54.395538,29.417101],[54.396999,29.42594],[54.397598,29.42997],[54.400002,29.45031],[54.400139,29.4513],[54.401031,29.457689],[54.401981,29.46336],[54.403011,29.46817],[54.406269,29.48439],[54.40765,29.49065],[54.408932,29.49555],[54.409962,29.49881],[54.412708,29.506189],[54.419231,29.52121],[54.419899,29.523069],[54.421791,29.52866],[54.42292,29.532749],[54.424809,29.541121],[54.4291,29.5606],[54.430389,29.56739],[54.431252,29.57262],[54.43219,29.579491],[54.433311,29.588181],[54.433491,29.589689],[54.434528,29.596939],[54.435322,29.60264],[54.435619,29.60507],[54.436909,29.61408],[54.43708,29.615191],[54.437241,29.616381],[54.437531,29.618191],[54.438141,29.621481],[54.43848,29.623091],[54.43895,29.62516],[54.439571,29.627609],[54.439899,29.62882],[54.4403,29.63028],[54.44136,29.63376],[54.442451,29.63719],[54.444641,29.644039],[54.447151,29.652069],[54.447788,29.654169],[54.448349,29.655951],[54.449291,29.65892],[54.450218,29.66189],[54.451248,29.665831],[54.456188,29.687019],[54.45718,29.69128],[54.457722,29.693911],[54.458038,29.695749],[54.458679,29.69985],[54.45927,29.704639],[54.459541,29.70756],[54.460072,29.71306],[54.460258,29.715099],[54.461971,29.735531],[54.462318,29.738621],[54.46262,29.74155],[54.463428,29.746429],[54.46386,29.74917],[54.464981,29.754169],[54.46627,29.759899],[54.474419,29.79578],[54.47678,29.806629],[54.477001,29.807631],[54.477772,29.81303],[54.478512,29.819361],[54.479141,29.824711],[54.479389,29.829189],[54.479401,29.832861],[54.479401,29.835779],[54.479221,29.838869],[54.47897,29.84136],[54.478539,29.84436],[54.4776,29.84943],[54.476601,29.85458],[54.47485,29.86367],[54.474331,29.86685],[54.47393,29.870871],[54.47348,29.876631],[54.473301,29.882641],[54.473301,29.88702],[54.473549,29.892269],[54.473911,29.89637],[54.474331,29.90015],[54.475101,29.905821],[54.47588,29.911261],[54.476009,29.91217],[54.476131,29.912979],[54.477509,29.921949],[54.481918,29.952721],[54.482849,29.95892],[54.484451,29.969681],[54.485748,29.978769],[54.491371,30.01828],[54.492378,30.02508],[54.492661,30.02648],[54.493229,30.02866],[54.4939,30.03088],[54.498699,30.047119],[54.49884,30.047621],[54.49926,30.049259],[54.499592,30.051069],[54.49976,30.052429],[54.500011,30.055189],[54.500301,30.060289],[54.501331,30.07649],[54.501949,30.08609],[54.50198,30.087179],[54.502239,30.089689],[54.502361,30.090799],[54.50425,30.10475],[54.504608,30.107281],[54.506271,30.11908],[54.50687,30.12211],[54.50737,30.12393],[54.507919,30.125839],[54.508739,30.128019],[54.51511,30.1404],[54.518089,30.14632],[54.52309,30.15601],[54.538921,30.187611],[54.542049,30.193951],[54.542679,30.195641],[54.543171,30.19755],[54.543339,30.19824],[54.543598,30.19936],[54.546089,30.2173],[54.54718,30.225519],[54.547581,30.228439],[54.547989,30.23138],[54.548382,30.23432],[54.549858,30.244499],[54.553299,30.269739],[54.553471,30.27051],[54.55373,30.271799],[54.554161,30.273689],[54.55484,30.27557],[54.555531,30.277031],[54.56171,30.28862],[54.56274,30.29068],[54.563511,30.29283],[54.564201,30.29463],[54.570549,30.314199],[54.57132,30.31609],[54.572262,30.31806],[54.575699,30.32493],[54.576469,30.32621],[54.577251,30.32733],[54.590641,30.34347],[54.5914,30.344391],[54.59483,30.34856],[54.599911,30.35471],[54.600761,30.355829],[54.60162,30.357109],[54.602482,30.35874],[54.603939,30.36286],[54.6096,30.379601],[54.618641,30.405649],[54.619301,30.407579],[54.619732,30.40913],[54.620029,30.41082],[54.620369,30.41293],[54.62162,30.424231],[54.62302,30.435459],[54.623508,30.438999],[54.623852,30.44174],[54.624538,30.446289],[54.62994,30.48938],[54.632351,30.508261],[54.635349,30.53229],[54.638962,30.56225],[54.641529,30.583191],[54.642479,30.591089],[54.64325,30.59547],[54.652691,30.63521],[54.656288,30.650311],[54.65913,30.66264],[54.669769,30.70816],[54.672771,30.720779],[54.675861,30.738199],[54.683159,30.780769],[54.683159,30.78112],[54.68359,30.785839],[54.685989,30.830641],[54.686119,30.8328],[54.68737,30.854071],[54.689079,30.883511],[54.689362,30.889811],[54.68943,30.891411],[54.689861,30.926941],[54.68993,30.93252],[54.690369,30.968229],[54.690708,30.981791],[54.690842,30.992599],[54.69091,30.99811],[54.690929,30.999861],[54.69099,31.000401],[54.69099,31.000641],[54.690948,31.00079],[54.690971,31.001591],[54.691109,31.014879],[54.69112,31.0201],[54.689701,31.05283],[54.689949,31.06406],[54.69099,31.07468],[54.70348,31.20154],[54.709801,31.244169],[54.710098,31.24548],[54.72105,31.283421],[54.722359,31.28828],[54.72567,31.30747],[54.729439,31.33021],[54.730431,31.336189],[54.735111,31.35618],[54.738861,31.372881],[54.742531,31.41223],[54.744179,31.42782],[54.749039,31.478109],[54.74955,31.48155],[54.751961,31.488119],[54.771992,31.53681],[54.786671,31.57107],[54.791,31.578859],[54.792702,31.58213],[54.794479,31.58531],[54.795181,31.58655],[54.79652,31.589029],[54.802349,31.599859],[54.80621,31.60693],[54.80685,31.60828],[54.807449,31.610001],[54.80798,31.612209],[54.810699,31.62418],[54.81295,31.63438],[54.81358,31.63641],[54.814232,31.63796],[54.81496,31.639339],[54.815788,31.640591],[54.83802,31.663321],[54.841209,31.666731],[54.842098,31.66818],[54.842949,31.67001],[54.843651,31.6724],[54.84396,31.67371],[54.844181,31.675091],[54.844349,31.677031],[54.84444,31.679331],[54.84465,31.68441],[54.846569,31.740999],[54.849239,31.8048],[54.850559,31.838461],[54.850788,31.844669],[54.851139,31.852501],[54.851139,31.854111],[54.8512,31.85553],[54.851311,31.857031],[54.85144,31.85841],[54.85149,31.85882],[54.851688,31.860241],[54.852032,31.861959],[54.859341,31.893641],[54.859699,31.89522],[54.860031,31.896851],[54.860298,31.89867],[54.860409,31.900021],[54.860729,31.907431],[54.863209,31.965019],[54.863461,31.97064],[54.86396,31.97884],[54.864151,31.98205],[54.865582,32.003571],[54.865761,32.00528],[54.86586,32.00592],[54.86607,32.007],[54.86644,32.00843],[54.870831,32.024979],[54.87233,32.030609],[54.878571,32.05394],[54.882,32.067009],[54.882839,32.070171],[54.883598,32.073101],[54.883839,32.074139],[54.88406,32.075291],[54.884701,32.07951],[54.88501,32.081261],[54.889851,32.10043],[54.89156,32.105839],[54.893639,32.111629],[54.894569,32.113979],[54.895279,32.115372],[54.896961,32.11755],[54.89856,32.11887],[54.908989,32.124649],[54.91114,32.12619],[54.912048,32.127312],[54.914181,32.130299],[54.92564,32.14669],[54.92709,32.14933],[54.93465,32.165771],[54.941029,32.179642],[54.942371,32.18211],[54.951599,32.195801],[54.955898,32.20388],[54.957008,32.205929],[54.984772,32.2495],[55.009338,32.288151],[55.014061,32.29557],[55.01635,32.299301],[55.017502,32.302029],[55.02364,32.323231],[55.028831,32.340839],[55.029331,32.342609],[55.029751,32.344479],[55.02998,32.34597],[55.030151,32.347591],[55.032341,32.372421],[55.033009,32.38018],[55.033112,32.381931],[55.033699,32.402451],[55.03381,32.404652],[55.033901,32.405529],[55.034019,32.4063],[55.03429,32.407921],[55.055199,32.499489],[55.055729,32.501888],[55.056099,32.504452],[55.056629,32.51738],[55.05714,32.530281],[55.05822,32.55682],[55.059029,32.576729],[55.059422,32.586262],[55.059818,32.595951],[55.059959,32.597309],[55.060169,32.598701],[55.060711,32.601089],[55.066109,32.62178],[55.072861,32.647812],[55.073879,32.65197],[55.076351,32.664532],[55.077229,32.66922],[55.078171,32.674419],[55.07835,32.676239],[55.078659,32.678799],[55.078911,32.681412],[55.079029,32.684189],[55.079021,32.687019],[55.07896,32.69241],[55.07901,32.69603],[55.07906,32.696899],[55.079109,32.697769],[55.07943,32.70303],[55.079578,32.70578],[55.07967,32.708408],[55.07967,32.7094],[55.079659,32.710388],[55.079651,32.712261],[55.079632,32.716011],[55.079201,32.743149],[55.079231,32.7444],[55.079319,32.745689],[55.080929,32.757801],[55.081959,32.764309],[55.085812,32.792412],[55.09552,32.86187],[55.100609,32.89822],[55.101082,32.90139],[55.103889,32.921909],[55.105289,32.931881],[55.107571,32.952911],[55.11404,33.01384],[55.11478,33.020802],[55.116661,33.038502],[55.118839,33.05909],[55.11903,33.06097],[55.120232,33.07328],[55.12038,33.074821],[55.122749,33.097221],[55.12476,33.11731],[55.127258,33.141972],[55.12812,33.150501],[55.128658,33.155849],[55.12941,33.164082],[55.129551,33.167191],[55.130001,33.171902],[55.130329,33.174858],[55.13203,33.194359],[55.132179,33.19561],[55.132408,33.196869],[55.13242,33.196911],[55.133831,33.202961],[55.134621,33.206329],[55.13612,33.212269],[55.136971,33.21603],[55.138378,33.226891],[55.13974,33.23716],[55.140041,33.239479],[55.140072,33.239712],[55.140381,33.242279],[55.141708,33.25333],[55.142391,33.260139],[55.142422,33.26049],[55.14365,33.273491],[55.14463,33.283451],[55.144981,33.286999],[55.145432,33.290569],[55.145931,33.294651],[55.1493,33.320049],[55.15123,33.334499],[55.152111,33.340832],[55.15263,33.344742],[55.15284,33.346119],[55.15303,33.347069],[55.153801,33.350552],[55.157761,33.367619],[55.162682,33.38887],[55.16927,33.417389],[55.174042,33.43829],[55.17432,33.439339],[55.177589,33.450409],[55.178169,33.452431],[55.178768,33.454479],[55.17944,33.456749],[55.181782,33.46479],[55.182529,33.467381],[55.18285,33.468639],[55.183102,33.469921],[55.183289,33.471249],[55.183418,33.472778],[55.18343,33.474361],[55.183338,33.481991],[55.183201,33.492451],[55.182751,33.514259],[55.18269,33.517471],[55.182621,33.521042],[55.18235,33.535782],[55.181499,33.586811],[55.181259,33.603691],[55.181171,33.605801],[55.18055,33.617359],[55.180248,33.624809],[55.179798,33.634941],[55.179279,33.646099],[55.17955,33.6507],[55.180851,33.665352],[55.181721,33.67519],[55.185951,33.722252],[55.186932,33.733372],[55.188869,33.755901],[55.19022,33.769772],[55.19437,33.816299],[55.197609,33.853371],[55.198872,33.86784],[55.19912,33.874069],[55.199169,33.87693],[55.199551,33.897419],[55.19949,33.902531],[55.19912,33.9081],[55.197571,33.918049],[55.19138,33.95414],[55.190868,33.95586],[55.190411,33.975052],[55.18998,33.992599],[55.18977,34.000889],[55.189209,34.021259],[55.188301,34.037731],[55.18737,34.057541],[55.187382,34.059479],[55.187531,34.061371],[55.203011,34.140369],[55.20351,34.14296],[55.203991,34.144909],[55.20462,34.14682],[55.20575,34.149281],[55.205898,34.14962],[55.210041,34.158669],[55.2104,34.159451],[55.21236,34.171219],[55.220131,34.21777],[55.22076,34.222012],[55.22147,34.232059],[55.221619,34.234131],[55.22179,34.235569],[55.22208,34.237122],[55.222641,34.239288],[55.227921,34.257561],[55.228619,34.259899],[55.231991,34.271622],[55.24136,34.306641],[55.241661,34.307739],[55.24202,34.309109],[55.242371,34.310398],[55.243389,34.314209],[55.2435,34.314339],[55.245979,34.323818],[55.249329,34.336559],[55.249599,34.337589],[55.260361,34.372532],[55.261391,34.375931],[55.2654,34.389042],[55.266911,34.393532],[55.269669,34.401371],[55.288132,34.453289],[55.294189,34.472851],[55.315491,34.531731],[55.32428,34.562809],[55.356602,34.639191],[55.362381,34.65646],[55.36401,34.661339],[55.366451,34.668381],[55.370159,34.677132],[55.37426,34.68692],[55.383419,34.70425],[55.389469,34.713871],[55.41082,34.76725],[55.418419,34.78442],[55.425541,34.80146],[55.433361,34.82016],[55.43346,34.8204],[55.446468,34.851879],[55.448391,34.856579],[55.45153,34.864239],[55.470219,34.909729],[55.487339,34.948181],[55.49308,34.976509],[55.496552,35.007629],[55.496891,35.010681],[55.497028,35.011959],[55.49752,35.01646],[55.49955,35.036381],[55.499592,35.036758],[55.503189,35.101479],[55.505718,35.117962],[55.505718,35.120701],[55.503521,35.144611],[55.499298,35.190571],[55.499981,35.215981],[55.49902,35.240929],[55.498859,35.24894],[55.491619,35.31348],[55.491409,35.35181],[55.491329,35.367901],[55.491421,35.397419],[55.49123,35.400509],[55.487518,35.416309],[55.48074,35.444111],[55.48024,35.446171],[55.474239,35.491421],[55.471531,35.511909],[55.470581,35.519581],[55.47044,35.52206],[55.470119,35.529282],[55.468689,35.557758],[55.466881,35.593349],[55.46558,35.618931],[55.464211,35.645908],[55.46402,35.649601],[55.462921,35.676449],[55.461948,35.701061],[55.465279,35.759811],[55.46529,35.761002],[55.465351,35.769691],[55.465382,35.77354],[55.464821,35.826988],[55.464802,35.828949],[55.464779,35.83086],[55.464771,35.8321],[55.464691,35.839359],[55.4646,35.847698],[55.46542,35.903252],[55.46558,35.913269],[55.465382,35.917561],[55.46402,35.94331],[55.45993,36.022961],[55.459179,36.03561],[55.457581,36.060638],[55.457581,36.06271],[55.457821,36.064789],[55.458118,36.066799],[55.458641,36.068619],[55.474209,36.110161],[55.474339,36.11058],[55.49065,36.16309],[55.494148,36.174358],[55.50119,36.207119],[55.50909,36.243801],[55.51041,36.24992],[55.510818,36.251862],[55.51379,36.26569],[55.522362,36.31168],[55.525181,36.326809],[55.525589,36.32901],[55.531239,36.359341],[55.535961,36.384621],[55.536018,36.384899],[55.536072,36.385201],[55.536709,36.388729],[55.538609,36.39875],[55.53883,36.39996],[55.539341,36.40274],[55.53973,36.404888],[55.540291,36.407959],[55.54216,36.417648],[55.54895,36.455029],[55.551121,36.483101],[55.55114,36.483269],[55.551151,36.483429],[55.55167,36.490059],[55.55621,36.54797],[55.556221,36.548161],[55.55801,36.571011],[55.55822,36.573589],[55.55896,36.582569],[55.564362,36.632759],[55.565071,36.639389],[55.56826,36.669849],[55.571011,36.695881],[55.571018,36.69603],[55.571079,36.69664],[55.571091,36.696739],[55.572319,36.708599],[55.572392,36.70932],[55.572491,36.710251],[55.573101,36.716228],[55.573471,36.719952],[55.575031,36.73521],[55.575729,36.74213],[55.576229,36.747021],[55.57666,36.751289],[55.578522,36.76976],[55.57893,36.773891],[55.581409,36.798882],[55.584068,36.824989],[55.587349,36.85857],[55.58794,36.864269],[55.588421,36.869068],[55.58881,36.872978],[55.589039,36.875259],[55.59066,36.891609],[55.591808,36.90316],[55.594059,36.925831],[55.595589,36.93972],[55.595779,36.941292],[55.59602,36.94323],[55.596539,36.94767],[55.59848,36.964432],[55.598991,36.96875],[55.60051,36.981628],[55.60228,36.996632],[55.602638,36.99966],[55.603119,37.004261],[55.603149,37.004681],[55.603199,37.0051],[55.603249,37.005459],[55.60331,37.005859],[55.603821,37.01012],[55.604,37.011539],[55.604519,37.015621],[55.60535,37.02277],[55.605911,37.02747],[55.609039,37.05463],[55.60976,37.061089],[55.610279,37.06546],[55.610531,37.06673],[55.611149,37.069778],[55.61121,37.070091],[55.612518,37.076752],[55.61248,37.077709],[55.613091,37.081009],[55.613289,37.081989],[55.61565,37.093441],[55.616119,37.09626],[55.616531,37.09869],[55.616909,37.101959],[55.62027,37.126701],[55.62133,37.13377],[55.622608,37.142799],[55.62299,37.14724],[55.623268,37.151451],[55.623901,37.161259],[55.624741,37.174],[55.625259,37.181801],[55.625439,37.184681],[55.62553,37.185589],[55.625839,37.188622],[55.626049,37.191921],[55.62619,37.19376],[55.626339,37.195271],[55.62648,37.196281],[55.626652,37.197441],[55.626869,37.198662],[55.627129,37.19978],[55.627392,37.200779],[55.627831,37.202209],[55.628361,37.203701],[55.628811,37.20483],[55.629269,37.205891],[55.629539,37.20652],[55.631119,37.209999],[55.63187,37.211639],[55.632359,37.212799],[55.633801,37.216019],[55.634998,37.21875],[55.635479,37.219841],[55.635929,37.22084],[55.636299,37.22168],[55.637501,37.2244],[55.63868,37.227039],[55.639858,37.229698],[55.64106,37.23241],[55.642269,37.23513],[55.64267,37.236141],[55.643509,37.238441],[55.64431,37.240719],[55.645939,37.245239],[55.646641,37.247131],[55.64769,37.250061],[55.648029,37.251019],[55.648281,37.251839],[55.648548,37.252762],[55.648689,37.253342],[55.649071,37.255032],[55.649429,37.25684],[55.650082,37.260521],[55.65052,37.262779],[55.651131,37.266102],[55.651451,37.26786],[55.652248,37.272171],[55.65284,37.275341],[55.653412,37.278389],[55.654259,37.28299],[55.655399,37.28931],[55.655602,37.29039],[55.655788,37.291409],[55.656269,37.293739],[55.656448,37.29435],[55.656658,37.295059],[55.657089,37.29631],[55.657379,37.296982],[55.657879,37.298019],[55.658489,37.299019],[55.65905,37.29977],[55.659611,37.300468],[55.66087,37.301861],[55.66206,37.303169],[55.662281,37.30341],[55.663811,37.30505],[55.664719,37.306],[55.665619,37.307011],[55.666908,37.308472],[55.66782,37.309441],[55.66853,37.310169],[55.669109,37.31081],[55.66951,37.311241],[55.670639,37.3125],[55.671421,37.31332],[55.67263,37.31464],[55.672989,37.315029],[55.67794,37.320431],[55.67857,37.321129],[55.679428,37.322071],[55.67984,37.322559],[55.680038,37.3228],[55.680191,37.322941],[55.683571,37.326599],[55.683819,37.32687],[55.685791,37.328991],[55.690022,37.333519],[55.693169,37.336971],[55.694759,37.338631],[55.69556,37.339531],[55.69595,37.34],[55.696331,37.340481],[55.696732,37.341011],[55.697109,37.341579],[55.697842,37.3428],[55.698311,37.34359],[55.698471,37.343861],[55.698639,37.344151],[55.698738,37.34433],[55.69949,37.34568],[55.69978,37.34621],[55.700371,37.34729],[55.701241,37.348869],[55.702839,37.351891],[55.703732,37.35355],[55.703949,37.353958],[55.704472,37.354939],[55.705002,37.3559],[55.705441,37.356682],[55.706081,37.357891],[55.706638,37.358891],[55.70705,37.35965],[55.70755,37.360569],[55.707878,37.36121],[55.708172,37.361801],[55.708382,37.36227],[55.70882,37.363319],[55.70911,37.36401],[55.709499,37.36504],[55.709728,37.36573],[55.70998,37.366482],[55.710281,37.367481],[55.710541,37.368431],[55.710812,37.36953],[55.71104,37.37059],[55.711269,37.3717],[55.711849,37.375118],[55.71209,37.376629],[55.71262,37.38015],[55.71286,37.381729],[55.712818,37.382339],[55.712799,37.382561],[55.712742,37.382771],[55.71244,37.38372],[55.712261,37.384258],[55.71199,37.38509],[55.711929,37.385281],[55.71167,37.386082],[55.71138,37.386688],[55.710949,37.387459],[55.710098,37.38821],[55.70993,37.388371],[55.709641,37.38863],[55.70837,37.39016],[55.707981,37.390572],[55.70681,37.392139],[55.70639,37.392712],[55.705299,37.394119],[55.704361,37.395302],[55.70406,37.39571],[55.702068,37.398418],[55.701469,37.399239],[55.700809,37.40015],[55.700291,37.400841],[55.699841,37.401459],[55.699261,37.40226],[55.698799,37.402901],[55.69754,37.404541],[55.693779,37.40976],[55.69265,37.41103],[55.692039,37.411659],[55.691422,37.412251],[55.690071,37.41328],[55.689751,37.413502],[55.689011,37.413952],[55.688309,37.41433],[55.687618,37.41465],[55.686611,37.41502],[55.686401,37.4151],[55.685848,37.41526],[55.685699,37.415272],[55.685081,37.415489],[55.684391,37.415779],[55.684059,37.415932],[55.683659,37.41613],[55.683281,37.41634],[55.68285,37.416599],[55.68243,37.41687],[55.68206,37.41713],[55.680611,37.418221],[55.67614,37.421558],[55.670879,37.425499],[55.669231,37.426739],[55.668152,37.427551],[55.66732,37.428162],[55.666191,37.429008],[55.66576,37.42934],[55.664509,37.430271],[55.664131,37.43058],[55.663528,37.431091],[55.66267,37.43187],[55.661491,37.432999],[55.66053,37.433929],[55.66013,37.434341],[55.659729,37.43478],[55.659309,37.435249],[55.659088,37.43549],[55.658169,37.436569],[55.656479,37.438549],[55.65451,37.440849],[55.65411,37.441319],[55.653751,37.44178],[55.652359,37.4436],[55.652111,37.44389],[55.65086,37.445358],[55.645191,37.451988],[55.643459,37.454021],[55.641281,37.45657],[55.639191,37.459019],[55.6385,37.459839],[55.637131,37.461441],[55.6366,37.462059],[55.635941,37.462818],[55.632431,37.466919],[55.631828,37.467621],[55.63158,37.467899],[55.630939,37.468651],[55.628601,37.471371],[55.627361,37.47282],[55.625629,37.474838],[55.620949,37.48032],[55.617222,37.48468],[55.6157,37.48645],[55.614529,37.48782],[55.61364,37.48885],[55.613361,37.489182],[55.611931,37.490841],[55.611519,37.491322],[55.610699,37.492279],[55.609539,37.493629],[55.608521,37.49482],[55.607571,37.49593],[55.60601,37.497749],[55.6035,37.500671],[55.60091,37.503681],[55.600288,37.504429],[55.599682,37.505211],[55.599121,37.505989],[55.59874,37.506592],[55.598339,37.507221],[55.59782,37.508129],[55.59745,37.508789],[55.597092,37.50948],[55.596691,37.510311],[55.596321,37.51115],[55.59586,37.512249],[55.595428,37.513359],[55.595081,37.51437],[55.594688,37.515591],[55.594349,37.516731],[55.59404,37.517948],[55.593811,37.518921],[55.592319,37.525131],[55.591541,37.528412],[55.59132,37.529339],[55.590912,37.53101],[55.59005,37.534599],[55.587421,37.545601],[55.587139,37.54678],[55.586491,37.549469],[55.584969,37.55584],[55.58287,37.564602],[55.582199,37.567421],[55.581779,37.56916],[55.580719,37.57357],[55.580261,37.57552],[55.579342,37.579361],[55.577278,37.58794],[55.577141,37.588551],[55.577,37.58918],[55.57687,37.589771],[55.576759,37.590408],[55.576641,37.591091],[55.576439,37.59227],[55.57634,37.592911],[55.576241,37.593521],[55.57616,37.594131],[55.576092,37.594742],[55.576019,37.59539],[55.57597,37.596008],[55.575932,37.59655],[55.57589,37.597099],[55.575809,37.598301],[55.575741,37.599659],[55.575611,37.601822],[55.575329,37.606709],[55.575241,37.608158],[55.574982,37.612598],[55.574921,37.613659],[55.574581,37.61935],[55.574409,37.62228],[55.573818,37.632408],[55.573681,37.63475],[55.573589,37.636292],[55.573471,37.638309],[55.57336,37.640308],[55.57325,37.64204],[55.57304,37.645771],[55.572929,37.647671],[55.57283,37.6492],[55.572639,37.652538],[55.572609,37.653061],[55.57254,37.654121],[55.572491,37.655071],[55.571991,37.6633],[55.57196,37.66394],[55.57193,37.664619],[55.571892,37.665298],[55.571869,37.665932],[55.571838,37.666599],[55.571831,37.667271],[55.571819,37.66795],[55.571819,37.66864],[55.571831,37.669312],[55.571861,37.669998],[55.57188,37.67067],[55.571918,37.671349],[55.571972,37.67202],[55.572029,37.672691],[55.57209,37.673359],[55.57217,37.67403],[55.57225,37.674702],[55.57233,37.675362],[55.572418,37.67601],[55.572529,37.67667],[55.57275,37.677952],[55.572861,37.678589],[55.573002,37.679241],[55.573139,37.679871],[55.573299,37.680489],[55.57346,37.68108],[55.573608,37.68166],[55.57375,37.68219],[55.573929,37.682758],[55.5741,37.683331],[55.57428,37.683868],[55.574459,37.68441],[55.574631,37.684891],[55.575432,37.687099],[55.575649,37.687721],[55.576092,37.688889],[55.577709,37.69323],[55.579571,37.698189],[55.581402,37.703121],[55.581951,37.704578],[55.582272,37.705448],[55.582729,37.70668],[55.584511,37.711472],[55.585201,37.71331],[55.585819,37.714989],[55.586071,37.715672],[55.58654,37.716949],[55.587009,37.71822],[55.58749,37.719452],[55.587688,37.719952],[55.588299,37.72142],[55.588951,37.723],[55.589619,37.724548],[55.59016,37.725842],[55.591499,37.729031],[55.591949,37.73011],[55.593449,37.733688],[55.59478,37.736851],[55.594959,37.737309],[55.5952,37.737869],[55.595829,37.739429],[55.599812,37.748901],[55.600319,37.750092],[55.600761,37.751122],[55.601151,37.752041],[55.60165,37.753132],[55.602089,37.75404],[55.602669,37.755161],[55.603168,37.756088],[55.6063,37.761768],[55.60696,37.762981],[55.612579,37.77314],[55.616131,37.779572],[55.616459,37.78017],[55.616638,37.780491],[55.617081,37.7813],[55.617619,37.78228],[55.618858,37.784519],[55.619438,37.785568],[55.619869,37.786461],[55.620838,37.788631],[55.621399,37.789799],[55.621929,37.790821],[55.622391,37.791649],[55.624439,37.795361],[55.62495,37.796268],[55.625351,37.796909],[55.62574,37.797508],[55.626129,37.7981],[55.62619,37.798199],[55.626411,37.79847],[55.62669,37.798851],[55.62711,37.79945],[55.627621,37.800201],[55.62772,37.800331],[55.63179,37.806599],[55.638611,37.817032],[55.63908,37.817719],[55.640419,37.819771],[55.640659,37.820141],[55.643909,37.825119],[55.645351,37.827309],[55.647419,37.83049],[55.648521,37.83213],[55.648972,37.832802],[55.649021,37.83287],[55.649658,37.833721],[55.650372,37.834641],[55.65123,37.835602],[55.65181,37.83617],[55.652519,37.8368],[55.653511,37.837551],[55.654282,37.838051],[55.65493,37.838428],[55.655941,37.83894],[55.656559,37.839191],[55.657131,37.83939],[55.65794,37.839581],[55.65889,37.839771],[55.65974,37.839859],[55.660549,37.839901],[55.661308,37.839901],[55.662201,37.839809],[55.662971,37.839668],[55.663738,37.83947],[55.664799,37.839111],[55.670181,37.837132],[55.679001,37.83392],[55.682739,37.832371],[55.68362,37.832031],[55.68544,37.83136],[55.687061,37.830761],[55.6875,37.830589],[55.687778,37.830502],[55.68898,37.83012],[55.690079,37.829849],[55.691051,37.829689],[55.692001,37.829571],[55.692879,37.829521],[55.693741,37.829529],[55.694759,37.82959],[55.69569,37.829708],[55.696659,37.82988],[55.697041,37.82999],[55.697418,37.83009],[55.697479,37.830109],[55.69804,37.830269],[55.698479,37.830421],[55.69883,37.83054],[55.69899,37.830608],[55.6996,37.830849],[55.70039,37.831211],[55.701149,37.831589],[55.704849,37.833591],[55.705349,37.833851],[55.707619,37.83506],[55.708229,37.835381],[55.709419,37.83601],[55.709961,37.8363],[55.71011,37.83638],[55.712391,37.837589],[55.71328,37.838032],[55.71402,37.838322],[55.714729,37.838558],[55.715511,37.838741],[55.71656,37.838909],[55.72023,37.839359],[55.72298,37.839691],[55.728729,37.840382],[55.731949,37.840771],[55.732861,37.84087],[55.734409,37.841068],[55.736671,37.841351],[55.74012,37.841801],[55.740929,37.841881],[55.74213,37.84201],[55.74361,37.842098],[55.745289,37.842159],[55.747231,37.842251],[55.748741,37.8423],[55.74939,37.842319],[55.749931,37.842361],[55.75071,37.842419],[55.752129,37.84251],[55.753551,37.84259],[55.75523,37.84272],[55.755501,37.842739],[55.757359,37.84288],[55.757561,37.84288],[55.757641,37.84288],[55.758911,37.842892],[55.759331,37.842899],[55.760319,37.84296],[55.760971,37.842991],[55.762878,37.843102],[55.76572,37.843239],[55.766689,37.843288],[55.76738,37.843319],[55.767891,37.843349],[55.768021,37.843361],[55.768501,37.843391],[55.770119,37.843491],[55.770489,37.843491],[55.77145,37.843491],[55.772919,37.843342],[55.774342,37.843208],[55.77499,37.84338],[55.775249,37.843491],[55.775452,37.843689],[55.776039,37.844742],[55.77623,37.844978],[55.77705,37.845612],[55.777222,37.845779],[55.777351,37.84594],[55.777531,37.846272],[55.777889,37.847328],[55.778801,37.85104],[55.779202,37.852638],[55.779339,37.853279],[55.779732,37.85498],[55.782631,37.867538],[55.782661,37.867661],[55.783169,37.869801],[55.783279,37.870251],[55.78421,37.874069],[55.784538,37.875488],[55.78471,37.87619],[55.784889,37.876949],[55.78561,37.880032],[55.786098,37.882141],[55.78651,37.883801],[55.786739,37.884609],[55.78746,37.88699],[55.788448,37.890148],[55.78949,37.893379],[55.789871,37.894581],[55.790169,37.89555],[55.790199,37.895641],[55.791199,37.8988],[55.792561,37.903049],[55.793041,37.904652],[55.793282,37.905579],[55.793419,37.906479],[55.793461,37.90691],[55.793468,37.907089],[55.79348,37.907341],[55.793499,37.907871],[55.793499,37.908539],[55.79351,37.916191],[55.793522,37.91724],[55.79353,37.918259],[55.793549,37.921631],[55.79361,37.92384],[55.793732,37.927231],[55.793892,37.931759],[55.79398,37.934212],[55.793991,37.934639],[55.794022,37.935371],[55.794041,37.936089],[55.794109,37.937531],[55.794331,37.942131],[55.794441,37.944149],[55.794559,37.946301],[55.794571,37.946381],[55.794628,37.947529],[55.794731,37.948898],[55.794922,37.950771],[55.79525,37.95372],[55.795479,37.955669],[55.795589,37.95673],[55.795792,37.958351],[55.79586,37.9589],[55.79657,37.965309],[55.79681,37.96735],[55.796989,37.96891],[55.79707,37.969711],[55.797421,37.972721],[55.798012,37.97784],[55.798828,37.984989],[55.798981,37.98632],[55.799068,37.987122],[55.799309,37.989269],[55.799389,37.989929],[55.79995,37.99477],[55.800179,37.996861],[55.800678,38.001228],[55.80167,38.009972],[55.802582,38.017769],[55.802711,38.018841],[55.80275,38.019249],[55.804459,38.034031],[55.804798,38.036968],[55.805111,38.03968],[55.806099,38.048382],[55.80703,38.056568],[55.807659,38.062111],[55.807812,38.0634],[55.80801,38.065159],[55.808071,38.065659],[55.8083,38.067612],[55.808739,38.071411],[55.80938,38.07703],[55.809841,38.081131],[55.809959,38.082241],[55.81068,38.088501],[55.810719,38.08881],[55.81139,38.094582],[55.812359,38.10323],[55.81303,38.1092],[55.813881,38.116638],[55.81868,38.15852],[55.819,38.161419],[55.820221,38.172131],[55.820431,38.17411],[55.82132,38.181702],[55.821442,38.182949],[55.821461,38.183102],[55.821499,38.18354],[55.82225,38.190128],[55.822361,38.191101],[55.823551,38.20171],[55.824329,38.208481],[55.824909,38.213718],[55.8251,38.215611],[55.825329,38.218121],[55.82571,38.223591],[55.82608,38.228828],[55.826542,38.23563],[55.826778,38.239231],[55.827629,38.25211],[55.82795,38.25732],[55.828331,38.263401],[55.828781,38.2701],[55.829109,38.275379],[55.829342,38.280701],[55.829639,38.28738],[55.829659,38.287949],[55.82967,38.288231],[55.830051,38.29707],[55.830502,38.30489],[55.83194,38.33017],[55.83239,38.338009],[55.83342,38.35574],[55.833599,38.358952],[55.83403,38.366322],[55.834381,38.372669],[55.834702,38.377949],[55.83482,38.380878],[55.834839,38.382549],[55.83477,38.383881],[55.834599,38.385471],[55.833721,38.390701],[55.832951,38.395111],[55.832809,38.395908],[55.831779,38.401699],[55.8312,38.40456],[55.83094,38.405682],[55.830631,38.406898],[55.82999,38.408829],[55.82972,38.409592],[55.829151,38.41106],[55.828331,38.412979],[55.826809,38.416618],[55.826031,38.418549],[55.825748,38.419392],[55.825581,38.419949],[55.825089,38.42218],[55.824982,38.42305],[55.824871,38.42392],[55.82478,38.425251],[55.82473,38.426109],[55.82473,38.427311],[55.82476,38.428051],[55.824749,38.428509],[55.82481,38.429169],[55.824989,38.430969],[55.825199,38.432529],[55.825371,38.433399],[55.825699,38.434738],[55.826401,38.43708],[55.828979,38.44458],[55.83062,38.449169],[55.83115,38.45071],[55.832279,38.453861],[55.832829,38.455311],[55.833351,38.456581],[55.835171,38.46122],[55.83836,38.47044],[55.83844,38.47068],[55.839958,38.474972],[55.84132,38.47831],[55.842251,38.480808],[55.843899,38.484718],[55.849442,38.496941],[55.850368,38.499081],[55.851299,38.501099],[55.852501,38.50391],[55.853249,38.505562],[55.853828,38.507092],[55.854752,38.510052],[55.855492,38.5131],[55.85606,38.516289],[55.856522,38.519611],[55.85675,38.522591],[55.85672,38.52573],[55.8564,38.533169],[55.855999,38.541279],[55.85569,38.548031],[55.855461,38.55389],[55.855381,38.556011],[55.85527,38.558819],[55.855179,38.56089],[55.855011,38.565231],[55.854752,38.572048],[55.854591,38.575989],[55.854359,38.580959],[55.854198,38.58392],[55.853821,38.590309],[55.85355,38.594608],[55.853199,38.600342],[55.852901,38.605492],[55.852631,38.609772],[55.852612,38.610142],[55.85257,38.611061],[55.852402,38.613701],[55.85223,38.6166],[55.8522,38.617729],[55.85215,38.62241],[55.8521,38.625439],[55.852089,38.627972],[55.85202,38.63319],[55.851978,38.6376],[55.851929,38.641621],[55.851929,38.641899],[55.851871,38.646179],[55.85181,38.651909],[55.851761,38.656639],[55.851719,38.657131],[55.851452,38.658691],[55.850929,38.660412],[55.849529,38.664989],[55.848789,38.667549],[55.84853,38.668701],[55.84827,38.670448],[55.848209,38.671341],[55.848202,38.672771],[55.848221,38.674671],[55.84837,38.681469],[55.848541,38.689041],[55.848701,38.69688],[55.848831,38.70393],[55.84893,38.708691],[55.849152,38.718632],[55.849251,38.72348],[55.849361,38.728699],[55.849468,38.73336],[55.849529,38.736099],[55.849739,38.747841],[55.84996,38.75782],[55.85006,38.762772],[55.850109,38.76535],[55.85014,38.766449],[55.85014,38.76672],[55.850151,38.767639],[55.850201,38.77037],[55.850281,38.774529],[55.850449,38.782619],[55.85054,38.787449],[55.850739,38.797169],[55.85083,38.801781],[55.850929,38.806992],[55.851028,38.811989],[55.851151,38.817791],[55.851349,38.826908],[55.851452,38.83194],[55.851559,38.836769],[55.851669,38.84137],[55.85183,38.850101],[55.851959,38.854939],[55.852131,38.85675],[55.85244,38.859402],[55.852741,38.861851],[55.85297,38.86401],[55.853298,38.86705],[55.853371,38.86755],[55.853649,38.86882],[55.853851,38.869652],[55.854881,38.8736],[55.855572,38.876369],[55.856621,38.880428],[55.857498,38.883888],[55.857632,38.884441],[55.857899,38.885509],[55.858608,38.888271],[55.858761,38.888851],[55.859509,38.89172],[55.859638,38.892189],[55.86071,38.89637],[55.861301,38.898579],[55.86179,38.900471],[55.862309,38.90255],[55.866249,38.917938],[55.867081,38.921101],[55.869419,38.930328],[55.872372,38.945221],[55.873741,38.952301],[55.875,38.958649],[55.876041,38.962421],[55.876839,38.965401],[55.877029,38.96616],[55.878761,38.97385],[55.880711,38.982849],[55.88147,38.986351],[55.883362,38.9953],[55.88361,38.99654],[55.884048,38.998951],[55.884491,39.00079],[55.885399,39.004181],[55.886238,39.007469],[55.88715,39.010571],[55.88763,39.0121],[55.88805,39.013111],[55.896252,39.043819],[55.897362,39.047932],[55.897861,39.049789],[55.898151,39.051102],[55.898708,39.054008],[55.899109,39.05714],[55.899559,39.061008],[55.899792,39.063019],[55.899811,39.0634],[55.89986,39.063911],[55.899899,39.064449],[55.900002,39.065868],[55.900299,39.071079],[55.900551,39.0737],[55.90118,39.077179],[55.901691,39.079651],[55.901829,39.080311],[55.90213,39.081772],[55.905811,39.098789],[55.90694,39.10458],[55.91214,39.137428],[55.913052,39.14325],[55.913601,39.14687],[55.914108,39.150108],[55.91431,39.151501],[55.914421,39.152279],[55.914471,39.152599],[55.914822,39.154758],[55.915722,39.160469],[55.917042,39.168201],[55.9174,39.171108],[55.917789,39.17503],[55.918152,39.178669],[55.918442,39.181862],[55.91853,39.18288],[55.918919,39.186878],[55.919079,39.188759],[55.91988,39.199379],[55.920479,39.208561],[55.921219,39.21978],[55.921299,39.220951],[55.921619,39.22559],[55.92292,39.244621],[55.923351,39.250851],[55.926182,39.29248],[55.92696,39.3041],[55.927559,39.313049],[55.927952,39.318871],[55.928181,39.322529],[55.92836,39.325321],[55.92836,39.325371],[55.928421,39.326351],[55.928478,39.327202],[55.931431,39.37112],[55.93227,39.38385],[55.932812,39.391972],[55.933029,39.39529],[55.933151,39.397049],[55.934731,39.42107],[55.93491,39.423988],[55.936069,39.441189],[55.93721,39.45771],[55.93779,39.467388],[55.938061,39.46907],[55.93853,39.471161],[55.93972,39.475498],[55.941811,39.483219],[55.943611,39.499222],[55.943939,39.502159],[55.944931,39.511028],[55.94593,39.519939],[55.945969,39.520309],[55.952301,39.577099],[55.953369,39.586811],[55.955349,39.60461],[55.955799,39.60836],[55.956348,39.613419],[55.957291,39.622089],[55.957088,39.626629],[55.95681,39.632778],[55.95673,39.634609],[55.956711,39.635139],[55.956791,39.638279],[55.957359,39.64682],[55.958721,39.66798],[55.960369,39.69347],[55.960659,39.697731],[55.96085,39.700539],[55.96191,39.716789],[55.9622,39.72086],[55.96225,39.721691],[55.964409,39.75536],[55.964851,39.762169],[55.96489,39.762718],[55.96524,39.768108],[55.965439,39.774719],[55.965809,39.777882],[55.96764,39.784889],[55.98246,39.840961],[56.000141,39.908619],[56.000488,39.909969],[56.001431,39.913559],[56.001511,39.91383],[56.001701,39.91441],[56.002071,39.915791],[56.002529,39.917],[56.005741,39.92347],[56.007729,39.92849],[56.008629,39.931511],[56.008701,39.931782],[56.010071,39.936958],[56.011211,39.941299],[56.012619,39.94664],[56.013988,39.95166],[56.014,39.951679],[56.014729,39.95438],[56.017101,39.963089],[56.019081,39.970409],[56.019932,39.973541],[56.020969,39.97736],[56.021751,39.98024],[56.022251,39.982071],[56.022449,39.9828],[56.024139,39.989029],[56.024891,39.991821],[56.029888,40.01022],[56.033798,40.024639],[56.034512,40.027241],[56.036812,40.035728],[56.04406,40.06221],[56.04781,40.075932],[56.048531,40.07859],[56.050949,40.087429],[56.051281,40.08868],[56.05249,40.093159],[56.05315,40.095581],[56.060669,40.123489],[56.060928,40.1245],[56.06554,40.141541],[56.072929,40.169151],[56.073399,40.170849],[56.073719,40.172039],[56.076439,40.182251],[56.076839,40.1838],[56.0769,40.184021],[56.077229,40.185268],[56.078369,40.1894],[56.0798,40.195129],[56.08007,40.196331],[56.080158,40.196941],[56.080238,40.197891],[56.08025,40.19841],[56.080231,40.199059],[56.080151,40.19973],[56.080009,40.200539],[56.078861,40.20388],[56.078739,40.20433],[56.077461,40.207958],[56.075371,40.213879],[56.07259,40.221809],[56.07198,40.224579],[56.071739,40.22599],[56.071541,40.22797],[56.07151,40.231892],[56.071579,40.239571],[56.071621,40.242199],[56.071671,40.247181],[56.07172,40.251339],[56.071819,40.25576],[56.071899,40.264408],[56.072021,40.275421],[56.07201,40.277401],[56.071911,40.279362],[56.071751,40.281521],[56.071301,40.284851],[56.070419,40.289349],[56.070091,40.29105],[56.066311,40.311272],[56.065369,40.317341],[56.06509,40.320469],[56.064861,40.32436],[56.064812,40.32885],[56.06509,40.357712],[56.065109,40.36055],[56.064899,40.362999],[56.064381,40.365318],[56.063999,40.36647],[56.06348,40.368031],[56.062969,40.36956],[56.060211,40.37785],[56.058392,40.385189],[56.05584,40.401508],[56.05529,40.40506],[56.05397,40.413551],[56.053379,40.41769],[56.053059,40.422169],[56.053268,40.426491],[56.053631,40.429062],[56.054138,40.431789],[56.054539,40.433529],[56.055012,40.435131],[56.056149,40.438919],[56.057251,40.442509],[56.059212,40.448811],[56.059971,40.450859],[56.060799,40.45266],[56.061741,40.45451],[56.062462,40.455631],[56.063801,40.4575],[56.064159,40.457951],[56.06485,40.45874],[56.068939,40.462528],[56.07304,40.466202],[56.075062,40.468109],[56.076439,40.469688],[56.078892,40.473],[56.080009,40.47448],[56.080471,40.47506],[56.081928,40.476929],[56.082432,40.4776],[56.083141,40.478611],[56.0839,40.47998],[56.08466,40.481571],[56.085461,40.483891],[56.08606,40.486351],[56.089851,40.509869],[56.090389,40.513908],[56.092449,40.530998],[56.094212,40.545502],[56.095581,40.557201],[56.096889,40.568321],[56.097149,40.570969],[56.097328,40.57296],[56.09763,40.57518],[56.09798,40.577381],[56.098412,40.580799],[56.098591,40.58226],[56.099152,40.587151],[56.099369,40.589512],[56.099529,40.591148],[56.099812,40.593361],[56.100121,40.59547],[56.10041,40.597481],[56.102051,40.611118],[56.103661,40.624569],[56.103882,40.62677],[56.10405,40.629089],[56.10413,40.633461],[56.104019,40.641369],[56.103821,40.64497],[56.103828,40.648499],[56.10384,40.65242],[56.10363,40.661339],[56.103519,40.66444],[56.103489,40.667622],[56.103519,40.67067],[56.10334,40.683609],[56.103329,40.68642],[56.102959,40.711189],[56.102249,40.763199],[56.102329,40.76741],[56.102589,40.771111],[56.102612,40.771339],[56.102779,40.773022],[56.102951,40.774342],[56.103111,40.7756],[56.104851,40.787209],[56.10527,40.79002],[56.108238,40.809799],[56.111141,40.828381],[56.11182,40.83308],[56.112591,40.83646],[56.113392,40.839539],[56.114681,40.843609],[56.11602,40.84687],[56.118992,40.85318],[56.129902,40.876259],[56.13113,40.879059],[56.132191,40.881241],[56.132561,40.881989],[56.13348,40.88377],[56.134041,40.884899],[56.134701,40.88633],[56.137161,40.891621],[56.138111,40.893848],[56.139389,40.89642],[56.14061,40.898788],[56.146461,40.911152],[56.14753,40.91304],[56.14859,40.914761],[56.149818,40.91655],[56.151058,40.918201],[56.154869,40.922371],[56.158642,40.926521],[56.16753,40.93631],[56.173779,40.94326],[56.175091,40.94445],[56.176392,40.945431],[56.177738,40.946201],[56.1791,40.946781],[56.19043,40.950539],[56.190891,40.950729],[56.192089,40.95116],[56.192841,40.951611],[56.193321,40.95216],[56.193722,40.952839],[56.193989,40.95359],[56.19418,40.954418],[56.194321,40.955502],[56.19463,40.9617],[56.194931,40.968739],[56.195351,40.9744],[56.196018,40.986382],[56.196251,40.99144],[56.196758,41.00251],[56.197819,41.02309],[56.20219,41.11478],[56.20306,41.133041],[56.20385,41.149139],[56.2043,41.158642],[56.204361,41.15974],[56.206051,41.196301],[56.206631,41.206532],[56.207371,41.222488],[56.20882,41.251839],[56.211048,41.30019],[56.211201,41.303452],[56.212311,41.326351],[56.212448,41.33046],[56.216839,41.43071],[56.21756,41.447971],[56.218842,41.474659],[56.223141,41.56255],[56.225788,41.630322],[56.226082,41.63707],[56.226181,41.639389],[56.227459,41.669319],[56.22855,41.694981],[56.228828,41.701469],[56.228859,41.702179],[56.229172,41.709389],[56.230148,41.732349],[56.230259,41.73505],[56.230331,41.736679],[56.232471,41.786751],[56.232738,41.794498],[56.23291,41.79882],[56.23296,41.79998],[56.23317,41.805161],[56.233189,41.805889],[56.233589,41.817379],[56.234089,41.838871],[56.234402,41.85252],[56.23465,41.866039],[56.2351,41.8848],[56.23513,41.885979],[56.235168,41.887909],[56.2355,41.903431],[56.235889,41.921749],[56.236118,41.931831],[56.23632,41.94083],[56.23634,41.941792],[56.236351,41.94276],[56.23637,41.94421],[56.236561,41.952782],[56.23658,41.954411],[56.236591,41.95488],[56.236629,41.956581],[56.236629,41.956711],[56.236881,41.966068],[56.236931,41.97105],[56.236969,41.973549],[56.237,41.974812],[56.237041,41.976479],[56.237049,41.97715],[56.237061,41.97784],[56.23724,41.98439],[56.237301,41.98632],[56.23732,41.98719],[56.23737,41.98933],[56.237419,41.992352],[56.23745,41.993832],[56.237461,41.994499],[56.237541,41.99876],[56.237549,41.99931],[56.237621,42.00243],[56.237652,42.004131],[56.237789,42.009571],[56.23793,42.017139],[56.237999,42.02042],[56.238091,42.02457],[56.238201,42.02961],[56.238239,42.030991],[56.238331,42.034069],[56.238392,42.036381],[56.238419,42.037552],[56.238468,42.039661],[56.23851,42.041389],[56.238541,42.042309],[56.238659,42.047852],[56.238789,42.053452],[56.238899,42.058681],[56.238918,42.059441],[56.238991,42.062641],[56.239029,42.06456],[56.239059,42.066071],[56.239079,42.066719],[56.23912,42.068748],[56.23912,42.069061],[56.239128,42.069359],[56.239159,42.070831],[56.239262,42.075661],[56.239281,42.0765],[56.239319,42.07877],[56.23938,42.081821],[56.239422,42.083851],[56.23946,42.086319],[56.239498,42.088009],[56.239571,42.090832],[56.239658,42.09568],[56.2397,42.097988],[56.239719,42.099369],[56.239738,42.101269],[56.23975,42.101719],[56.239712,42.102219],[56.2397,42.102371],[56.239609,42.10305],[56.239429,42.10384],[56.239231,42.104568],[56.23909,42.105],[56.238941,42.105389],[56.238762,42.10577],[56.238419,42.106441],[56.238049,42.10704],[56.23793,42.10722],[56.23737,42.10807],[56.236279,42.109791],[56.235409,42.11121],[56.234341,42.112789],[56.23365,42.113869],[56.232689,42.115391],[56.231682,42.117001],[56.230629,42.11869],[56.22974,42.120159],[56.22879,42.121719],[56.22765,42.12347],[56.226768,42.124859],[56.22617,42.125839],[56.225601,42.126751],[56.225189,42.127468],[56.224949,42.127869],[56.224731,42.12825],[56.224499,42.128681],[56.22414,42.129459],[56.223801,42.130241],[56.22337,42.131451],[56.222969,42.132702],[56.222679,42.13369],[56.22237,42.13488],[56.222351,42.134972],[56.222271,42.13533],[56.222191,42.13578],[56.221951,42.136971],[56.221802,42.137798],[56.22171,42.138329],[56.22163,42.13887],[56.221539,42.139568],[56.22147,42.140251],[56.221359,42.141621],[56.22126,42.14344],[56.22121,42.144508],[56.221111,42.1465],[56.221081,42.147301],[56.221039,42.147991],[56.220989,42.149342],[56.220951,42.150242],[56.22086,42.151829],[56.220829,42.152328],[56.22076,42.153728],[56.220661,42.156261],[56.22057,42.158321],[56.220482,42.16037],[56.22044,42.16106],[56.220379,42.162239],[56.220242,42.1651],[56.220131,42.167999],[56.22007,42.169552],[56.220032,42.17033],[56.21991,42.172489],[56.219849,42.17411],[56.21983,42.17485],[56.219749,42.17614],[56.219639,42.17831],[56.219559,42.180012],[56.219509,42.181019],[56.21946,42.182041],[56.219452,42.182171],[56.219391,42.183201],[56.219341,42.18401],[56.219269,42.185101],[56.219189,42.18644],[56.219109,42.187599],[56.218929,42.190868],[56.218849,42.192341],[56.218769,42.193939],[56.218719,42.19487],[56.218681,42.195591],[56.218639,42.196548],[56.218578,42.19772],[56.218491,42.199581],[56.21841,42.201229],[56.21833,42.202839],[56.218288,42.203579],[56.218239,42.204659],[56.218159,42.206322],[56.218151,42.206532],[56.218102,42.207401],[56.218021,42.209061],[56.217918,42.211029],[56.21785,42.212399],[56.217781,42.213848],[56.217659,42.216492],[56.217541,42.218849],[56.217419,42.221321],[56.21735,42.222679],[56.217281,42.22393],[56.217239,42.22472],[56.21714,42.226871],[56.217079,42.228149],[56.21703,42.229679],[56.216999,42.230999],[56.216961,42.2323],[56.216888,42.233879],[56.216831,42.235279],[56.216728,42.237122],[56.21664,42.238911],[56.21656,42.24078],[56.216412,42.243759],[56.216209,42.245811],[56.215931,42.247929],[56.215611,42.24984],[56.215359,42.251202],[56.215031,42.25272],[56.21471,42.254009],[56.214241,42.255501],[56.213951,42.25647],[56.21389,42.25666],[56.2136,42.25761],[56.213039,42.259548],[56.212559,42.261139],[56.211979,42.263111],[56.21138,42.26503],[56.210609,42.267651],[56.209949,42.269829],[56.209171,42.272491],[56.208221,42.275631],[56.207611,42.277748],[56.20694,42.27998],[56.206249,42.282349],[56.205791,42.283871],[56.205238,42.28566],[56.20525,42.28627],[56.20401,42.290192],[56.203461,42.2924],[56.20311,42.31216],[56.202709,42.350479],[56.202141,42.353569],[56.20055,42.358742],[56.19643,42.370819],[56.192322,42.383091],[56.187889,42.39357],[56.180851,42.4077],[56.174171,42.41687],[56.173489,42.41782],[56.17289,42.41898],[56.172581,42.42009],[56.172379,42.421188],[56.170639,42.432362],[56.169659,42.43837],[56.16935,42.441959],[56.165829,42.482651],[56.164501,42.491241],[56.159721,42.51355],[56.15876,42.520081],[56.159119,42.531361],[56.15947,42.544979],[56.160858,42.594921],[56.161251,42.60453],[56.16552,42.619999],[56.172901,42.646759],[56.173481,42.649509],[56.178452,42.65913],[56.191662,42.686031],[56.19186,42.686432],[56.193371,42.689461],[56.196049,42.695148],[56.196758,42.698891],[56.197948,42.70261],[56.218712,42.76685],[56.220501,42.772598],[56.221661,42.77668],[56.223629,42.782749],[56.224579,42.78558],[56.226028,42.789421],[56.226971,42.792339],[56.22842,42.79681],[56.229061,42.798882],[56.23,42.802238],[56.230999,42.805901],[56.24231,42.84774],[56.242371,42.84795],[56.249691,42.874859],[56.256721,42.90099],[56.260399,42.91436],[56.26405,42.927792],[56.27478,42.967529],[56.275219,42.969231],[56.27552,42.970509],[56.275791,42.971901],[56.275982,42.973129],[56.27615,42.97443],[56.27631,42.976299],[56.276451,42.978531],[56.276951,42.98867],[56.277401,42.998749],[56.278488,43.02235],[56.280121,43.058609],[56.2817,43.09417],[56.28487,43.16291],[56.285,43.165661],[56.28511,43.16753],[56.286179,43.19146],[56.28981,43.27335],[56.293308,43.355141],[56.293659,43.3633],[56.298222,43.473461],[56.298351,43.476559],[56.298439,43.478661],[56.30085,43.538639],[56.300961,43.541592],[56.301022,43.542969],[56.30117,43.54668],[56.301609,43.557201],[56.301689,43.559189],[56.301788,43.56168],[56.302059,43.56789],[56.302711,43.58334],[56.30302,43.590809],[56.303028,43.59116],[56.303051,43.591572],[56.303471,43.601101],[56.304211,43.618938],[56.304508,43.625919],[56.304779,43.63308],[56.30534,43.648609],[56.305931,43.66502],[56.3064,43.678478],[56.306499,43.681099],[56.306599,43.684059],[56.30685,43.690491],[56.306889,43.691631],[56.30698,43.693989],[56.307541,43.709881],[56.308159,43.726921],[56.308701,43.742699],[56.308842,43.746109],[56.308861,43.74688],[56.309269,43.759121],[56.309689,43.770309],[56.309891,43.77544],[56.31036,43.788029],[56.31041,43.78923],[56.31052,43.79203],[56.31076,43.798061],[56.310822,43.799671],[56.310879,43.800941],[56.31118,43.808899],[56.311352,43.81353],[56.311588,43.819901],[56.31181,43.825691],[56.311871,43.826111],[56.311878,43.82626],[56.311951,43.828098],[56.312481,43.84042],[56.312481,43.84058],[56.3125,43.84108],[56.312569,43.84277],[56.312729,43.846748],[56.312771,43.847858],[56.312908,43.851131],[56.313179,43.858212],[56.313381,43.86322],[56.313339,43.86388],[56.31329,43.864182],[56.31319,43.864399],[56.31303,43.864601],[56.312889,43.864811],[56.312809,43.86499],[56.312752,43.865238],[56.312729,43.86554],[56.31271,43.865829],[56.312649,43.866119],[56.312569,43.866451],[56.312401,43.86694],[56.31234,43.867142],[56.31226,43.867359],[56.312019,43.868],[56.31189,43.868252],[56.311749,43.868431],[56.311569,43.86861],[56.311371,43.868721],[56.31123,43.86879],[56.311039,43.868851],[56.310219,43.869301],[56.309959,43.869438],[56.308971,43.86998],[56.30854,43.870209],[56.307701,43.87067],[56.30727,43.870861],[56.306358,43.871262],[56.30381,43.872391],[56.30378,43.87241],[56.302429,43.873341],[56.301121,43.874241],[56.300819,43.874489],[56.300529,43.874741],[56.30027,43.87495],[56.299419,43.875721],[56.298512,43.876701],[56.296959,43.878609],[56.29636,43.87933],[56.296249,43.879471],[56.295639,43.880219],[56.292381,43.884319],[56.29105,43.88586],[56.290588,43.886318],[56.290161,43.886688],[56.289589,43.887131],[56.288311,43.88802],[56.285702,43.889679],[56.28524,43.890011],[56.284592,43.890591],[56.284111,43.89122],[56.283798,43.891769],[56.283489,43.89238],[56.283249,43.89304],[56.282909,43.894009],[56.28241,43.895481],[56.28233,43.895679],[56.282242,43.895889],[56.282108,43.896191],[56.281689,43.896961],[56.281368,43.897442],[56.280849,43.898109],[56.279018,43.900459],[56.277939,43.90184],[56.275742,43.904671],[56.275139,43.905418],[56.273869,43.907001],[56.271389,43.910061],[56.27079,43.910809],[56.27037,43.91135],[56.26947,43.912491],[56.268799,43.913399],[56.267921,43.914761],[56.26685,43.916649],[56.265621,43.918991],[56.26532,43.919529],[56.265091,43.919971],[56.26498,43.92017],[56.264561,43.92083],[56.26289,43.923988],[56.259861,43.9296],[56.258461,43.93219],[56.257511,43.93396],[56.25581,43.937119],[56.255291,43.93811],[56.25526,43.93816],[56.254051,43.940411],[56.253658,43.94112],[56.25359,43.94136],[56.247311,43.952999],[56.24699,43.953442],[56.246658,43.954079],[56.246319,43.954781],[56.2458,43.956051],[56.245468,43.956982],[56.245251,43.957668],[56.244961,43.95874],[56.244759,43.959629],[56.244659,43.96011],[56.24461,43.960312],[56.244431,43.96151],[56.244259,43.9632],[56.24329,43.969559],[56.242779,43.972801],[56.242569,43.974159],[56.241779,43.979431],[56.24115,43.98365],[56.240299,43.989269],[56.240002,43.991211],[56.239479,43.994652],[56.239391,43.995251],[56.239059,43.997501],[56.238861,43.998791],[56.23848,44.001282],[56.237991,44.00481],[56.237598,44.007809],[56.236511,44.016102],[56.23597,44.020561],[56.235611,44.023499],[56.23531,44.025822],[56.235142,44.027859],[56.234989,44.029701],[56.234871,44.031559],[56.234852,44.033421],[56.234821,44.035389],[56.234798,44.037701],[56.234859,44.039421],[56.23494,44.041561],[56.234959,44.042831],[56.23494,44.04459],[56.234901,44.046188],[56.234798,44.04805],[56.234711,44.04911],[56.234631,44.050011],[56.234371,44.052341],[56.234089,44.054321],[56.23373,44.056801],[56.233471,44.058552],[56.233158,44.060539],[56.232841,44.062511],[56.232368,44.064899],[56.23204,44.066311],[56.231579,44.067959],[56.230968,44.06966],[56.230179,44.071381],[56.22961,44.07238],[56.229092,44.07309],[56.228531,44.073719],[56.22784,44.074341],[56.227322,44.07473],[56.22718,44.074841],[56.226452,44.07531],[56.225849,44.07563],[56.225422,44.07584],[56.224709,44.076099],[56.224461,44.07616],[56.224079,44.076279],[56.222832,44.076618],[56.222149,44.076801],[56.221401,44.077],[56.221279,44.07703],[56.221031,44.077099],[56.219299,44.077549],[56.218559,44.077789],[56.218239,44.0779],[56.21714,44.078289],[56.216202,44.07869],[56.214901,44.07935],[56.213631,44.080139],[56.212791,44.080719],[56.2122,44.0812],[56.21196,44.081409],[56.210991,44.08226],[56.209549,44.084049],[56.208542,44.085522],[56.20752,44.087189],[56.206581,44.088951],[56.20557,44.091019],[56.204281,44.093899],[56.202381,44.098438],[56.200378,44.103588],[56.1991,44.10717],[56.19838,44.109509],[56.197811,44.111912],[56.197239,44.11475],[56.196892,44.116421],[56.19648,44.11845],[56.1959,44.120911],[56.195431,44.122639],[56.19519,44.12355],[56.194889,44.124451],[56.194031,44.126621],[56.19368,44.127392],[56.192139,44.130371],[56.184631,44.1441],[56.18375,44.145748],[56.183289,44.14687],[56.18206,44.149559],[56.181019,44.151909],[56.18055,44.152851],[56.180149,44.153339],[56.179749,44.153751],[56.179279,44.154121],[56.178768,44.15432],[56.17852,44.1544],[56.17807,44.154442],[56.17754,44.154362],[56.1758,44.153782],[56.17519,44.15361],[56.174358,44.1534],[56.172741,44.153111],[56.171921,44.153011],[56.170971,44.153091],[56.1702,44.153309],[56.169479,44.15358],[56.167912,44.154518],[56.167179,44.154819],[56.166439,44.155022],[56.165722,44.15506],[56.164558,44.154861],[56.162151,44.154259],[56.16098,44.154011],[56.16011,44.153992],[56.15934,44.154072],[56.159271,44.154091],[56.158569,44.154289],[56.157799,44.154652],[56.15654,44.155418],[56.154202,44.156952],[56.152458,44.158081],[56.152191,44.15826],[56.151131,44.158859],[56.150391,44.15918],[56.149712,44.15934],[56.148991,44.159351],[56.14843,44.159248],[56.147739,44.159031],[56.146961,44.15876],[56.14455,44.15778],[56.142811,44.157021],[56.14106,44.156429],[56.139969,44.156181],[56.13829,44.15604],[56.13681,44.15617],[56.13583,44.156361],[56.134491,44.156769],[56.132931,44.157539],[56.131821,44.158249],[56.130699,44.159069],[56.128441,44.161259],[56.12693,44.162819],[56.126362,44.163399],[56.12606,44.163509],[56.12534,44.163601],[56.125229,44.163601],[56.12508,44.163631],[56.124931,44.163719],[56.12479,44.163849],[56.12468,44.16404],[56.124569,44.164322],[56.124561,44.164581],[56.12447,44.165009],[56.124352,44.16531],[56.124161,44.165581],[56.11639,44.172829],[56.114761,44.175751],[56.114281,44.18227],[56.113708,44.20322],[56.118099,44.20797],[56.120731,44.212132],[56.122238,44.217312],[56.123001,44.221142],[56.124619,44.233261],[56.124748,44.236141],[56.124519,44.23875],[56.123379,44.245941],[56.123192,44.248219],[56.123291,44.25174],[56.123562,44.253281],[56.123821,44.254478],[56.124229,44.25581],[56.124779,44.257179],[56.125118,44.257881],[56.125809,44.259491],[56.126011,44.260029],[56.126171,44.260712],[56.126259,44.261318],[56.126282,44.26189],[56.12627,44.26244],[56.12616,44.263191],[56.125919,44.264118],[56.125099,44.265911],[56.124939,44.2663],[56.124069,44.267879],[56.123779,44.26833],[56.12331,44.26902],[56.122421,44.270199],[56.12162,44.271191],[56.119259,44.273941],[56.118172,44.275181],[56.116798,44.276749],[56.116131,44.277519],[56.116051,44.277611],[56.110699,44.283699],[56.110271,44.284191],[56.109791,44.284729],[56.109711,44.28484],[56.10701,44.287941],[56.106419,44.288818],[56.105862,44.289761],[56.105419,44.290649],[56.105,44.29166],[56.10062,44.3041],[56.100159,44.305382],[56.099739,44.306492],[56.099602,44.306808],[56.099461,44.307152],[56.099281,44.307499],[56.09911,44.3078],[56.09856,44.308731],[56.098141,44.309391],[56.097229,44.31078],[56.096748,44.311501],[56.096439,44.311989],[56.096069,44.312691],[56.095699,44.313511],[56.09544,44.314381],[56.095169,44.315392],[56.09502,44.316132],[56.094589,44.31863],[56.094391,44.319469],[56.094189,44.32019],[56.093269,44.323238],[56.092361,44.326302],[56.092079,44.327221],[56.091511,44.32906],[56.09087,44.33099],[56.089882,44.33382],[56.08746,44.34079],[56.085609,44.346218],[56.08498,44.348091],[56.078499,44.367161],[56.07822,44.367901],[56.0779,44.368568],[56.077641,44.369019],[56.077221,44.369598],[56.076939,44.36993],[56.07653,44.370312],[56.076092,44.37064],[56.075611,44.37093],[56.07449,44.37151],[56.072449,44.37249],[56.07077,44.37331],[56.070179,44.3736],[56.06971,44.373821],[56.06889,44.374222],[56.06757,44.374809],[56.06712,44.37505],[56.066761,44.375278],[56.06636,44.37561],[56.066021,44.375938],[56.06572,44.376289],[56.065331,44.376808],[56.06496,44.37743],[56.064522,44.378269],[56.06411,44.37928],[56.06295,44.382271],[56.061211,44.386551],[56.06065,44.38792],[56.060341,44.388691],[56.059681,44.390308],[56.058399,44.393452],[56.05621,44.3988],[56.048389,44.418091],[56.046501,44.422661],[56.046261,44.423382],[56.04607,44.42403],[56.045879,44.42485],[56.0457,44.425869],[56.045631,44.426609],[56.045601,44.427601],[56.04567,44.43103],[56.045658,44.43306],[56.045601,44.433769],[56.045422,44.43491],[56.045189,44.43594],[56.044868,44.43692],[56.04438,44.438099],[56.043289,44.44075],[56.042999,44.441589],[56.042721,44.442501],[56.042519,44.443401],[56.04229,44.444969],[56.04158,44.452389],[56.040192,44.46664],[56.03883,44.480659],[56.038719,44.481689],[56.03862,44.48259],[56.038479,44.483471],[56.0383,44.48428],[56.03804,44.485199],[56.032162,44.502251],[56.031761,44.503448],[56.03149,44.50462],[56.031231,44.505871],[56.031078,44.50705],[56.030899,44.510342],[56.029461,44.545521],[56.028801,44.55407],[56.028011,44.56155],[56.02747,44.568169],[56.027908,44.584888],[56.027229,44.601978],[56.027962,44.60656],[56.02803,44.60738],[56.028179,44.608879],[56.027988,44.613171],[56.02737,44.620541],[56.026791,44.622929],[56.025871,44.624432],[56.025089,44.624889],[56.023769,44.625179],[56.01659,44.625172],[56.015221,44.62529],[56.014061,44.625511],[56.01297,44.625832],[56.011951,44.626362],[56.007408,44.628609],[56.006721,44.629009],[56.0061,44.62944],[56.005871,44.629589],[56.005348,44.630001],[56.004879,44.63052],[56.004238,44.631302],[56.003769,44.631981],[56.002949,44.633129],[56.001518,44.635151],[55.99966,44.63776],[55.998241,44.63979],[55.99741,44.640949],[55.99712,44.641411],[55.996738,44.642159],[55.996521,44.642689],[55.996262,44.643299],[55.996029,44.64399],[55.99559,44.645599],[55.995281,44.647511],[55.995129,44.649059],[55.994919,44.652161],[55.994518,44.658161],[55.99395,44.666309],[55.993889,44.667858],[55.9939,44.66943],[55.998219,44.71011],[55.998539,44.712761],[55.998741,44.713772],[55.999039,44.71479],[55.99942,44.715759],[56,44.71698],[56.00106,44.719109],[56.00182,44.720669],[56.002209,44.721561],[56.00251,44.722279],[56.002708,44.7229],[56.002911,44.72369],[56.003139,44.72504],[56.00322,44.72617],[56.003151,44.72768],[56.002838,44.730659],[56.00259,44.734131],[56.001751,44.74255],[56.00153,44.744381],[56.00132,44.74527],[56.00106,44.745949],[56.00074,44.74662],[55.999279,44.748779],[55.992989,44.757961],[55.990791,44.761318],[55.99033,44.762321],[55.990009,44.76318],[55.989819,44.764069],[55.989719,44.76498],[55.9897,44.765968],[55.99073,44.773331],[55.992962,44.788288],[55.997372,44.81881],[55.997601,44.820049],[55.99781,44.82066],[55.999069,44.823261],[56.004459,44.834709],[56.005829,44.837769],[56.006161,44.83881],[56.006748,44.841309],[56.011189,44.860889],[56.011292,44.861591],[56.011341,44.862282],[56.011372,44.863121],[56.011292,44.86404],[56.01112,44.864929],[56.01088,44.865551],[56.009129,44.869228],[56.008862,44.870022],[56.008659,44.87093],[56.008221,44.873871],[56.005791,44.88974],[56.005718,44.890362],[56.005669,44.890942],[56.005661,44.891472],[56.00568,44.89201],[56.005779,44.89299],[56.007172,44.900478],[56.010979,44.920929],[56.011169,44.922211],[56.011269,44.923309],[56.01128,44.924629],[56.011219,44.925812],[56.01107,44.92696],[56.01088,44.928028],[56.01038,44.92984],[56.009178,44.934361],[56.00882,44.936081],[56.00861,44.93779],[56.008499,44.939602],[56.00845,44.941158],[56.008499,44.94244],[56.008629,44.943741],[56.016418,44.996269],[56.016571,44.997238],[56.016651,44.998199],[56.016651,44.999229],[56.016579,45.000408],[56.01646,45.001598],[56.015572,45.008961],[56.014961,45.014542],[56.01482,45.015701],[56.01453,45.018242],[56.013649,45.026249],[56.013618,45.02721],[56.013519,45.03426],[56.013458,45.039619],[56.0135,45.04118],[56.013618,45.042728],[56.013851,45.044189],[56.01667,45.059238],[56.016972,45.061581],[56.017262,45.06358],[56.017792,45.06654],[56.01825,45.068859],[56.01857,45.069988],[56.019001,45.071701],[56.019669,45.07513],[56.021061,45.082458],[56.021461,45.084579],[56.022079,45.087971],[56.022369,45.089191],[56.023079,45.09153],[56.032928,45.121109],[56.033489,45.122829],[56.03371,45.1236],[56.03389,45.12447],[56.033981,45.125229],[56.034012,45.125919],[56.033951,45.140442],[56.033981,45.141682],[56.03405,45.142712],[56.034149,45.143501],[56.034302,45.14452],[56.03447,45.14547],[56.036381,45.15469],[56.037941,45.162331],[56.03825,45.163601],[56.038639,45.164841],[56.04472,45.18079],[56.0452,45.182331],[56.045761,45.18428],[56.046219,45.18568],[56.05463,45.209648],[56.055241,45.21146],[56.056541,45.215519],[56.05685,45.216721],[56.05695,45.21751],[56.056931,45.218281],[56.056839,45.219101],[56.055882,45.224049],[56.055679,45.224819],[56.05537,45.225571],[56.055038,45.226059],[56.054619,45.226501],[56.052269,45.22813],[56.05188,45.228588],[56.051609,45.228958],[56.051338,45.229519],[56.051128,45.230221],[56.050152,45.234531],[56.050018,45.235241],[56.04998,45.235939],[56.049992,45.236629],[56.050049,45.237339],[56.050549,45.241348],[56.050812,45.24242],[56.05117,45.243542],[56.054352,45.252941],[56.054729,45.254261],[56.057491,45.26442],[56.057732,45.265572],[56.057899,45.266819],[56.06147,45.302731],[56.06155,45.30365],[56.061569,45.3046],[56.06155,45.305679],[56.059879,45.333832],[56.059811,45.334759],[56.05975,45.335331],[56.05962,45.335831],[56.059311,45.336651],[56.05505,45.3456],[56.054668,45.346481],[56.054428,45.347198],[56.054138,45.348209],[56.053459,45.350941],[56.048328,45.371361],[56.045738,45.383511],[56.045441,45.385231],[56.045231,45.386841],[56.045151,45.388439],[56.045139,45.390099],[56.045349,45.412231],[56.04546,45.416229],[56.045818,45.427399],[56.04599,45.433071],[56.046089,45.43544],[56.046261,45.43782],[56.048069,45.462238],[56.048229,45.464199],[56.048649,45.4678],[56.04969,45.476719],[56.049881,45.478939],[56.050049,45.481541],[56.05159,45.50951],[56.05167,45.511181],[56.051689,45.512569],[56.051651,45.513699],[56.051338,45.521839],[56.051022,45.52972],[56.05093,45.531212],[56.050331,45.5387],[56.050159,45.542641],[56.04998,45.547421],[56.049931,45.549541],[56.049801,45.556591],[56.04974,45.558392],[56.049622,45.559582],[56.04945,45.560902],[56.042751,45.60685],[56.042622,45.608101],[56.042542,45.609371],[56.0425,45.610531],[56.042519,45.611721],[56.043781,45.639339],[56.043911,45.642521],[56.043968,45.64629],[56.043991,45.648689],[56.044109,45.65126],[56.044941,45.669449],[56.046001,45.69286],[56.047169,45.718689],[56.047298,45.721008],[56.047428,45.72295],[56.04747,45.723801],[56.047531,45.72514],[56.047611,45.72768],[56.047642,45.729301],[56.047729,45.73056],[56.047878,45.732529],[56.0481,45.73505],[56.049339,45.76276],[56.05212,45.825199],[56.052471,45.833271],[56.052521,45.834949],[56.052521,45.83625],[56.052479,45.837379],[56.052319,45.83881],[56.05183,45.8419],[56.05162,45.843281],[56.051498,45.844559],[56.05138,45.84687],[56.05125,45.8498],[56.051159,45.851379],[56.050831,45.854912],[56.050701,45.856312],[56.049992,45.862358],[56.049831,45.864239],[56.049709,45.86623],[56.049679,45.86813],[56.049728,45.876091],[56.049679,45.88908],[56.04977,45.914181],[56.04974,45.917419],[56.049679,45.918701],[56.049541,45.919899],[56.04932,45.921299],[56.049019,45.9226],[56.04644,45.932362],[56.043549,45.943329],[56.040409,45.955261],[56.038261,45.96336],[56.03299,45.983471],[56.031689,45.988319],[56.03056,45.99202],[56.029942,45.994209],[56.029259,45.997021],[56.02877,45.999298],[56.02837,46.0009],[56.027851,46.002811],[56.027481,46.00399],[56.027149,46.005001],[56.024632,46.011688],[56.0242,46.01265],[56.023731,46.01347],[56.023338,46.013981],[56.022781,46.014511],[56.013191,46.021309],[56.01276,46.021709],[56.01244,46.02203],[56.012001,46.022621],[56.010399,46.025391],[56.000919,46.041672],[56.000729,46.042179],[56.000549,46.042931],[56.0005,46.043468],[56.000519,46.044189],[56.001808,46.052929],[56.00206,46.05484],[56.002281,46.057281],[56.002369,46.059891],[56.002361,46.062141],[56.0023,46.06382],[56.00206,46.06641],[56.001732,46.06881],[56.00156,46.07061],[56.001492,46.071232],[56.001389,46.07185],[56.001308,46.072269],[56.001221,46.072941],[56.00119,46.07328],[56.00116,46.07373],[56.001141,46.073952],[56.001122,46.074341],[56.001099,46.074928],[56.001091,46.075539],[56.00108,46.076149],[56.001049,46.076752],[56.00053,46.083248],[55.999199,46.09798],[55.99498,46.14637],[55.994808,46.148331],[55.99472,46.149422],[55.994701,46.149609],[55.99176,46.183311],[55.991692,46.18539],[55.991638,46.186008],[55.991428,46.188259],[55.991402,46.19009],[55.991539,46.191662],[55.991871,46.193192],[55.99226,46.19455],[55.99284,46.195869],[55.993382,46.196812],[55.99437,46.198441],[55.995071,46.199669],[55.999889,46.20805],[56.00531,46.217491],[56.023251,46.24873],[56.02623,46.251999],[56.0299,46.251999],[56.03352,46.251999],[56.035919,46.251999],[56.037731,46.254398],[56.038311,46.25835],[56.039459,46.27895],[56.041672,46.29525],[56.046558,46.307789],[56.048191,46.31345],[56.048672,46.31723],[56.04723,46.332329],[56.04541,46.343491],[56.041759,46.352589],[56.041859,46.360661],[56.043789,46.388691],[56.043659,46.392811],[56.043491,46.39859],[56.043449,46.401878],[56.043591,46.405979],[56.04475,46.41238],[56.046619,46.41885],[56.053459,46.44117],[56.05431,46.446171],[56.054729,46.451389],[56.054611,46.45636],[56.05423,46.461418],[56.05331,46.47226],[56.053188,46.473629],[56.053181,46.474159],[56.053089,46.481258],[56.052898,46.485489],[56.052528,46.489059],[56.052441,46.49054],[56.05159,46.49752],[56.0509,46.50153],[56.049671,46.506149],[56.04829,46.509941],[56.046009,46.515419],[56.04472,46.51873],[56.044022,46.521999],[56.043678,46.529739],[56.04335,46.53318],[56.042351,46.53688],[56.035011,46.55698],[56.033741,46.56041],[56.032841,46.563221],[56.032211,46.565639],[56.031391,46.57016],[56.029469,46.585281],[56.028889,46.595551],[56.028278,46.6063],[56.027569,46.619801],[56.027309,46.626148],[56.027309,46.627911],[56.027512,46.629749],[56.027939,46.632141],[56.02964,46.639069],[56.031391,46.645939],[56.033852,46.656311],[56.034889,46.660709],[56.035099,46.66254],[56.036781,46.69265],[56.037251,46.697632],[56.0387,46.703979],[56.0387,46.707932],[56.037731,46.721489],[56.039558,46.728699],[56.042339,46.737801],[56.04314,46.746071],[56.04319,46.748631],[56.042961,46.750309],[56.041538,46.754669],[56.040661,46.758701],[56.040581,46.759079],[56.040421,46.759769],[56.03957,46.765049],[56.03772,46.77631],[56.036991,46.780369],[56.0368,46.78244],[56.036869,46.786209],[56.0392,46.803761],[56.039871,46.80917],[56.039822,46.810558],[56.038109,46.81823],[56.036789,46.824089],[56.036869,46.82579],[56.03714,46.826839],[56.038311,46.831009],[56.03957,46.835312],[56.041149,46.839378],[56.04311,46.844231],[56.043839,46.846352],[56.04438,46.848721],[56.045879,46.855339],[56.04665,46.8587],[56.047611,46.86174],[56.047932,46.86235],[56.049171,46.864792],[56.050739,46.868031],[56.05175,46.870609],[56.055851,46.88237],[56.05761,46.887409],[56.062759,46.901951],[56.064739,46.907742],[56.065029,46.90863],[56.06554,46.910461],[56.066238,46.912868],[56.066681,46.91515],[56.067039,46.91732],[56.067291,46.920391],[56.067451,46.923191],[56.067589,46.927719],[56.067719,46.931561],[56.068031,46.935589],[56.068279,46.938339],[56.068352,46.942348],[56.068211,46.946701],[56.068069,46.948849],[56.067928,46.951],[56.067291,46.957489],[56.06702,46.962231],[56.06741,46.966591],[56.070992,46.979061],[56.072788,46.985001],[56.07473,46.98983],[56.076599,46.994331],[56.078522,46.998268],[56.08009,46.9995],[56.08173,47.000271],[56.086712,47.000271],[56.09016,47.000099],[56.093441,47.00481],[56.09473,47.007542],[56.095901,47.010571],[56.097309,47.017738],[56.098011,47.021351],[56.099701,47.029541],[56.100319,47.031738],[56.10128,47.034081],[56.103828,47.039719],[56.105461,47.043171],[56.105839,47.043861],[56.106319,47.045059],[56.10738,47.05011],[56.107681,47.0527],[56.1077,47.055019],[56.107552,47.0574],[56.10709,47.06049],[56.1063,47.063309],[56.105301,47.065731],[56.101891,47.073051],[56.09856,47.08017],[56.097729,47.08242],[56.096951,47.085232],[56.095699,47.090679],[56.095421,47.092789],[56.095249,47.096661],[56.095261,47.102612],[56.095139,47.104542],[56.09481,47.107121],[56.094398,47.109299],[56.09375,47.11121],[56.093029,47.11285],[56.091702,47.11507],[56.091091,47.116089],[56.091,47.116241],[56.089619,47.118511],[56.085571,47.125172],[56.08503,47.125961],[56.084919,47.12611],[56.084301,47.126968],[56.082741,47.12915],[56.082001,47.130772],[56.081478,47.132332],[56.08107,47.13361],[56.08086,47.134651],[56.080711,47.135799],[56.080631,47.136902],[56.08065,47.137569],[56.0807,47.13879],[56.080799,47.140129],[56.080929,47.142139],[56.081001,47.145439],[56.080872,47.14772],[56.08075,47.149818],[56.079498,47.161301],[56.07925,47.163631],[56.07827,47.1726],[56.07814,47.17382],[56.07724,47.18169],[56.07579,47.192719],[56.07357,47.20916],[56.073471,47.20993],[56.073029,47.213341],[56.07275,47.215809],[56.072189,47.223049],[56.071972,47.22517],[56.071758,47.226429],[56.071571,47.227032],[56.071289,47.227921],[56.070801,47.228939],[56.070629,47.229309],[56.069908,47.23064],[56.068779,47.23275],[56.067348,47.235401],[56.06498,47.239841],[56.064011,47.242249],[56.063122,47.244579],[56.062851,47.245441],[56.062271,47.247372],[56.06118,47.251011],[56.056301,47.26749],[56.054482,47.273621],[56.053581,47.27618],[56.05265,47.278511],[56.05154,47.280701],[56.050781,47.282139],[56.05019,47.283138],[56.04969,47.283932],[56.048931,47.285118],[56.048679,47.285511],[56.04755,47.287201],[56.047009,47.287998],[56.04649,47.288818],[56.045841,47.289921],[56.044739,47.291401],[56.04414,47.291889],[56.042969,47.292278],[56.04179,47.292721],[56.039879,47.29364],[56.038231,47.294399],[56.037552,47.294621],[56.037109,47.294861],[56.03508,47.29686],[56.034489,47.29744],[56.03326,47.298691],[56.031361,47.300598],[56.030918,47.30106],[56.028469,47.303589],[56.027229,47.30484],[56.026321,47.305721],[56.025711,47.306198],[56.025188,47.306469],[56.023659,47.306641],[56.022579,47.306549],[56.02203,47.306499],[56.020481,47.306591],[56.019878,47.306801],[56.015999,47.308731],[56.01519,47.30917],[56.014252,47.309811],[56.01292,47.311291],[56.012001,47.31255],[56.006481,47.320141],[56.001209,47.327278],[55.999889,47.329128],[55.99604,47.335972],[55.995331,47.337238],[55.993549,47.340099],[55.991451,47.342548],[55.98999,47.34383],[55.988159,47.345169],[55.986809,47.346241],[55.981941,47.349789],[55.980881,47.35088],[55.979839,47.352501],[55.97887,47.3545],[55.977589,47.357769],[55.976109,47.361542],[55.975159,47.363609],[55.974258,47.36512],[55.973839,47.365681],[55.973351,47.36636],[55.972488,47.367199],[55.971161,47.368111],[55.967972,47.369289],[55.955429,47.373619],[55.954979,47.373798],[55.953979,47.37418],[55.952679,47.374729],[55.94875,47.376019],[55.946899,47.376781],[55.945938,47.377571],[55.943161,47.380451],[55.940948,47.38271],[55.939751,47.384411],[55.936741,47.389381],[55.935101,47.391281],[55.933262,47.392971],[55.93121,47.394451],[55.929211,47.395889],[55.927551,47.39724],[55.926399,47.398449],[55.9226,47.403091],[55.921741,47.404148],[55.920528,47.405579],[55.918819,47.40807],[55.91716,47.41069],[55.916698,47.411671],[55.916309,47.412498],[55.914101,47.418381],[55.913441,47.41946],[55.912418,47.420738],[55.908581,47.424839],[55.90633,47.426651],[55.901878,47.42955],[55.901161,47.430031],[55.895618,47.433651],[55.894421,47.434689],[55.892799,47.43697],[55.88855,47.443161],[55.888069,47.443851],[55.887871,47.44413],[55.88583,47.446899],[55.883289,47.45002],[55.88179,47.4515],[55.880421,47.452499],[55.879139,47.45322],[55.875099,47.455521],[55.873589,47.456379],[55.87035,47.45821],[55.867191,47.460121],[55.865879,47.460709],[55.864021,47.461391],[55.862419,47.46183],[55.86158,47.462151],[55.861351,47.462231],[55.859638,47.46286],[55.859451,47.462879],[55.859299,47.46291],[55.859112,47.462898],[55.85899,47.46286],[55.858898,47.46283],[55.858799,47.46283],[55.858669,47.462811],[55.858521,47.46286],[55.858379,47.462978],[55.85828,47.463181],[55.858189,47.463459],[55.85804,47.463772],[55.857811,47.46413],[55.856998,47.46505],[55.856281,47.466],[55.855221,47.467789],[55.854542,47.46933],[55.853779,47.471619],[55.853168,47.474701],[55.852329,47.47958],[55.851681,47.483719],[55.851299,47.48711],[55.851219,47.49049],[55.85128,47.498058],[55.851151,47.502029],[55.845791,47.519192],[55.838692,47.54253],[55.83746,47.545639],[55.83424,47.549709],[55.822781,47.554779],[55.822071,47.555401],[55.8214,47.55621],[55.82056,47.557529],[55.819908,47.55875],[55.819012,47.560822],[55.815189,47.571041],[55.81255,47.578011],[55.812,47.579971],[55.81171,47.581741],[55.81152,47.583],[55.811409,47.584469],[55.811451,47.59251],[55.811501,47.600479],[55.81134,47.603279],[55.81094,47.605721],[55.809799,47.61113],[55.809341,47.612709],[55.808788,47.614182],[55.807251,47.617229],[55.805641,47.62014],[55.804741,47.622139],[55.804001,47.624081],[55.796421,47.655689],[55.790298,47.67799],[55.790199,47.687599],[55.78907,47.721489],[55.788929,47.727829],[55.788792,47.732651],[55.788681,47.737221],[55.788841,47.739471],[55.788872,47.739948],[55.789661,47.75219],[55.791161,47.77618],[55.79425,47.819092],[55.796959,47.839352],[55.798401,47.845871],[55.799179,47.85342],[55.803902,47.910759],[55.809399,47.984749],[55.811138,48.006031],[55.809589,48.024609],[55.808731,48.035042],[55.808239,48.037788],[55.805061,48.045681],[55.796379,48.063881],[55.795891,48.068169],[55.79628,48.075378],[55.796959,48.099411],[55.797729,48.12001],[55.79744,48.122929],[55.79174,48.140961],[55.79081,48.14307],[55.787991,48.147861],[55.786129,48.151039],[55.785351,48.153011],[55.784908,48.154751],[55.784889,48.157612],[55.783482,48.167641],[55.783218,48.17033],[55.782959,48.17271],[55.78307,48.175579],[55.783562,48.181591],[55.7841,48.18906],[55.78397,48.1908],[55.7836,48.191669],[55.78286,48.19384],[55.78233,48.19453],[55.781609,48.194939],[55.77676,48.197281],[55.775921,48.197571],[55.774609,48.197338],[55.769562,48.195862],[55.767288,48.19524],[55.767208,48.195221],[55.766178,48.195019],[55.764969,48.195171],[55.763771,48.195541],[55.762272,48.19659],[55.76128,48.197472],[55.75486,48.20602],[55.754292,48.206829],[55.753349,48.20816],[55.751961,48.21014],[55.750992,48.212811],[55.748829,48.221031],[55.74847,48.222401],[55.74749,48.226292],[55.746792,48.228279],[55.745819,48.230492],[55.740162,48.241928],[55.736431,48.249859],[55.735241,48.252369],[55.734249,48.255829],[55.734001,48.25742],[55.73391,48.258011],[55.733479,48.260769],[55.733292,48.263561],[55.73196,48.28344],[55.729641,48.31657],[55.728531,48.33514],[55.726929,48.358971],[55.726551,48.365829],[55.727131,48.378361],[55.727901,48.391411],[55.728291,48.399479],[55.726261,48.420422],[55.72374,48.442909],[55.723259,48.449261],[55.72435,48.473381],[55.724442,48.475319],[55.724609,48.479351],[55.724628,48.479721],[55.724689,48.481239],[55.72472,48.481918],[55.724812,48.4837],[55.725609,48.501598],[55.726059,48.513119],[55.725769,48.521702],[55.723808,48.537479],[55.72298,48.544708],[55.722809,48.546188],[55.722778,48.546421],[55.722511,48.548721],[55.72242,48.549431],[55.72216,48.551521],[55.720852,48.56385],[55.71925,48.587608],[55.718788,48.594051],[55.71841,48.600231],[55.718651,48.60326],[55.71933,48.60606],[55.720329,48.608978],[55.721291,48.6115],[55.721859,48.61425],[55.722092,48.617691],[55.721741,48.621189],[55.720551,48.624641],[55.71751,48.632191],[55.71529,48.637199],[55.71262,48.64547],[55.710941,48.65123],[55.709511,48.659721],[55.709011,48.666119],[55.709049,48.672401],[55.70961,48.679729],[55.713921,48.70715],[55.71434,48.709961],[55.717049,48.726921],[55.720501,48.741638],[55.7239,48.750832],[55.726299,48.75732],[55.72715,48.759762],[55.73185,48.77322],[55.736031,48.781219],[55.73642,48.781841],[55.737579,48.783642],[55.738392,48.784809],[55.739342,48.786091],[55.740749,48.788021],[55.745781,48.794651],[55.75082,48.8013],[55.751629,48.80241],[55.752258,48.80331],[55.7528,48.804081],[55.756809,48.809929],[55.75943,48.813789],[55.76038,48.815289],[55.761608,48.817402],[55.76215,48.818352],[55.76366,48.821548],[55.76429,48.822929],[55.767189,48.830311],[55.767399,48.830799],[55.76833,48.832699],[55.769058,48.833981],[55.769821,48.835091],[55.770969,48.836609],[55.77169,48.837471],[55.77243,48.838051],[55.773232,48.838661],[55.774052,48.839119],[55.775669,48.839828],[55.776451,48.840069],[55.77763,48.84024],[55.77924,48.840401],[55.780281,48.84042],[55.78125,48.840401],[55.78252,48.84037],[55.79047,48.840889],[55.79126,48.840981],[55.79628,48.84124],[55.810371,48.842041],[55.81245,48.842159],[55.81451,48.842449],[55.817261,48.843128],[55.81889,48.843719],[55.82074,48.84462],[55.82346,48.8461],[55.824162,48.846531],[55.825279,48.84721],[55.826191,48.847801],[55.82811,48.848751],[55.82967,48.849312],[55.831299,48.849709],[55.842369,48.85191],[55.85397,48.854259],[55.857552,48.854969],[55.858131,48.855091],[55.858681,48.855209],[55.86179,48.85582],[55.862728,48.85601],[55.86491,48.85643],[55.866829,48.856758],[55.867088,48.856812],[55.86832,48.857052],[55.87402,48.85825],[55.874458,48.858341],[55.875801,48.85862],[55.87849,48.859192],[55.879089,48.859379],[55.879398,48.859482],[55.88028,48.859791],[55.881779,48.86042],[55.88269,48.86084],[55.883381,48.86121],[55.883549,48.861309],[55.884319,48.861851],[55.885052,48.86253],[55.885811,48.863361],[55.886429,48.86414],[55.886959,48.86504],[55.887611,48.866402],[55.889069,48.86982],[55.894341,48.882118],[55.89912,48.893269],[55.899479,48.89418],[55.899811,48.895111],[55.899948,48.895519],[55.900108,48.896061],[55.900341,48.896919],[55.900639,48.898281],[55.900841,48.899288],[55.90115,48.901321],[55.901241,48.90221],[55.90131,48.903439],[55.901371,48.908951],[55.901489,48.934219],[55.901569,48.94532],[55.901619,48.94698],[55.901718,48.94865],[55.901871,48.950539],[55.90263,48.958179],[55.903069,48.962841],[55.9035,48.96714],[55.903839,48.96991],[55.904228,48.972649],[55.904598,48.975201],[55.904678,48.975761],[55.904968,48.977859],[55.905239,48.98037],[55.905411,48.98254],[55.90551,48.984798],[55.90564,48.996738],[55.905651,48.997532],[55.905701,49.000679],[55.905739,49.002041],[55.905849,49.004139],[55.90646,49.01107],[55.90659,49.01252],[55.906952,49.016472],[55.907299,49.021412],[55.907688,49.028358],[55.90789,49.031841],[55.908131,49.03532],[55.909142,49.048611],[55.91011,49.061829],[55.91058,49.0681],[55.91304,49.10125],[55.913399,49.105782],[55.91375,49.108921],[55.914108,49.111359],[55.915451,49.11953],[55.917259,49.13028],[55.917542,49.13213],[55.917751,49.13401],[55.917919,49.136051],[55.918011,49.138062],[55.918079,49.140659],[55.918079,49.140942],[55.918079,49.141891],[55.91806,49.14267],[55.918011,49.143711],[55.91785,49.14669],[55.91774,49.14798],[55.917671,49.148739],[55.91758,49.149448],[55.9175,49.15007],[55.91737,49.150928],[55.917122,49.15247],[55.91684,49.153858],[55.916649,49.1548],[55.916538,49.155289],[55.916382,49.15575],[55.91571,49.157372],[55.91449,49.15987],[55.914261,49.160358],[55.913288,49.162361],[55.913029,49.16288],[55.91275,49.163441],[55.911339,49.166302],[55.909439,49.17012],[55.90852,49.171951],[55.907379,49.17429],[55.90675,49.175739],[55.9063,49.177059],[55.906059,49.177879],[55.903801,49.187191],[55.90324,49.189468],[55.902882,49.19091],[55.90094,49.197899],[55.899979,49.20108],[55.897701,49.208038],[55.89743,49.20879],[55.896938,49.210251],[55.896599,49.211151],[55.896229,49.212002],[55.895828,49.212769],[55.895222,49.21386],[55.891121,49.220089],[55.88998,49.22205],[55.889542,49.22287],[55.88913,49.223881],[55.887421,49.229141],[55.887131,49.230061],[55.88678,49.231129],[55.885368,49.235481],[55.883381,49.241539],[55.88155,49.247051],[55.880661,49.249741],[55.880192,49.25145],[55.879341,49.255569],[55.87923,49.256111],[55.879009,49.257191],[55.87899,49.25724],[55.878139,49.261341],[55.877831,49.262829],[55.875278,49.275089],[55.874748,49.277889],[55.874599,49.279041],[55.87447,49.280949],[55.874432,49.281898],[55.874409,49.282921],[55.874451,49.286308],[55.874409,49.287281],[55.874321,49.288139],[55.874249,49.288631],[55.874149,49.289082],[55.873909,49.28989],[55.87376,49.290329],[55.873589,49.290722],[55.87318,49.291531],[55.872768,49.292179],[55.868851,49.297501],[55.864491,49.303478],[55.864029,49.304119],[55.863571,49.304741],[55.8629,49.305691],[55.862179,49.306919],[55.8615,49.30843],[55.861099,49.30941],[55.86034,49.311329],[55.856941,49.320042],[55.855289,49.3242],[55.85498,49.32497],[55.854019,49.327141],[55.852772,49.329521],[55.8521,49.330669],[55.85125,49.33194],[55.849388,49.334419],[55.84597,49.33873],[55.845089,49.339859],[55.842171,49.343578],[55.841888,49.343948],[55.839329,49.347221],[55.83844,49.348289],[55.837448,49.349178],[55.83709,49.349449],[55.83672,49.34967],[55.835918,49.350029],[55.835232,49.350281],[55.8344,49.350449],[55.833851,49.350479],[55.833279,49.35046],[55.827381,49.349319],[55.82436,49.348759],[55.820412,49.347988],[55.817551,49.347408],[55.814449,49.34679],[55.80788,49.345421],[55.806519,49.34499],[55.805069,49.34449],[55.80228,49.34269],[55.801941,49.342461],[55.801262,49.341991],[55.800152,49.34124],[55.79987,49.34111],[55.79977,49.341061],[55.798828,49.34063],[55.79855,49.34053],[55.797771,49.340229],[55.796341,49.33971],[55.795601,49.339581],[55.79493,49.33939],[55.794128,49.339191],[55.79306,49.338909],[55.790668,49.338329],[55.78896,49.338009],[55.787819,49.337959],[55.786671,49.338039],[55.7854,49.33828],[55.784168,49.338711],[55.7826,49.339481],[55.781071,49.340549],[55.77916,49.342152],[55.777271,49.34399],[55.775661,49.345612],[55.770809,49.350368],[55.768848,49.352299],[55.766171,49.354881],[55.764488,49.356651],[55.76366,49.35759],[55.762871,49.35865],[55.761959,49.360008],[55.761108,49.361549],[55.760429,49.363079],[55.75985,49.36475],[55.759171,49.367229],[55.75901,49.367901],[55.75864,49.369801],[55.758389,49.371201],[55.75779,49.375252],[55.757118,49.379761],[55.756821,49.38129],[55.7565,49.382751],[55.7561,49.384159],[55.755611,49.38562],[55.755081,49.386921],[55.75423,49.388512],[55.75375,49.389259],[55.753201,49.38998],[55.75185,49.391521],[55.750408,49.392879],[55.74662,49.396191],[55.74567,49.396999],[55.74464,49.397919],[55.742962,49.399429],[55.73914,49.402771],[55.737881,49.4039],[55.736629,49.405258],[55.735451,49.406811],[55.734341,49.40852],[55.733452,49.410141],[55.732689,49.41172],[55.731949,49.41349],[55.73106,49.416012],[55.72821,49.42469],[55.72747,49.426868],[55.72681,49.429169],[55.726109,49.432178],[55.72559,49.435211],[55.723309,49.454868],[55.721859,49.467388],[55.721828,49.468811],[55.721088,49.475471],[55.72084,49.47847],[55.72049,49.48299],[55.720322,49.48457],[55.71999,49.486889],[55.719212,49.491779],[55.71891,49.494171],[55.717731,49.504021],[55.715759,49.51825],[55.715542,49.520241],[55.715351,49.522381],[55.71505,49.526329],[55.714691,49.529739],[55.714272,49.53249],[55.713779,49.535],[55.712921,49.539001],[55.71228,49.543491],[55.711769,49.546242],[55.711349,49.548149],[55.710831,49.550201],[55.710312,49.55209],[55.70977,49.553822],[55.709358,49.55508],[55.708321,49.557899],[55.707878,49.559269],[55.70607,49.565182],[55.704769,49.56871],[55.703491,49.57159],[55.70248,49.57373],[55.700901,49.577671],[55.698959,49.58271],[55.698479,49.58408],[55.698391,49.584381],[55.697769,49.58646],[55.697399,49.588139],[55.697121,49.589901],[55.696781,49.593609],[55.69672,49.596779],[55.696941,49.60041],[55.69894,49.620121],[55.699268,49.623772],[55.699329,49.626282],[55.699429,49.63052],[55.699188,49.635651],[55.699131,49.636211],[55.698631,49.6409],[55.697899,49.645988],[55.697361,49.6493],[55.696671,49.652451],[55.695919,49.655079],[55.694691,49.658611],[55.6931,49.662861],[55.692421,49.66433],[55.686729,49.673569],[55.68568,49.675289],[55.682789,49.680199],[55.681389,49.682941],[55.680019,49.68642],[55.677219,49.69487],[55.676929,49.695751],[55.67514,49.701241],[55.674641,49.702789],[55.673882,49.70512],[55.67276,49.708469],[55.671028,49.713631],[55.670712,49.714882],[55.670368,49.716511],[55.670109,49.718151],[55.66991,49.719311],[55.669762,49.721729],[55.669689,49.725491],[55.66991,49.728981],[55.670898,49.735821],[55.67218,49.744549],[55.676151,49.77142],[55.677071,49.778099],[55.677879,49.78434],[55.679729,49.806068],[55.680698,49.81786],[55.68087,49.821381],[55.680851,49.824558],[55.680698,49.82822],[55.680328,49.832458],[55.67968,49.837151],[55.678848,49.840969],[55.67778,49.84499],[55.675209,49.852699],[55.669899,49.868599],[55.66441,49.884682],[55.662361,49.890949],[55.661579,49.89394],[55.661129,49.896309],[55.66074,49.898891],[55.6605,49.901852],[55.66032,49.90493],[55.66037,49.908569],[55.66069,49.91169],[55.6618,49.924728],[55.661781,49.929359],[55.661308,49.934101],[55.66082,49.93692],[55.660252,49.939541],[55.65942,49.942471],[55.652618,49.964859],[55.650421,49.9725],[55.650299,49.972931],[55.646881,49.98391],[55.64555,49.98941],[55.644489,49.996422],[55.644161,50.000069],[55.644138,50.000751],[55.644032,50.004379],[55.644161,50.009281],[55.64423,50.010761],[55.645821,50.02383],[55.649719,50.05447],[55.653332,50.083469],[55.65374,50.08638],[55.654129,50.088669],[55.654652,50.091179],[55.655239,50.093651],[55.656609,50.098728],[55.657021,50.100281],[55.65707,50.100449],[55.661041,50.11528],[55.663261,50.123562],[55.664349,50.12772],[55.665371,50.13192],[55.668301,50.14389],[55.669769,50.149879],[55.670509,50.15292],[55.67086,50.15456],[55.67112,50.15593],[55.67136,50.157249],[55.671612,50.159081],[55.672039,50.162979],[55.672371,50.166901],[55.67392,50.186131],[55.6749,50.19799],[55.67572,50.20845],[55.67588,50.20982],[55.676208,50.212551],[55.676651,50.215321],[55.676979,50.217072],[55.67733,50.218658],[55.678268,50.22224],[55.681259,50.23251],[55.684158,50.24255],[55.687481,50.253929],[55.690571,50.264641],[55.691029,50.266361],[55.691422,50.268101],[55.691738,50.269581],[55.692032,50.271111],[55.692532,50.274361],[55.696041,50.307381],[55.696362,50.31065],[55.696678,50.313869],[55.69672,50.31422],[55.697319,50.32008],[55.697498,50.322521],[55.697578,50.324661],[55.697609,50.32692],[55.697601,50.328941],[55.697521,50.330891],[55.697411,50.33284],[55.697239,50.334782],[55.69635,50.344231],[55.695911,50.348961],[55.695419,50.354191],[55.69521,50.356339],[55.690521,50.406368],[55.688931,50.423382],[55.68734,50.440971],[55.686909,50.447571],[55.686771,50.45068],[55.686459,50.468208],[55.686249,50.480068],[55.68605,50.492432],[55.685509,50.524719],[55.685299,50.53756],[55.685349,50.540649],[55.685429,50.54372],[55.68549,50.54525],[55.685581,50.54636],[55.686039,50.549801],[55.686821,50.554131],[55.687618,50.558208],[55.688141,50.561829],[55.68832,50.563541],[55.688499,50.566299],[55.68853,50.568859],[55.688549,50.570358],[55.688499,50.572529],[55.688351,50.57476],[55.68792,50.579449],[55.68745,50.583328],[55.68634,50.59124],[55.685959,50.593609],[55.685711,50.594891],[55.685169,50.596901],[55.684582,50.598881],[55.68396,50.60078],[55.683239,50.602749],[55.682251,50.605331],[55.681309,50.607971],[55.680618,50.610081],[55.68,50.61237],[55.679581,50.614182],[55.67915,50.616341],[55.678841,50.618198],[55.678539,50.620289],[55.67601,50.641548],[55.675159,50.648911],[55.675049,50.650261],[55.6749,50.652691],[55.674831,50.654949],[55.67482,50.657501],[55.67487,50.65955],[55.674999,50.662289],[55.67524,50.66497],[55.675529,50.667419],[55.675892,50.669891],[55.676929,50.675911],[55.677311,50.67804],[55.677631,50.679859],[55.678249,50.683979],[55.678711,50.687851],[55.678951,50.690338],[55.679119,50.692928],[55.679279,50.696079],[55.679291,50.699471],[55.677898,50.740601],[55.677589,50.748569],[55.677399,50.75116],[55.67709,50.753811],[55.676601,50.757061],[55.675961,50.760399],[55.675301,50.763119],[55.674541,50.7659],[55.6731,50.77002],[55.67226,50.77206],[55.670979,50.774719],[55.657162,50.800831],[55.653919,50.80698],[55.652611,50.80941],[55.651291,50.812],[55.65049,50.813931],[55.64954,50.81675],[55.648701,50.82],[55.64806,50.823479],[55.64769,50.826519],[55.64753,50.82851],[55.647369,50.83252],[55.646912,50.845772],[55.64653,50.855751],[55.645721,50.876942],[55.645618,50.87822],[55.64547,50.879902],[55.645351,50.88089],[55.64489,50.883621],[55.64452,50.88567],[55.644138,50.887661],[55.64341,50.89093],[55.641479,50.897221],[55.640289,50.90099],[55.63921,50.90485],[55.638802,50.906441],[55.638439,50.90807],[55.63805,50.910309],[55.637718,50.912609],[55.63747,50.91502],[55.637211,50.918209],[55.63657,50.928921],[55.636181,50.935612],[55.63575,50.943008],[55.635681,50.94548],[55.6357,50.948002],[55.63588,50.951729],[55.636238,50.955761],[55.636669,50.958931],[55.64035,50.980049],[55.642658,50.9935],[55.64296,50.995331],[55.643372,50.99828],[55.643719,51.00169],[55.64389,51.00452],[55.643951,51.007172],[55.643959,51.00975],[55.643959,51.012459],[55.644058,51.045509],[55.644169,51.047729],[55.64426,51.049591],[55.64455,51.051651],[55.64481,51.052929],[55.645081,51.054119],[55.645432,51.055191],[55.645721,51.055988],[55.646141,51.056919],[55.64666,51.057919],[55.647259,51.05896],[55.648029,51.060108],[55.64978,51.062431],[55.651482,51.064861],[55.652489,51.066429],[55.65332,51.068008],[55.654209,51.07019],[55.654709,51.07193],[55.655071,51.073841],[55.65519,51.07539],[55.655231,51.076809],[55.655201,51.07851],[55.654999,51.08028],[55.654659,51.082531],[55.65414,51.085091],[55.653461,51.08786],[55.652431,51.091888],[55.652142,51.093651],[55.651909,51.095669],[55.651859,51.09763],[55.651951,51.098869],[55.652279,51.100891],[55.652721,51.102619],[55.65324,51.104309],[55.655621,51.110699],[55.656132,51.112202],[55.656609,51.11422],[55.65707,51.11644],[55.65733,51.118481],[55.65736,51.119492],[55.657299,51.123192],[55.6572,51.124001],[55.656769,51.127159],[55.656479,51.128868],[55.655319,51.134979],[55.65453,51.139481],[55.65419,51.14172],[55.653759,51.145229],[55.653679,51.14616],[55.65345,51.149071],[55.653511,51.152081],[55.65374,51.15472],[55.654388,51.158871],[55.65506,51.16201],[55.65617,51.16552],[55.660042,51.17598],[55.661221,51.179111],[55.66349,51.186131],[55.665001,51.19173],[55.665798,51.195229],[55.66663,51.19968],[55.667809,51.207119],[55.66964,51.221359],[55.671249,51.234001],[55.671398,51.235371],[55.6717,51.2383],[55.67186,51.240551],[55.671921,51.242199],[55.671921,51.243191],[55.671909,51.244572],[55.67178,51.24646],[55.671631,51.247921],[55.671429,51.249191],[55.671162,51.250542],[55.670811,51.251888],[55.670368,51.2533],[55.6693,51.25629],[55.66856,51.258011],[55.665871,51.263908],[55.665352,51.265091],[55.66431,51.2677],[55.66396,51.268631],[55.663422,51.270229],[55.663052,51.271381],[55.662579,51.273159],[55.66235,51.27433],[55.662182,51.275089],[55.6619,51.27692],[55.66177,51.277821],[55.661591,51.279369],[55.661449,51.281639],[55.661331,51.284241],[55.66127,51.286369],[55.661259,51.287922],[55.661282,51.293129],[55.661301,51.295361],[55.661388,51.30225],[55.66135,51.304352],[55.661129,51.308788],[55.660969,51.311001],[55.660889,51.31181],[55.66048,51.314831],[55.660172,51.316669],[55.656269,51.33997],[55.65115,51.370121],[55.650101,51.376541],[55.64996,51.37743],[55.64954,51.37999],[55.64949,51.38031],[55.64912,51.38258],[55.648979,51.383911],[55.64893,51.384609],[55.648899,51.386002],[55.64896,51.387772],[55.649071,51.389061],[55.64941,51.39122],[55.649799,51.393108],[55.650059,51.39418],[55.650391,51.39518],[55.65134,51.396999],[55.65202,51.398102],[55.652679,51.398991],[55.653431,51.399872],[55.656631,51.402611],[55.657398,51.403191],[55.658329,51.403831],[55.661049,51.405479],[55.66185,51.406189],[55.66246,51.406811],[55.66296,51.407379],[55.66349,51.40807],[55.663818,51.40855],[55.66394,51.40873],[55.664612,51.40992],[55.665001,51.41077],[55.66539,51.4118],[55.66584,51.41317],[55.666321,51.414791],[55.66888,51.423191],[55.66972,51.4259],[55.67144,51.43161],[55.671909,51.433189],[55.672352,51.43462],[55.677689,51.452171],[55.67905,51.45612],[55.680439,51.459789],[55.68087,51.4608],[55.682091,51.463509],[55.6828,51.465],[55.68573,51.470791],[55.688469,51.476189],[55.689339,51.477989],[55.690701,51.481079],[55.690971,51.481758],[55.69199,51.48439],[55.693562,51.48893],[55.695011,51.493679],[55.695518,51.495628],[55.695889,51.497108],[55.70332,51.531422],[55.706501,51.5462],[55.706989,51.548721],[55.7075,51.55143],[55.708221,51.555592],[55.70882,51.559441],[55.709221,51.562199],[55.709591,51.565022],[55.7099,51.567551],[55.710339,51.571621],[55.711189,51.58115],[55.71254,51.596439],[55.712711,51.599602],[55.712811,51.60178],[55.712841,51.60294],[55.712849,51.60466],[55.712799,51.607578],[55.7122,51.624611],[55.712151,51.62603],[55.712101,51.627251],[55.711441,51.644531],[55.711319,51.64764],[55.711281,51.650318],[55.711288,51.652691],[55.711349,51.655529],[55.711559,51.659061],[55.7117,51.66074],[55.71188,51.662609],[55.712219,51.665421],[55.71246,51.66711],[55.71402,51.676769],[55.71463,51.679581],[55.715221,51.681911],[55.71693,51.687439],[55.718941,51.69244],[55.719601,51.694069],[55.720299,51.695671],[55.721561,51.698292],[55.721901,51.69891],[55.722099,51.699261],[55.72261,51.700039],[55.723381,51.701118],[55.72575,51.70401],[55.726799,51.705551],[55.727711,51.70739],[55.73074,51.71487],[55.731682,51.717339],[55.732731,51.72094],[55.73333,51.723331],[55.733871,51.725269],[55.734291,51.726639],[55.735668,51.730011],[55.736431,51.731579],[55.737579,51.733879],[55.738319,51.735439],[55.738831,51.736679],[55.739491,51.73859],[55.739899,51.739891],[55.74033,51.741421],[55.742481,51.75071],[55.743118,51.753731],[55.746429,51.768318],[55.748341,51.776112],[55.752659,51.790218],[55.759251,51.811508],[55.7607,51.815601],[55.762489,51.819321],[55.764339,51.822701],[55.766369,51.82571],[55.772129,51.832142],[55.77663,51.837151],[55.778831,51.839802],[55.780842,51.842659],[55.782471,51.84565],[55.78384,51.848549],[55.785179,51.851929],[55.786469,51.855801],[55.787449,51.859379],[55.788342,51.86385],[55.79689,51.908421],[55.797081,51.909882],[55.797611,51.916401],[55.79763,51.918541],[55.79763,51.9207],[55.7976,51.92284],[55.797409,51.927021],[55.797329,51.928532],[55.79726,51.930019],[55.797081,51.93383],[55.7971,51.934799],[55.79718,51.936218],[55.797249,51.937019],[55.797352,51.937721],[55.797501,51.938511],[55.79768,51.939339],[55.79784,51.93996],[55.797989,51.940491],[55.798161,51.941002],[55.798321,51.941448],[55.79866,51.942322],[55.79887,51.942741],[55.799332,51.9436],[55.799671,51.944172],[55.807259,51.956848],[55.807739,51.957722],[55.808239,51.95879],[55.808701,51.959949],[55.808979,51.96093],[55.813591,51.980122],[55.813961,51.981949],[55.814171,51.983379],[55.81432,51.985371],[55.814339,51.98695],[55.814251,51.998631],[55.814232,52.000389],[55.813709,52.06361],[55.81366,52.069031],[55.813648,52.070789],[55.81361,52.075951],[55.813301,52.108681],[55.81324,52.11496],[55.81319,52.1203],[55.813122,52.121632],[55.812851,52.123539],[55.812431,52.125431],[55.811821,52.12714],[55.811001,52.128849],[55.80444,52.139221],[55.803692,52.140442],[55.783829,52.171841],[55.783279,52.17284],[55.782768,52.174129],[55.782219,52.176041],[55.781929,52.17728],[55.781521,52.179192],[55.781361,52.18087],[55.781311,52.182621],[55.781311,52.183571],[55.781399,52.185379],[55.781429,52.186661],[55.781429,52.188091],[55.781399,52.188881],[55.78133,52.189789],[55.78125,52.190899],[55.781189,52.191502],[55.781132,52.192032],[55.78101,52.19265],[55.780819,52.193741],[55.780529,52.194908],[55.780361,52.195518],[55.78014,52.19622],[55.779881,52.196972],[55.779598,52.19767],[55.77927,52.19833],[55.778961,52.198971],[55.778599,52.199551],[55.77718,52.202],[55.77422,52.207008],[55.771309,52.211922],[55.76897,52.215889],[55.76841,52.216808],[55.766151,52.2206],[55.765202,52.222229],[55.759621,52.23164],[55.75816,52.234112],[55.757721,52.234821],[55.756699,52.236328],[55.75634,52.236832],[55.755852,52.2374],[55.755569,52.237671],[55.755348,52.237869],[55.75518,52.237999],[55.754238,52.238701],[55.75383,52.23904],[55.753559,52.239319],[55.7533,52.239639],[55.752312,52.240871],[55.751579,52.241791],[55.75127,52.242111],[55.75106,52.24229],[55.750519,52.242691],[55.749741,52.24321],[55.73579,52.251579],[55.727631,52.256451],[55.725208,52.2579],[55.72377,52.258781],[55.7234,52.25906],[55.722851,52.25956],[55.720501,52.262089],[55.720291,52.262321],[55.717449,52.265339],[55.71051,52.273041],[55.709721,52.273708],[55.709179,52.274078],[55.708549,52.274391],[55.703751,52.276489],[55.69817,52.278881],[55.69619,52.27977],[55.695301,52.280201],[55.693359,52.281471],[55.692009,52.282261],[55.69125,52.282619],[55.690701,52.282829],[55.690102,52.28297],[55.689499,52.283031],[55.689041,52.283051],[55.68858,52.28299],[55.68829,52.282959],[55.687962,52.282848],[55.68729,52.2826],[55.686741,52.282341],[55.68317,52.279949],[55.682301,52.279339],[55.682011,52.279148],[55.681671,52.278999],[55.681419,52.27898],[55.681149,52.27903],[55.68087,52.27919],[55.68074,52.279301],[55.680401,52.279739],[55.680061,52.280331],[55.679749,52.28075],[55.679111,52.281368],[55.67849,52.28191],[55.677841,52.282661],[55.677471,52.283279],[55.675369,52.28727],[55.674358,52.289181],[55.673279,52.29121],[55.673019,52.291721],[55.672562,52.292591],[55.672119,52.29343],[55.670609,52.296329],[55.67033,52.29686],[55.668861,52.299648],[55.66848,52.300381],[55.668339,52.30064],[55.667721,52.301811],[55.667461,52.30241],[55.667068,52.303429],[55.66674,52.304699],[55.666561,52.30563],[55.666439,52.30658],[55.66637,52.30748],[55.66637,52.308411],[55.666401,52.309368],[55.66655,52.310638],[55.666729,52.311661],[55.6674,52.314411],[55.668072,52.317181],[55.6684,52.318241],[55.668812,52.319221],[55.67284,52.32666],[55.675659,52.33189],[55.67635,52.33313],[55.676819,52.333981],[55.677719,52.335609],[55.677879,52.335911],[55.68063,52.340981],[55.68615,52.351101],[55.690151,52.35844],[55.69622,52.369579],[55.69659,52.370281],[55.696629,52.370338],[55.699631,52.375858],[55.69989,52.376339],[55.700821,52.37804],[55.70174,52.379749],[55.701801,52.379841],[55.702808,52.38171],[55.7033,52.382549],[55.703899,52.383709],[55.704239,52.384331],[55.704979,52.385731],[55.705872,52.387321],[55.707142,52.389622],[55.707169,52.389671],[55.707378,52.39027],[55.70742,52.39061],[55.707409,52.39093],[55.707371,52.39156],[55.707409,52.392189],[55.707409,52.39275],[55.707321,52.39315],[55.707191,52.393452],[55.706982,52.39381],[55.706039,52.39542],[55.705978,52.395531],[55.70512,52.396999],[55.704239,52.398479],[55.70282,52.400879],[55.701019,52.403938],[55.70005,52.405579],[55.69923,52.406952],[55.697472,52.40995],[55.696301,52.411949],[55.69445,52.415131],[55.68821,52.4258],[55.68763,52.42662],[55.68729,52.426929],[55.686039,52.427731],[55.685669,52.428059],[55.68531,52.428501],[55.68504,52.428982],[55.68483,52.429401],[55.684631,52.430019],[55.684139,52.43232],[55.68396,52.432941],[55.683769,52.433361],[55.68354,52.43383],[55.682079,52.436249],[55.67815,52.44297],[55.67725,52.444481],[55.676971,52.44495],[55.67622,52.446251],[55.675152,52.448051],[55.674011,52.45002],[55.670921,52.455299],[55.67057,52.455898],[55.670471,52.456181],[55.670429,52.45647],[55.67049,52.456779],[55.670609,52.457119],[55.67086,52.4576],[55.678631,52.471859],[55.682621,52.479179],[55.685921,52.485222],[55.685619,52.485741],[55.685261,52.486542],[55.685101,52.486881],[55.684761,52.487549],[55.682831,52.49123],[55.679352,52.497681],[55.677639,52.50095],[55.67712,52.50198],[55.67664,52.503071],[55.676079,52.504501],[55.675571,52.505939],[55.675209,52.50713],[55.67466,52.509109],[55.673908,52.511829],[55.673679,52.512699],[55.673489,52.513561],[55.67337,52.51432],[55.673328,52.514912],[55.673271,52.516418],[55.673241,52.517658],[55.67305,52.523499],[55.67292,52.528938],[55.67281,52.532299],[55.672661,52.537601],[55.6726,52.538269],[55.672451,52.539371],[55.672199,52.54076],[55.671501,52.543941],[55.670971,52.545891],[55.669621,52.54969],[55.667969,52.554371],[55.66539,52.563148],[55.66473,52.564739],[55.66301,52.56778],[55.662319,52.569321],[55.66164,52.571339],[55.658588,52.58429],[55.65654,52.593121],[55.655369,52.597691],[55.654362,52.601082],[55.65126,52.60873],[55.64576,52.622341],[55.643822,52.62743],[55.643391,52.628719],[55.643169,52.630539],[55.643108,52.63242],[55.64323,52.634209],[55.64381,52.641621],[55.645309,52.66272],[55.645321,52.665001],[55.645222,52.667549],[55.64325,52.682449],[55.642529,52.68782],[55.639309,52.712391],[55.637852,52.722641],[55.63607,52.733749],[55.635971,52.73761],[55.636169,52.743118],[55.636471,52.751598],[55.63649,52.754292],[55.636131,52.761169],[55.636269,52.7631],[55.63707,52.766842],[55.637798,52.77449],[55.63829,52.77763],[55.642929,52.80006],[55.643501,52.805939],[55.644241,52.815681],[55.644779,52.822552],[55.645939,52.83707],[55.646069,52.838692],[55.64642,52.84306],[55.64658,52.846931],[55.64695,52.849682],[55.64827,52.855042],[55.648991,52.85799],[55.65287,52.873421],[55.653889,52.876011],[55.65781,52.884899],[55.660789,52.892078],[55.661629,52.894821],[55.670052,52.921558],[55.674309,52.934212],[55.67485,52.935478],[55.682678,52.952129],[55.68465,52.958199],[55.691521,52.978222],[55.692421,52.981289],[55.69302,52.983971],[55.693562,52.987148],[55.694321,52.993038],[55.697681,53.011028],[55.69928,53.01918],[55.704781,53.040829],[55.70789,53.052311],[55.710011,53.059601],[55.710178,53.060631],[55.71014,53.061729],[55.709648,53.064369],[55.70866,53.068539],[55.70723,53.072842],[55.704472,53.079929],[55.702789,53.08424],[55.699131,53.093811],[55.694149,53.106819],[55.692871,53.110142],[55.676922,53.151619],[55.668449,53.173512],[55.660149,53.195129],[55.65966,53.196121],[55.650101,53.21085],[55.637341,53.230019],[55.628769,53.23912],[55.62315,53.245098],[55.619541,53.248459],[55.61657,53.250809],[55.613331,53.253071],[55.61142,53.255001],[55.60989,53.256939],[55.608349,53.259449],[55.60717,53.261848],[55.604401,53.268929],[55.598129,53.284931],[55.594898,53.292999],[55.581131,53.328781],[55.564869,53.370869],[55.550812,53.406952],[55.550091,53.40863],[55.548779,53.41198],[55.547771,53.415569],[55.547058,53.419151],[55.546749,53.420689],[55.546619,53.422409],[55.54705,53.434429],[55.548222,53.464298],[55.548389,53.46764],[55.54985,53.48539],[55.549969,53.487419],[55.5499,53.488548],[55.549671,53.489529],[55.548119,53.49712],[55.546909,53.503609],[55.542259,53.530602],[55.542068,53.531681],[55.541752,53.53487],[55.5392,53.56073],[55.53825,53.570389],[55.537701,53.575939],[55.537392,53.57917],[55.537182,53.580139],[55.536591,53.582211],[55.53326,53.59341],[55.53297,53.594631],[55.530918,53.608089],[55.530819,53.609329],[55.53083,53.610641],[55.531311,53.619499],[55.531189,53.622349],[55.52932,53.64687],[55.526699,53.66592],[55.524429,53.682209],[55.52264,53.694988],[55.52021,53.711361],[55.516571,53.739811],[55.514339,53.75666],[55.513729,53.76046],[55.51334,53.76226],[55.512871,53.763851],[55.51223,53.765751],[55.509541,53.773739],[55.508492,53.777111],[55.502892,53.803589],[55.50111,53.811771],[55.494579,53.834061],[55.490639,53.84745],[55.490189,53.849079],[55.489601,53.852291],[55.489239,53.856819],[55.48904,53.864101],[55.488972,53.867031],[55.488731,53.870461],[55.48848,53.87254],[55.488159,53.875191],[55.48772,53.878819],[55.48727,53.880661],[55.48658,53.882549],[55.484219,53.88773],[55.48243,53.892479],[55.481289,53.895081],[55.47945,53.898918],[55.477989,53.901131],[55.474831,53.90564],[55.47131,53.911831],[55.467682,53.918968],[55.46714,53.92078],[55.466629,53.923649],[55.466049,53.92635],[55.465599,53.927929],[55.46487,53.929932],[55.462429,53.936199],[55.461441,53.938709],[55.460609,53.941231],[55.460091,53.95723],[55.459911,53.962921],[55.45985,53.964741],[55.46014,53.965679],[55.47105,53.991089],[55.471519,53.992229],[55.47184,53.99353],[55.475712,54.01577],[55.477589,54.025909],[55.47768,54.02668],[55.477581,54.027409],[55.476978,54.029301],[55.47562,54.033089],[55.472099,54.042679],[55.46788,54.054298],[55.467541,54.055519],[55.466969,54.062222],[55.466251,54.07093],[55.46756,54.08437],[55.468208,54.091629],[55.469379,54.104031],[55.46936,54.105049],[55.4678,54.12318],[55.466782,54.134659],[55.466579,54.13686],[55.466011,54.138771],[55.465939,54.14032],[55.465542,54.151291],[55.465172,54.16132],[55.464439,54.181629],[55.464352,54.183262],[55.464069,54.18449],[55.46048,54.194721],[55.459839,54.19688],[55.458569,54.201759],[55.45583,54.212189],[55.45314,54.222198],[55.452351,54.22514],[55.450249,54.235771],[55.44936,54.240509],[55.448101,54.2467],[55.445122,54.260769],[55.443291,54.26936],[55.441669,54.277119],[55.440521,54.28236],[55.439941,54.285179],[55.43869,54.291149],[55.43848,54.292141],[55.437771,54.29549],[55.437672,54.29628],[55.437771,54.297291],[55.439812,54.306301],[55.440399,54.30888],[55.440369,54.309509],[55.44022,54.31002],[55.439949,54.31076],[55.438702,54.314041],[55.438412,54.315071],[55.438278,54.31609],[55.43832,54.317341],[55.438801,54.32312],[55.43996,54.328449],[55.440269,54.330811],[55.440929,54.33857],[55.441071,54.341572],[55.44125,54.354111],[55.44125,54.35651],[55.441471,54.37236],[55.441689,54.39426],[55.441898,54.396351],[55.443249,54.399651],[55.44857,54.412609],[55.453491,54.424721],[55.457619,54.434971],[55.459049,54.438339],[55.464409,54.449371],[55.472149,54.465191],[55.472691,54.466339],[55.473259,54.46796],[55.479778,54.48851],[55.48167,54.494282],[55.482269,54.4963],[55.482269,54.49688],[55.482208,54.497639],[55.480141,54.523861],[55.480061,54.52449],[55.479851,54.52504],[55.47739,54.529381],[55.477249,54.529961],[55.477139,54.531151],[55.476219,54.541729],[55.474201,54.56496],[55.472179,54.588112],[55.470009,54.602631],[55.46994,54.603722],[55.470009,54.60487],[55.47002,54.606098],[55.4697,54.607128],[55.466881,54.614262],[55.466309,54.615631],[55.465858,54.61721],[55.46109,54.641659],[55.45863,54.65427],[55.450989,54.692638],[55.448528,54.705078],[55.44825,54.706329],[55.447842,54.707321],[55.443432,54.714001],[55.44199,54.716171],[55.441441,54.717289],[55.44091,54.71899],[55.437439,54.732639],[55.436798,54.736691],[55.433289,54.762531],[55.429932,54.788712],[55.42807,54.804649],[55.42786,54.8064],[55.42186,54.808319],[55.415779,54.813831],[55.40538,54.82312],[55.403271,54.82542],[55.40086,54.828671],[55.397289,54.834862],[55.386391,54.854118],[55.380249,54.864861],[55.369701,54.8834],[55.358471,54.902908],[55.35318,54.912109],[55.351509,54.91544],[55.349781,54.919559],[55.342049,54.93811],[55.3386,54.946571],[55.336929,54.950459],[55.336231,54.951691],[55.334591,54.954632],[55.3298,54.96291],[55.312511,54.993309],[55.311871,54.994419],[55.308102,55.000999],[55.30405,55.008072],[55.3022,55.010731],[55.28294,55.035019],[55.279598,55.03928],[55.268822,55.05315],[55.267792,55.054459],[55.26683,55.05555],[55.265709,55.05661],[55.252621,55.067379],[55.25045,55.069149],[55.243279,55.07502],[55.224491,55.089691],[55.207741,55.103001],[55.199909,55.10997],[55.1982,55.111778],[55.19545,55.11475],[55.191879,55.118969],[55.19067,55.1203],[55.18932,55.12162],[55.186298,55.12389],[55.183521,55.125851],[55.181499,55.127331],[55.18042,55.128021],[55.179428,55.12838],[55.177521,55.12801],[55.16737,55.125011],[55.165501,55.124741],[55.164558,55.124889],[55.16367,55.125469],[55.16188,55.12706],[55.161518,55.127361],[55.160049,55.12886],[55.158371,55.131279],[55.155941,55.135269],[55.153461,55.1399],[55.15033,55.145969],[55.150051,55.146511],[55.149441,55.14777],[55.14867,55.149139],[55.14415,55.1558],[55.143341,55.15712],[55.142609,55.158779],[55.139751,55.16539],[55.138371,55.168598],[55.137951,55.169781],[55.1376,55.17123],[55.137371,55.173859],[55.1362,55.20266],[55.1362,55.205269],[55.13681,55.21809],[55.13707,55.223808],[55.137791,55.240391],[55.138359,55.25322],[55.138321,55.255421],[55.137699,55.262341],[55.136608,55.274231],[55.135632,55.28524],[55.135288,55.288342],[55.134731,55.2915],[55.133968,55.29459],[55.133099,55.297482],[55.132069,55.30043],[55.13176,55.301201],[55.131229,55.302311],[55.130878,55.30302],[55.12941,55.305309],[55.12796,55.307301],[55.126549,55.30899],[55.12381,55.311699],[55.11132,55.323582],[55.110668,55.324211],[55.108189,55.3265],[55.10717,55.327438],[55.105671,55.328819],[55.10144,55.332741],[55.09919,55.334999],[55.097191,55.336868],[55.09584,55.338089],[55.09359,55.34045],[55.092049,55.342411],[55.090729,55.344521],[55.089588,55.346729],[55.087269,55.35218],[55.08271,55.362839],[55.082249,55.36393],[55.081749,55.365261],[55.080891,55.36813],[55.080441,55.369781],[55.079609,55.37392],[55.07925,55.376831],[55.079079,55.37896],[55.079021,55.381001],[55.07909,55.384651],[55.079231,55.388241],[55.079262,55.388969],[55.079369,55.391682],[55.07935,55.394051],[55.07914,55.395279],[55.07906,55.395779],[55.078541,55.397449],[55.071011,55.4119],[55.0662,55.418678],[55.058552,55.429279],[55.056671,55.431881],[55.055168,55.433979],[55.054169,55.435371],[55.047668,55.444351],[55.043839,55.448471],[55.039921,55.452671],[55.036121,55.45673],[55.031078,55.462132],[55.02993,55.463169],[55.025261,55.46817],[55.022678,55.47121],[55.015419,55.479031],[55.011471,55.48325],[55.00721,55.487881],[55.005341,55.489841],[55.004292,55.490971],[55.00346,55.49194],[54.99976,55.498241],[54.998421,55.50032],[54.99715,55.502731],[54.995659,55.505291],[54.994041,55.508141],[54.992279,55.511211],[54.990582,55.51408],[54.990299,55.514549],[54.98629,55.521851],[54.985031,55.524109],[54.98386,55.526711],[54.982948,55.52956],[54.982239,55.53286],[54.981892,55.534679],[54.981621,55.536919],[54.9813,55.544868],[54.980869,55.552792],[54.980659,55.555901],[54.980492,55.557461],[54.980221,55.559052],[54.979321,55.562901],[54.97818,55.566582],[54.976959,55.569439],[54.975311,55.57222],[54.974522,55.573341],[54.973621,55.574402],[54.971722,55.576469],[54.971329,55.576859],[54.96925,55.57906],[54.96706,55.58123],[54.96434,55.583359],[54.963219,55.584129],[54.9617,55.584751],[54.960991,55.58493],[54.960312,55.585121],[54.95866,55.585331],[54.95718,55.585369],[54.955688,55.58519],[54.954731,55.58482],[54.95295,55.584179],[54.95126,55.583809],[54.94902,55.583092],[54.936508,55.579128],[54.929699,55.576931],[54.928501,55.576672],[54.927219,55.576641],[54.925781,55.57695],[54.924301,55.57769],[54.92363,55.578098],[54.922749,55.578892],[54.921341,55.580318],[54.920849,55.581131],[54.917332,55.586761],[54.912281,55.594929],[54.91058,55.598148],[54.909321,55.601109],[54.90807,55.604259],[54.907341,55.60648],[54.907028,55.607632],[54.906559,55.60955],[54.906288,55.611069],[54.904819,55.617901],[54.904518,55.619251],[54.904251,55.620491],[54.903919,55.623051],[54.90332,55.625488],[54.90237,55.628021],[54.89941,55.632771],[54.897282,55.636261],[54.895359,55.639481],[54.89484,55.640339],[54.893181,55.64394],[54.892159,55.646889],[54.891472,55.649391],[54.890732,55.652821],[54.88763,55.66811],[54.884869,55.681709],[54.88084,55.701359],[54.8797,55.707031],[54.879181,55.708351],[54.878559,55.709251],[54.877338,55.710411],[54.876289,55.710949],[54.875462,55.710911],[54.87104,55.70813],[54.868149,55.70644],[54.865608,55.705261],[54.86319,55.704411],[54.860741,55.703659],[54.859039,55.70335],[54.85738,55.70327],[54.85548,55.703381],[54.853649,55.703701],[54.851921,55.704239],[54.850761,55.704659],[54.849751,55.70525],[54.848782,55.70591],[54.84721,55.70734],[54.845921,55.708721],[54.844639,55.710331],[54.84071,55.715698],[54.836929,55.72089],[54.8363,55.72171],[54.834869,55.72319],[54.833141,55.72448],[54.83075,55.725441],[54.825741,55.726768],[54.824032,55.72728],[54.82127,55.728668],[54.819839,55.729481],[54.817902,55.73098],[54.81694,55.731861],[54.81477,55.734138],[54.812309,55.73679],[54.802979,55.746792],[54.800652,55.749561],[54.799351,55.751381],[54.79845,55.752991],[54.796921,55.75589],[54.795879,55.758228],[54.794369,55.761349],[54.79351,55.763039],[54.79216,55.76535],[54.79192,55.765701],[54.79015,55.768139],[54.787418,55.77142],[54.78384,55.775379],[54.782242,55.777538],[54.78157,55.77866],[54.780529,55.780682],[54.77985,55.782009],[54.77916,55.783081],[54.778511,55.783878],[54.777679,55.78474],[54.776909,55.78529],[54.775822,55.785759],[54.773682,55.785789],[54.767872,55.784031],[54.767189,55.783829],[54.763988,55.78289],[54.759991,55.781792],[54.75808,55.781342],[54.756199,55.781139],[54.754761,55.781101],[54.752392,55.781139],[54.750481,55.781422],[54.745941,55.782139],[54.742882,55.7826],[54.74194,55.782761],[54.737862,55.783428],[54.73595,55.783138],[54.73439,55.78228],[54.73304,55.78133],[54.727871,55.777618],[54.726528,55.777081],[54.72509,55.776852],[54.722149,55.776829],[54.716301,55.776749],[54.71484,55.776451],[54.713188,55.77586],[54.702301,55.769932],[54.701519,55.769451],[54.699902,55.768169],[54.698761,55.76675],[54.69836,55.76622],[54.697201,55.763741],[54.696548,55.762081],[54.694908,55.75774],[54.692669,55.752022],[54.692101,55.750641],[54.690891,55.748219],[54.689869,55.746479],[54.686829,55.74213],[54.682739,55.736439],[54.68071,55.733608],[54.67926,55.731918],[54.678429,55.73122],[54.677441,55.730518],[54.675678,55.72998],[54.67395,55.73003],[54.672249,55.730549],[54.667721,55.733021],[54.66748,55.733139],[54.665081,55.734409],[54.6642,55.734871],[54.66375,55.734989],[54.663479,55.73489],[54.663288,55.73465],[54.663139,55.734032],[54.66317,55.733631],[54.663349,55.733261],[54.66354,55.73307],[54.663929,55.73312],[54.664181,55.733551],[54.664421,55.734371],[54.664551,55.735081],[54.664921,55.737061],[54.66534,55.73914],[54.666069,55.743031],[54.67001,55.764301],[54.672119,55.77565],[54.673309,55.782028],[54.674702,55.79158],[54.67527,55.79491],[54.67614,55.799492],[54.676418,55.80175],[54.67643,55.802879],[54.67638,55.804379],[54.676319,55.80537],[54.676239,55.806561],[54.67598,55.809849],[54.675838,55.811871],[54.67556,55.81443],[54.67535,55.81543],[54.674171,55.820782],[54.672138,55.82967],[54.669331,55.841999],[54.66674,55.853401],[54.665531,55.858742],[54.6642,55.864491],[54.66288,55.870319],[54.66124,55.87759],[54.659679,55.8843],[54.65884,55.887218],[54.65807,55.88958],[54.657139,55.89201],[54.656559,55.893372],[54.655449,55.89584],[54.65424,55.89856],[54.65205,55.903351],[54.650982,55.905739],[54.649849,55.90834],[54.649391,55.90958],[54.648708,55.911469],[54.648022,55.913471],[54.647282,55.916161],[54.646801,55.918159],[54.6465,55.919479],[54.645939,55.922279],[54.645641,55.924271],[54.64521,55.926781],[54.6451,55.927639],[54.644539,55.930771],[54.64452,55.93137],[54.644321,55.932629],[54.644161,55.933701],[54.643681,55.937119],[54.643181,55.94035],[54.64291,55.942261],[54.642731,55.943569],[54.642559,55.94508],[54.642441,55.946609],[54.642399,55.947449],[54.642368,55.94833],[54.642349,55.949909],[54.64238,55.951591],[54.64246,55.95335],[54.64257,55.955132],[54.643391,55.967979],[54.643871,55.974979],[54.644112,55.9758],[54.645401,55.995911],[54.645649,55.999821],[54.64595,56.004421],[54.646801,56.017712],[54.64777,56.032749],[54.648731,56.047531],[54.649361,56.057251],[54.649399,56.057941],[54.650101,56.068951],[54.65044,56.074249],[54.650661,56.07782],[54.650669,56.078011],[54.650871,56.080952],[54.65089,56.081348],[54.65107,56.08419],[54.651089,56.08453],[54.651299,56.087551],[54.651409,56.08976],[54.652229,56.102268],[54.65279,56.10857],[54.653149,56.11108],[54.654079,56.115681],[54.654282,56.116501],[54.654678,56.118099],[54.655411,56.120739],[54.65723,56.127541],[54.659191,56.134892],[54.660511,56.139309],[54.662338,56.144741],[54.665249,56.153381],[54.66642,56.15691],[54.668629,56.16354],[54.672539,56.17519],[54.67445,56.180859],[54.675129,56.182831],[54.6763,56.185509],[54.677559,56.18787],[54.678829,56.18977],[54.681629,56.19302],[54.685379,56.1973],[54.687679,56.199921],[54.69323,56.206329],[54.69767,56.211479],[54.700779,56.21513],[54.70499,56.220051],[54.70713,56.222591],[54.70863,56.224312],[54.719292,56.236759],[54.72155,56.239792],[54.722988,56.242111],[54.724621,56.244949],[54.72646,56.248669],[54.728119,56.25267],[54.729301,56.255981],[54.730671,56.26046],[54.732208,56.266048],[54.73465,56.274929],[54.737309,56.284599],[54.740238,56.29528],[54.741459,56.299759],[54.742451,56.30331],[54.74308,56.305641],[54.743328,56.306549],[54.744011,56.309292],[54.744431,56.310799],[54.745178,56.313339],[54.746929,56.319698],[54.74913,56.327782],[54.75127,56.335579],[54.751911,56.337952],[54.752621,56.34087],[54.753189,56.343601],[54.75383,56.347221],[54.754681,56.352612],[54.755508,56.357979],[54.757141,56.368118],[54.758308,56.375591],[54.759369,56.38224],[54.760269,56.387981],[54.761181,56.393742],[54.76202,56.399109],[54.763481,56.408401],[54.764179,56.412868],[54.764912,56.417439],[54.766361,56.426579],[54.767849,56.436069],[54.769329,56.44548],[54.77029,56.451439],[54.77095,56.455681],[54.771599,56.459869],[54.772919,56.467838],[54.773529,56.471001],[54.77557,56.48167],[54.779339,56.501308],[54.782982,56.520302],[54.784142,56.526348],[54.78595,56.535759],[54.786251,56.537338],[54.786739,56.539989],[54.788971,56.551559],[54.791481,56.564621],[54.793541,56.575432],[54.7953,56.584549],[54.796471,56.590401],[54.802078,56.612301],[54.80304,56.616119],[54.80336,56.617279],[54.804211,56.620689],[54.80545,56.625519],[54.806412,56.629318],[54.807411,56.63324],[54.80817,56.636829],[54.808491,56.63871],[54.80912,56.643742],[54.809792,56.649261],[54.810619,56.656109],[54.811432,56.662949],[54.812271,56.66996],[54.813332,56.67894],[54.813869,56.683289],[54.81422,56.686359],[54.814671,56.69001],[54.815281,56.69503],[54.81559,56.697639],[54.81612,56.702271],[54.81625,56.703381],[54.816319,56.70443],[54.816441,56.706532],[54.816559,56.709141],[54.816639,56.714771],[54.816681,56.722599],[54.816738,56.729401],[54.81675,56.730419],[54.816799,56.73798],[54.81686,56.749969],[54.816921,56.757],[54.816921,56.757542],[54.81715,56.793861],[54.817181,56.799141],[54.817402,56.839279],[54.81752,56.863491],[54.817558,56.866192],[54.817768,56.868931],[54.818138,56.871922],[54.818588,56.874352],[54.81926,56.877159],[54.820061,56.87973],[54.82132,56.88287],[54.825951,56.893631],[54.826462,56.894989],[54.82671,56.896278],[54.8269,56.89827],[54.826988,56.900848],[54.827091,56.903469],[54.827251,56.90778],[54.827751,56.91758],[54.828339,56.922459],[54.82917,56.927349],[54.82991,56.93148],[54.830528,56.935371],[54.83102,56.939499],[54.831219,56.942089],[54.83136,56.944679],[54.83186,56.96133],[54.832298,56.976261],[54.832489,56.981819],[54.832611,56.98418],[54.832748,56.98595],[54.832909,56.987659],[54.841751,57.05891],[54.842751,57.066971],[54.845871,57.092319],[54.846611,57.098259],[54.847,57.1012],[54.847179,57.10244],[54.847271,57.103039],[54.847351,57.1035],[54.847511,57.104221],[54.847729,57.105179],[54.850578,57.11689],[54.85368,57.12962],[54.853931,57.13068],[54.856098,57.13966],[54.857651,57.146091],[54.859219,57.152538],[54.860199,57.156212],[54.86039,57.156841],[54.860592,57.157551],[54.86079,57.158089],[54.860989,57.15863],[54.861271,57.15929],[54.86327,57.164169],[54.865829,57.170479],[54.870941,57.183079],[54.873699,57.189919],[54.874222,57.191341],[54.874599,57.192589],[54.87492,57.193729],[54.875172,57.19487],[54.875389,57.19598],[54.87561,57.197201],[54.875809,57.198551],[54.87598,57.199921],[54.876228,57.20211],[54.879848,57.23526],[54.883839,57.271709],[54.88488,57.281361],[54.885391,57.286228],[54.885761,57.289349],[54.886009,57.291],[54.88623,57.29237],[54.88662,57.29438],[54.88707,57.296478],[54.887661,57.298771],[54.888168,57.30069],[54.888451,57.30154],[54.88868,57.30225],[54.88908,57.30341],[54.889408,57.304249],[54.889931,57.305592],[54.890362,57.306591],[54.89061,57.307152],[54.891491,57.309158],[54.893631,57.313969],[54.8983,57.324348],[54.90033,57.328899],[54.902451,57.333641],[54.902882,57.334629],[54.903229,57.33551],[54.903599,57.336491],[54.904221,57.338348],[54.904751,57.340061],[54.90514,57.341339],[54.905849,57.343498],[54.905949,57.344791],[54.907589,57.352791],[54.90855,57.35762],[54.909931,57.364521],[54.910099,57.365318],[54.911282,57.370911],[54.911678,57.372929],[54.911949,57.37447],[54.91214,57.375969],[54.912251,57.37751],[54.912239,57.379021],[54.91217,57.380489],[54.912048,57.382011],[54.911758,57.385181],[54.911671,57.386372],[54.911621,57.38739],[54.91164,57.388378],[54.911709,57.389439],[54.9118,57.390491],[54.911961,57.391682],[54.912128,57.392632],[54.912338,57.393501],[54.912579,57.394428],[54.913738,57.398151],[54.915539,57.40395],[54.915821,57.404789],[54.916302,57.406052],[54.916759,57.40707],[54.91745,57.40836],[54.918049,57.409409],[54.91856,57.410229],[54.91906,57.410919],[54.919621,57.41161],[54.920891,57.412979],[54.92168,57.41362],[54.922581,57.41423],[54.922661,57.41428],[54.923611,57.414799],[54.92411,57.415031],[54.924591,57.415218],[54.92514,57.41539],[54.925991,57.41552],[54.927502,57.41568],[54.928959,57.415852],[54.930241,57.41597],[54.931141,57.416088],[54.931541,57.41621],[54.93187,57.41637],[54.932251,57.416611],[54.932732,57.416939],[54.93317,57.417301],[54.933681,57.417839],[54.934261,57.418579],[54.934978,57.419701],[54.936569,57.422218],[54.9384,57.425159],[54.93906,57.42614],[54.93964,57.426949],[54.940189,57.42765],[54.940929,57.42841],[54.941841,57.429161],[54.942799,57.429859],[54.943611,57.430462],[54.944111,57.430882],[54.944618,57.431351],[54.945148,57.431881],[54.945789,57.432579],[54.946369,57.433239],[54.946819,57.4338],[54.94735,57.434559],[54.947849,57.43528],[54.948238,57.435871],[54.948559,57.43642],[54.94891,57.437119],[54.94923,57.438049],[54.949471,57.43898],[54.94981,57.44046],[54.951229,57.4473],[54.952629,57.454121],[54.953041,57.456089],[54.953308,57.45726],[54.953541,57.458179],[54.953732,57.458931],[54.953999,57.459751],[54.9543,57.46064],[54.954609,57.46146],[54.95499,57.46244],[54.955421,57.463322],[54.95623,57.46487],[54.956848,57.465889],[54.95752,57.466869],[54.959419,57.469212],[54.961609,57.471859],[54.964561,57.476082],[54.966679,57.479179],[54.96748,57.480358],[54.967831,57.480942],[54.968151,57.48151],[54.96851,57.482231],[54.969051,57.48349],[54.969601,57.484901],[54.969872,57.48568],[54.970131,57.48679],[54.970421,57.488289],[54.971851,57.496109],[54.973801,57.507069],[54.9743,57.509739],[54.974812,57.51218],[54.976761,57.520279],[54.97905,57.529819],[54.980228,57.53471],[54.980942,57.537682],[54.981831,57.541401],[54.982738,57.5452],[54.983238,57.547199],[54.983589,57.54863],[54.98391,57.54998],[54.984211,57.551189],[54.984638,57.553089],[54.985069,57.555191],[54.98534,57.556782],[54.986221,57.562389],[54.987881,57.573261],[54.989071,57.58107],[54.990009,57.587139],[54.990292,57.588848],[54.99073,57.59108],[54.991402,57.594082],[54.991611,57.594971],[54.991829,57.595711],[54.9921,57.596432],[54.992481,57.597321],[54.993031,57.598309],[54.99374,57.599461],[54.99625,57.603321],[54.996559,57.603901],[54.99678,57.604401],[54.997028,57.605068],[54.997261,57.60582],[54.997509,57.606812],[54.997761,57.60796],[54.99929,57.614929],[54.999401,57.615528],[54.999569,57.616638],[54.99963,57.617451],[54.999649,57.61824],[54.999619,57.619141],[54.999561,57.62038],[54.999458,57.621529],[54.999352,57.622421],[54.999161,57.62368],[54.998989,57.625019],[54.99894,57.62561],[54.998909,57.626289],[54.998932,57.626961],[54.999008,57.627781],[54.999111,57.628422],[54.999241,57.628922],[55.00016,57.631901],[55.000332,57.632721],[55.000439,57.63356],[55.000511,57.63483],[55.00053,57.636471],[55.00045,57.640511],[55.00042,57.641621],[55.000351,57.64259],[55.00021,57.643822],[55.00005,57.64492],[54.999748,57.646561],[54.999561,57.647572],[54.99942,57.648769],[54.999329,57.649891],[54.999298,57.6511],[54.999359,57.652069],[54.999569,57.65411],[54.99979,57.655891],[55.00016,57.658321],[55.000462,57.65979],[55.00074,57.660851],[55.00108,57.66193],[55.002369,57.66563],[55.00433,57.671101],[55.00518,57.67347],[55.005989,57.675831],[55.006229,57.676601],[55.00647,57.677422],[55.006779,57.678558],[55.00705,57.679668],[55.00732,57.68092],[55.007439,57.681728],[55.0075,57.682461],[55.007542,57.683418],[55.007561,57.684841],[55.007568,57.686138],[55.007542,57.687408],[55.007469,57.688499],[55.007381,57.689579],[55.007271,57.690868],[55.006889,57.69455],[55.006748,57.69582],[55.006229,57.701149],[55.006039,57.703571],[55.005871,57.70657],[55.005852,57.70681],[55.00584,57.70705],[55.0056,57.711048],[55.005508,57.711979],[55.005371,57.712799],[55.004532,57.716129],[55.004219,57.716888],[55.003811,57.71769],[55.003349,57.718189],[55.002869,57.718571],[55.002399,57.7188],[55.00169,57.718868],[55.001129,57.71875],[55.000629,57.718449],[55.00013,57.71801],[54.99934,57.71719],[54.998329,57.71587],[54.99786,57.715302],[54.99728,57.71468],[54.996689,57.71402],[54.996109,57.713409],[54.995838,57.713181],[54.99559,57.713032],[54.99535,57.712971],[54.995129,57.712978],[54.994869,57.713051],[54.994678,57.713169],[54.994511,57.713322],[54.994339,57.713558],[54.994171,57.71394],[54.994041,57.71434],[54.993969,57.71484],[54.993961,57.71534],[54.99408,57.71619],[54.994362,57.71743],[54.994888,57.719109],[54.995029,57.71981],[54.995121,57.720612],[54.99514,57.721199],[54.995071,57.721741],[54.99469,57.723579],[54.992451,57.73497],[54.99155,57.739571],[54.99041,57.745319],[54.986382,57.765751],[54.98336,57.777149],[54.982868,57.77919],[54.9827,57.780079],[54.982578,57.781471],[54.982521,57.7831],[54.982521,57.784019],[54.9827,57.78746],[54.982929,57.791069],[54.983139,57.794201],[54.983219,57.79554],[54.983261,57.79657],[54.98328,57.79734],[54.983231,57.798279],[54.98299,57.79966],[54.982281,57.802799],[54.981541,57.806122],[54.980991,57.80854],[54.980259,57.811661],[54.980068,57.812382],[54.97966,57.813519],[54.979259,57.81432],[54.978779,57.815109],[54.978222,57.815849],[54.977699,57.816441],[54.977139,57.81702],[54.975739,57.81852],[54.974232,57.82011],[54.97271,57.821732],[54.971359,57.823158],[54.970249,57.824379],[54.969761,57.82505],[54.96928,57.825802],[54.96904,57.826241],[54.96875,57.82695],[54.968449,57.827839],[54.968182,57.828892],[54.967529,57.832352],[54.965641,57.842831],[54.965321,57.846352],[54.965778,57.850979],[54.9683,57.866692],[54.96925,57.87114],[54.97163,57.87743],[54.97298,57.884399],[54.97345,57.88818],[54.973621,57.891861],[54.973221,57.896992],[54.971889,57.90617],[54.971489,57.90847],[54.971142,57.910809],[54.971001,57.911911],[54.970871,57.913189],[54.97076,57.914551],[54.97068,57.915878],[54.970631,57.917332],[54.970612,57.918831],[54.970772,57.925819],[54.970879,57.931122],[54.971111,57.93475],[54.970661,57.93922],[54.968941,57.954922],[54.968201,57.96059],[54.967072,57.96685],[54.966282,57.97089],[54.962391,57.982052],[54.959461,57.98822],[54.95628,57.993069],[54.947769,58.001431],[54.94186,58.00684],[54.93618,58.012051],[54.929489,58.01952],[54.922199,58.028999],[54.920761,58.031719],[54.919991,58.035351],[54.918999,58.04007],[54.91861,58.044579],[54.919621,58.05241],[54.919849,58.055222],[54.919689,58.057919],[54.918949,58.061138],[54.91687,58.066639],[54.914459,58.072941],[54.914261,58.07449],[54.914009,58.07719],[54.914108,58.080021],[54.91412,58.083241],[54.913422,58.08646],[54.910488,58.09568],[54.909309,58.099461],[54.90794,58.10371],[54.907349,58.105831],[54.90641,58.109039],[54.905319,58.111012],[54.904041,58.113071],[54.90316,58.115429],[54.90276,58.118912],[54.902111,58.122169],[54.901131,58.125],[54.89925,58.12878],[54.897621,58.13118],[54.896839,58.133331],[54.896439,58.137531],[54.896599,58.142029],[54.89621,58.14418],[54.896099,58.144779],[54.894371,58.152939],[54.8923,58.160568],[54.88839,58.16972],[54.877441,58.192841],[54.87616,58.19817],[54.87537,58.20314],[54.875019,58.205891],[54.872601,58.227779],[54.86969,58.252331],[54.86937,58.25486],[54.868851,58.257912],[54.86615,58.263439],[54.859852,58.274681],[54.85759,58.27953],[54.8568,58.282619],[54.855759,58.28717],[54.855221,58.2901],[54.855209,58.293781],[54.85516,58.296181],[54.854931,58.297989],[54.85429,58.300251],[54.85218,58.303909],[54.851109,58.30648],[54.85067,58.31023],[54.851349,58.315891],[54.852242,58.322498],[54.853432,58.328251],[54.855499,58.334511],[54.857578,58.339748],[54.860001,58.346272],[54.86356,58.359058],[54.864639,58.361889],[54.865711,58.363682],[54.866711,58.365101],[54.868511,58.367081],[54.870312,58.368992],[54.871632,58.370708],[54.87188,58.37104],[54.87233,58.371769],[54.87291,58.372799],[54.873981,58.375439],[54.875271,58.37883],[54.875259,58.378799],[54.87561,58.37991],[54.875881,58.381222],[54.876209,58.38335],[54.876369,58.38538],[54.876419,58.38731],[54.876549,58.388569],[54.876701,58.38958],[54.876888,58.39056],[54.87957,58.398319],[54.88208,58.405579],[54.88253,58.406719],[54.88303,58.407761],[54.883709,58.408772],[54.88446,58.409649],[54.884811,58.410118],[54.885071,58.410519],[54.885342,58.41114],[54.885609,58.41198],[54.88562,58.41209],[54.88588,58.413651],[54.885891,58.413731],[54.885941,58.414082],[54.886341,58.416908],[54.886429,58.4179],[54.886471,58.41938],[54.886478,58.420269],[54.88649,58.420891],[54.88662,58.423191],[54.88681,58.425011],[54.887581,58.43187],[54.88773,58.433399],[54.887829,58.434341],[54.887871,58.434719],[54.887932,58.435169],[54.88805,58.43618],[54.888119,58.43681],[54.888599,58.440239],[54.88921,58.444561],[54.88932,58.44585],[54.88929,58.447071],[54.889229,58.44799],[54.889091,58.44886],[54.888939,58.449711],[54.888691,58.450562],[54.888458,58.451302],[54.88821,58.451981],[54.88789,58.45269],[54.887508,58.453259],[54.886829,58.454208],[54.88588,58.45509],[54.884529,58.456032],[54.882469,58.457481],[54.881641,58.458061],[54.88073,58.458912],[54.88039,58.45937],[54.880058,58.459999],[54.876789,58.467121],[54.87598,58.469059],[54.87574,58.470112],[54.87542,58.47274],[54.875141,58.474892],[54.87492,58.475681],[54.874619,58.47641],[54.87336,58.47868],[54.871059,58.481972],[54.87067,58.482498],[54.869678,58.48386],[54.868858,58.485409],[54.868279,58.48671],[54.867729,58.488331],[54.867222,58.490761],[54.86694,58.492859],[54.866859,58.49493],[54.866859,58.4967],[54.867031,58.498428],[54.867279,58.500332],[54.868,58.505741],[54.86858,58.510281],[54.868698,58.512032],[54.86861,58.513531],[54.868351,58.51495],[54.867569,58.517971],[54.867329,58.519619],[54.867149,58.521931],[54.867031,58.524361],[54.86684,58.526409],[54.86652,58.528271],[54.865879,58.53072],[54.865391,58.532169],[54.864849,58.533569],[54.864231,58.534939],[54.86356,58.536221],[54.862251,58.53828],[54.860821,58.540161],[54.860008,58.54134],[54.859348,58.54269],[54.858711,58.544571],[54.85836,58.545929],[54.858109,58.547569],[54.857948,58.549541],[54.857922,58.558102],[54.858021,58.59304],[54.85812,58.601959],[54.858089,58.603661],[54.858028,58.607029],[54.857792,58.612381],[54.856152,58.65015],[54.856312,58.65461],[54.857529,58.67363],[54.8578,58.677269],[54.858101,58.67989],[54.85878,58.68224],[54.862438,58.69508],[54.86359,58.69994],[54.864601,58.708519],[54.865471,58.714401],[54.86536,58.716499],[54.864891,58.71854],[54.862438,58.724091],[54.8615,58.726311],[54.861301,58.726791],[54.861118,58.727341],[54.86076,58.72858],[54.86063,58.729568],[54.86055,58.730579],[54.860531,58.731232],[54.86055,58.73188],[54.860729,58.733189],[54.860821,58.733551],[54.861,58.734329],[54.861229,58.73505],[54.8615,58.735748],[54.861801,58.736431],[54.8633,58.739399],[54.864861,58.7425],[54.86726,58.747711],[54.86792,58.749409],[54.868431,58.75082],[54.86969,58.754509],[54.87112,58.75959],[54.872021,58.763599],[54.872471,58.766411],[54.873249,58.77142],[54.873669,58.77515],[54.874531,58.78252],[54.87529,58.78838],[54.875992,58.794739],[54.877651,58.804951],[54.87949,58.812359],[54.880798,58.817051],[54.881649,58.820202],[54.88184,58.8209],[54.882408,58.823139],[54.88818,58.84444],[54.889549,58.849411],[54.891258,58.85582],[54.89296,58.862019],[54.894009,58.865898],[54.895599,58.87178],[54.896351,58.874321],[54.897129,58.87656],[54.897869,58.87851],[54.898602,58.88028],[54.900181,58.883518],[54.90126,58.885422],[54.902088,58.886688],[54.90332,58.888519],[54.904209,58.88969],[54.905102,58.890732],[54.906528,58.892269],[54.90789,58.893501],[54.90921,58.894581],[54.916771,58.89999],[54.919979,58.902191],[54.921471,58.903381],[54.922241,58.904099],[54.922901,58.9048],[54.92342,58.905418],[54.923889,58.90612],[54.924431,58.906921],[54.92514,58.908249],[54.925701,58.909481],[54.926109,58.910461],[54.92659,58.911919],[54.926949,58.913349],[54.92717,58.914471],[54.927391,58.91584],[54.92757,58.91724],[54.927689,58.918709],[54.9277,58.92009],[54.927662,58.922642],[54.927521,58.92664],[54.927521,58.928459],[54.92762,58.930641],[54.92783,58.932461],[54.928108,58.93409],[54.928509,58.935711],[54.929001,58.937309],[54.929451,58.938568],[54.92981,58.939369],[54.930222,58.940151],[54.930569,58.94088],[54.93317,58.945461],[54.933681,58.946121],[54.9342,58.946751],[54.93483,58.947361],[54.935421,58.94783],[54.936131,58.948261],[54.93689,58.948669],[54.937778,58.948921],[54.938148,58.949032],[54.939041,58.949299],[54.941181,58.949848],[54.94286,58.950291],[54.948559,58.951759],[54.95015,58.952301],[54.951408,58.95293],[54.952469,58.953609],[54.953579,58.954441],[54.955879,58.95702],[54.956718,58.95816],[54.957458,58.959309],[54.95826,58.96077],[54.958961,58.962231],[54.960209,58.96526],[54.964561,58.97612],[54.966148,58.979691],[54.96846,58.98386],[54.971909,58.99012],[54.980068,59.004581],[54.98201,59.00872],[54.98317,59.011841],[54.984291,59.01524],[54.988029,59.02697],[54.988899,59.02961],[54.989639,59.031521],[54.990528,59.033482],[54.991428,59.03516],[54.992359,59.036671],[54.993172,59.037769],[54.995762,59.04158],[54.996811,59.043549],[54.997601,59.04528],[54.998409,59.047291],[54.998871,59.048698],[54.99931,59.050179],[54.999981,59.053009],[55.000969,59.05806],[55.001591,59.06147],[55.001881,59.063049],[55.002171,59.064411],[55.002541,59.0658],[55.002892,59.066929],[55.00325,59.067959],[55.003639,59.069],[55.004219,59.07024],[55.004688,59.071232],[55.00515,59.072071],[55.005798,59.073101],[55.00671,59.074471],[55.007648,59.075871],[55.009418,59.078602],[55.009991,59.07967],[55.010441,59.080662],[55.010929,59.081841],[55.012039,59.085289],[55.012371,59.08654],[55.012691,59.087978],[55.012901,59.089668],[55.013199,59.092682],[55.013451,59.095551],[55.013618,59.097679],[55.014332,59.106461],[55.014641,59.108871],[55.01498,59.110481],[55.01545,59.112091],[55.015831,59.11319],[55.016281,59.114239],[55.01688,59.115341],[55.017479,59.116329],[55.018269,59.11747],[55.019199,59.11871],[55.02042,59.120419],[55.020988,59.12122],[55.022541,59.123219],[55.02383,59.124649],[55.024811,59.125702],[55.025921,59.12674],[55.027531,59.128071],[55.032501,59.13216],[55.03307,59.132671],[55.034271,59.133629],[55.034901,59.134151],[55.038521,59.137138],[55.04015,59.138451],[55.04047,59.138741],[55.0415,59.139599],[55.04211,59.140049],[55.042591,59.140411],[55.044239,59.141479],[55.048489,59.144131],[55.050339,59.145309],[55.0509,59.145729],[55.0513,59.14603],[55.051731,59.14637],[55.05204,59.146629],[55.052319,59.14687],[55.05254,59.147079],[55.05278,59.147301],[55.053009,59.14753],[55.05452,59.149109],[55.059559,59.15451],[55.059799,59.154812],[55.059978,59.155022],[55.0602,59.155281],[55.06039,59.155529],[55.060558,59.15575],[55.060749,59.15601],[55.060982,59.156349],[55.061241,59.156769],[55.061508,59.157219],[55.062092,59.15831],[55.062199,59.158562],[55.06229,59.158798],[55.062382,59.159039],[55.062721,59.160069],[55.062908,59.16066],[55.06308,59.161221],[55.06321,59.161732],[55.063381,59.16238],[55.063568,59.163151],[55.063931,59.16457],[55.064159,59.16555],[55.064491,59.166882],[55.064751,59.167938],[55.065479,59.17107],[55.066669,59.17609],[55.068981,59.18594],[55.069931,59.18998],[55.07061,59.193001],[55.071239,59.19614],[55.071812,59.19902],[55.07225,59.2015],[55.073051,59.206139],[55.074249,59.21299],[55.07515,59.2183],[55.07552,59.220089],[55.076321,59.223579],[55.077019,59.226261],[55.07766,59.228409],[55.078308,59.230431],[55.078972,59.232281],[55.081261,59.238392],[55.08535,59.249168],[55.087631,59.255032],[55.0886,59.25729],[55.089062,59.258221],[55.089828,59.259731],[55.090889,59.26157],[55.09185,59.262989],[55.09269,59.264252],[55.093651,59.265469],[55.095951,59.26833],[55.096569,59.26907],[55.097462,59.27026],[55.098019,59.27116],[55.098541,59.272079],[55.099072,59.273102],[55.099758,59.27475],[55.100288,59.276279],[55.10078,59.277931],[55.10117,59.279331],[55.101639,59.281368],[55.1022,59.283661],[55.10268,59.285751],[55.102859,59.28648],[55.103088,59.287189],[55.103279,59.287701],[55.103519,59.28817],[55.103828,59.288639],[55.105659,59.29092],[55.105881,59.291321],[55.106079,59.29174],[55.106312,59.292301],[55.107021,59.29454],[55.10857,59.299801],[55.108898,59.30117],[55.10918,59.30238],[55.109459,59.303768],[55.109989,59.307079],[55.110519,59.310341],[55.110611,59.31094],[55.11068,59.311699],[55.110729,59.31263],[55.110748,59.31324],[55.110771,59.31432],[55.110649,59.319199],[55.110519,59.32346],[55.11042,59.326061],[55.110359,59.32769],[55.110298,59.330109],[55.110298,59.331009],[55.110321,59.33194],[55.110359,59.332951],[55.110401,59.333839],[55.110489,59.334721],[55.1106,59.335812],[55.110729,59.33691],[55.110939,59.33815],[55.11116,59.339218],[55.111439,59.34045],[55.111809,59.34206],[55.115021,59.35487],[55.115238,59.355801],[55.11562,59.357689],[55.11581,59.35886],[55.115959,59.360001],[55.116051,59.361031],[55.116119,59.361969],[55.11618,59.36314],[55.116192,59.364391],[55.11618,59.3657],[55.11615,59.36681],[55.116112,59.36787],[55.115879,59.372749],[55.11573,59.37569],[55.115589,59.378368],[55.115589,59.379139],[55.115589,59.379799],[55.11562,59.380531],[55.115688,59.381241],[55.115761,59.381802],[55.115879,59.38242],[55.116951,59.387329],[55.11702,59.38776],[55.117081,59.388271],[55.117142,59.388809],[55.11718,59.389301],[55.11721,59.389919],[55.117161,59.392971],[55.11702,59.396809],[55.11697,59.397652],[55.116909,59.398319],[55.116859,59.398869],[55.11676,59.399422],[55.11652,59.40028],[55.11618,59.401199],[55.11586,59.401741],[55.115501,59.402359],[55.115372,59.402531],[55.11528,59.402649],[55.114738,59.403351],[55.113369,59.40509],[55.113029,59.40559],[55.112659,59.4062],[55.112339,59.40704],[55.112171,59.407681],[55.11203,59.408379],[55.1119,59.409279],[55.111889,59.410118],[55.111919,59.41098],[55.112122,59.413879],[55.112259,59.415508],[55.112492,59.417099],[55.11264,59.417912],[55.112801,59.41848],[55.112968,59.418949],[55.113232,59.419601],[55.11351,59.420078],[55.113861,59.420631],[55.114769,59.421959],[55.11721,59.425442],[55.119701,59.428822],[55.12006,59.429211],[55.120548,59.429661],[55.123482,59.432072],[55.123798,59.432362],[55.124062,59.43261],[55.124298,59.432892],[55.124489,59.43317],[55.12468,59.433472],[55.12487,59.433842],[55.125092,59.43438],[55.125721,59.43589],[55.12719,59.440029],[55.127319,59.44051],[55.127441,59.440941],[55.127571,59.441521],[55.127651,59.442081],[55.127708,59.44273],[55.12772,59.44334],[55.12772,59.443851],[55.12767,59.44434],[55.127609,59.444851],[55.127529,59.445351],[55.127369,59.446049],[55.127171,59.446621],[55.12693,59.447201],[55.126621,59.447781],[55.126202,59.448399],[55.125,59.449959],[55.124748,59.45034],[55.124531,59.45076],[55.12431,59.451248],[55.12331,59.454609],[55.122761,59.456589],[55.12199,59.459351],[55.121761,59.46022],[55.121529,59.46106],[55.12133,59.46196],[55.121208,59.462841],[55.120991,59.46529],[55.12093,59.46587],[55.12085,59.466599],[55.120781,59.467098],[55.120689,59.467541],[55.12056,59.468079],[55.120338,59.468811],[55.120121,59.46944],[55.119888,59.47002],[55.11961,59.470581],[55.117699,59.47393],[55.117489,59.47438],[55.117229,59.47504],[55.117031,59.475651],[55.116879,59.476311],[55.116711,59.477131],[55.11657,59.477951],[55.116161,59.48074],[55.115761,59.483471],[55.11483,59.49308],[55.114189,59.501492],[55.112179,59.51009],[55.110081,59.516941],[55.10947,59.519161],[55.109039,59.52121],[55.10873,59.523621],[55.10865,59.525982],[55.10873,59.528],[55.108952,59.529942],[55.109409,59.532139],[55.10984,59.53363],[55.110432,59.535252],[55.111099,59.53677],[55.113239,59.541359],[55.113789,59.542641],[55.11425,59.543861],[55.114868,59.545769],[55.115292,59.547199],[55.115841,59.549469],[55.11694,59.554329],[55.11747,59.556259],[55.118118,59.558281],[55.11927,59.561562],[55.11972,59.562962],[55.12011,59.56435],[55.12056,59.565922],[55.121151,59.567581],[55.122509,59.571259],[55.122978,59.572731],[55.123299,59.574089],[55.123619,59.575611],[55.123989,59.577789],[55.124439,59.58099],[55.124989,59.584999],[55.12516,59.586498],[55.12524,59.58778],[55.12524,59.588848],[55.125092,59.590099],[55.124939,59.590851],[55.124748,59.591572],[55.124481,59.592289],[55.12418,59.59288],[55.123409,59.59404],[55.123329,59.594139],[55.122601,59.59499],[55.11953,59.59798],[55.117321,59.600151],[55.116501,59.600948],[55.115921,59.601379],[55.115299,59.60165],[55.114639,59.601711],[55.11412,59.601608],[55.11351,59.601299],[55.11026,59.599369],[55.109241,59.59885],[55.108608,59.59866],[55.107189,59.598419],[55.10659,59.598202],[55.105968,59.59779],[55.10545,59.597221],[55.10495,59.59642],[55.103981,59.59449],[55.103279,59.59317],[55.102772,59.592411],[55.102291,59.591862],[55.101688,59.591351],[55.10051,59.590549],[55.09898,59.589611],[55.09766,59.588779],[55.096279,59.58794],[55.094761,59.587158],[55.09462,59.58709],[55.093159,59.586491],[55.09169,59.586109],[55.090179,59.585899],[55.087391,59.585678],[55.08651,59.585609],[55.085659,59.58543],[55.084679,59.585098],[55.083912,59.584839],[55.083149,59.58469],[55.082291,59.584641],[55.07872,59.58461],[55.076729,59.58466],[55.075802,59.584759],[55.075039,59.585018],[55.074181,59.58556],[55.073639,59.586201],[55.072979,59.587341],[55.072472,59.588779],[55.072281,59.589512],[55.07201,59.590611],[55.068249,59.610561],[55.06686,59.617882],[55.066792,59.61824],[55.064869,59.628311],[55.064369,59.630939],[55.063782,59.63372],[55.063171,59.636219],[55.062881,59.63715],[55.062511,59.63834],[55.061649,59.640789],[55.06097,59.6423],[55.060009,59.64397],[55.059361,59.64513],[55.05859,59.646542],[55.05806,59.647812],[55.057621,59.649422],[55.057251,59.651299],[55.05698,59.653542],[55.056862,59.655731],[55.05669,59.6618],[55.05632,59.673031],[55.055679,59.696388],[55.055641,59.697941],[55.05545,59.70269],[55.055229,59.706039],[55.05479,59.70961],[55.054371,59.711731],[55.05373,59.714111],[55.052979,59.71627],[55.052181,59.71796],[55.05088,59.720058],[55.049549,59.721661],[55.048141,59.72298],[55.046951,59.723701],[55.045479,59.724319],[55.044159,59.724628],[55.04253,59.724789],[55.04084,59.724709],[55.039009,59.72438],[55.034672,59.723301],[55.032082,59.72263],[55.031349,59.722511],[55.030609,59.722439],[55.029442,59.722469],[55.02808,59.72274],[55.026699,59.72327],[55.025501,59.723991],[55.024311,59.724892],[55.022549,59.726681],[55.021229,59.72855],[55.019981,59.730789],[55.019112,59.7328],[55.01836,59.734989],[55.017818,59.73703],[55.017281,59.739811],[55.016949,59.742611],[55.016781,59.744831],[55.016548,59.752708],[55.016479,59.758751],[55.016541,59.760941],[55.01675,59.763359],[55.01712,59.765491],[55.01791,59.7687],[55.018188,59.77018],[55.018391,59.771759],[55.018471,59.77317],[55.01844,59.774551],[55.018261,59.776371],[55.017941,59.7784],[55.017021,59.782459],[55.01545,59.78944],[55.014591,59.792622],[55.013741,59.795219],[55.012909,59.797359],[55.011108,59.801861],[55.009972,59.80434],[55.00528,59.814522],[55.001629,59.82243],[54.998661,59.828949],[54.998161,59.83004],[54.99617,59.833672],[54.994751,59.83762],[54.993271,59.845428],[54.990711,59.852638],[54.988449,59.857792],[54.984798,59.864231],[54.983311,59.8666],[54.9762,59.877918],[54.975151,59.879589],[54.972931,59.882938],[54.971111,59.88689],[54.96899,59.892891],[54.966721,59.904572],[54.964111,59.922588],[54.963081,59.928169],[54.961498,59.93375],[54.958889,59.93924],[54.95475,59.948601],[54.953461,59.951599],[54.950409,59.955978],[54.948441,59.959332],[54.946911,59.96328],[54.946072,59.966621],[54.945499,59.96957],[54.945301,59.97123],[54.945251,59.972099],[54.94519,59.972939],[54.945091,59.974689],[54.945049,59.97646],[54.944969,59.983688],[54.944931,59.98642],[54.944809,59.995998],[54.944618,60.010189],[54.944569,60.012428],[54.944439,60.014481],[54.944302,60.017578],[54.94421,60.019371],[54.943981,60.023159],[54.943939,60.024429],[54.94384,60.027279],[54.94389,60.03072],[54.94389,60.031479],[54.944149,60.050861],[54.944229,60.054852],[54.94426,60.057011],[54.944279,60.05846],[54.944649,60.08567],[54.944889,60.102211],[54.944839,60.10564],[54.94466,60.10783],[54.94437,60.109631],[54.94392,60.111649],[54.94326,60.11367],[54.94249,60.11581],[54.941429,60.118179],[54.937809,60.126369],[54.93663,60.12925],[54.93581,60.131908],[54.934238,60.138969],[54.934101,60.13953],[54.932701,60.1455],[54.931992,60.14938],[54.931629,60.151779],[54.931301,60.155849],[54.93108,60.15937],[54.93087,60.165771],[54.930271,60.178749],[54.929359,60.198689],[54.929211,60.19973],[54.926651,60.217232],[54.924358,60.232849],[54.92395,60.235291],[54.923698,60.23925],[54.923599,60.242512],[54.92342,60.259071],[54.92326,60.27956],[54.923092,60.284538],[54.920158,60.315289],[54.92004,60.316509],[54.919449,60.322781],[54.919201,60.325329],[54.9189,60.32843],[54.918819,60.3293],[54.918621,60.33147],[54.916981,60.34874],[54.91441,60.374008],[54.911572,60.402851],[54.91098,60.409698],[54.91048,60.41692],[54.910339,60.42078],[54.910252,60.426491],[54.910351,60.434891],[54.910801,60.455132],[54.911251,60.486462],[54.911621,60.51305],[54.912979,60.534969],[54.91325,60.538929],[54.913342,60.54007],[54.913952,60.54858],[54.916229,60.584351],[54.919479,60.633011],[54.919842,60.638851],[54.920479,60.64851],[54.921619,60.675339],[54.92107,60.67408],[54.921509,60.69199],[54.921612,60.69524],[54.921799,60.69796],[54.922371,60.70192],[54.924622,60.71656],[54.925159,60.7192],[54.927841,60.729431],[54.9282,60.730999],[54.928398,60.73328],[54.92902,60.73719],[54.930241,60.74353],[54.930801,60.745392],[54.932491,60.752548],[54.932629,60.753159],[54.936001,60.767448],[54.936451,60.769508],[54.937248,60.773232],[54.93771,60.775459],[54.938122,60.77766],[54.93803,60.779171],[54.938332,60.78286],[54.939419,60.785549],[54.940842,60.794399],[54.94128,60.7971],[54.941471,60.798279],[54.942089,60.801979],[54.942909,60.807018],[54.94331,60.809681],[54.944839,60.818668],[54.94495,60.819389],[54.945629,60.824699],[54.94928,60.852829],[54.95261,60.882751],[54.954609,60.901951],[54.954708,60.904129],[54.95509,60.906891],[54.955589,60.909828],[54.956261,60.912861],[54.9576,60.917679],[54.958611,60.921341],[54.964859,60.94379],[54.96888,60.958241],[54.969551,60.961021],[54.97187,60.971321],[54.972969,60.976131],[54.977161,60.99435],[54.98082,61.010262],[54.982491,61.017448],[54.983349,61.021061],[54.986229,61.033569],[54.987339,61.038368],[54.988258,61.042351],[54.989109,61.046051],[54.989288,61.046822],[54.989632,61.048321],[54.98996,61.0499],[54.990189,61.05109],[54.990421,61.052479],[54.99057,61.05357],[54.9907,61.054642],[54.99081,61.055851],[54.990898,61.057018],[54.991009,61.058819],[54.991089,61.060139],[54.99128,61.063751],[54.99176,61.071911],[54.992748,61.08934],[54.993912,61.10981],[54.993931,61.110161],[54.99408,61.112862],[54.994148,61.11396],[54.994549,61.121311],[54.99472,61.123779],[54.994831,61.125111],[54.994862,61.125519],[54.994999,61.126659],[54.99522,61.12833],[54.99548,61.12981],[54.995819,61.1315],[54.99609,61.132759],[54.996498,61.134472],[54.996761,61.135448],[54.997131,61.136761],[54.997581,61.138161],[54.998871,61.142101],[54.999329,61.143509],[55.000858,61.148209],[55.001511,61.150211],[55.001968,61.151829],[55.002369,61.153412],[55.00272,61.1548],[55.002941,61.155941],[55.002979,61.156281],[55.002991,61.156651],[55.002991,61.156971],[55.002911,61.15749],[55.002781,61.158169],[55.002171,61.160671],[55.001949,61.161549],[55.00172,61.162239],[55.00148,61.16283],[55.001259,61.16333],[55.0009,61.163971],[55.000141,61.165058],[54.996979,61.168869],[54.993469,61.1731],[54.992802,61.173901],[54.99239,61.174412],[54.991531,61.175449],[54.990662,61.176491],[54.9874,61.180519],[54.98365,61.185501],[54.9804,61.19133],[54.977051,61.19854],[54.974892,61.20438],[54.97282,61.211929],[54.97171,61.217461],[54.971439,61.2188],[54.97065,61.224979],[54.96986,61.23476],[54.969269,61.249008],[54.968681,61.262569],[54.96751,61.29174],[54.967461,61.29483],[54.967461,61.299309],[54.967628,61.32032],[54.967682,61.326801],[54.967682,61.329762],[54.967461,61.33461],[54.967361,61.33614],[54.967041,61.341091],[54.96685,61.345928],[54.966789,61.34951],[54.966759,61.35709],[54.96685,61.360802],[54.96703,61.365589],[54.9673,61.37249],[54.96756,61.37883],[54.9678,61.383862],[54.967819,61.384609],[54.967812,61.385429],[54.96777,61.38623],[54.967701,61.386978],[54.967602,61.387669],[54.967529,61.3881],[54.96735,61.389259],[54.967232,61.38987],[54.967041,61.391029],[54.966961,61.391479],[54.966942,61.39185],[54.966949,61.39222],[54.967018,61.39257],[54.96711,61.39283],[54.967239,61.393101],[54.9674,61.393311],[54.967579,61.39344],[54.96777,61.393509],[54.967979,61.39352],[54.968208,61.393478],[54.968811,61.39325],[54.969051,61.3932],[54.969299,61.3932],[54.969582,61.393242],[54.96981,61.393341],[54.969978,61.393471],[54.970119,61.393631],[54.97057,61.394379],[54.972691,61.39875],[54.973919,61.40144],[54.97477,61.403461],[54.9786,61.413589],[54.97929,61.415291],[54.980492,61.418209],[54.980968,61.419491],[54.9814,61.42099],[54.981701,61.422161],[54.98204,61.42374],[54.982349,61.425129],[54.98278,61.426861],[54.983089,61.42791],[54.983528,61.4291],[54.983879,61.430061],[54.984329,61.431099],[54.988491,61.440079],[54.98954,61.442242],[54.990509,61.443989],[54.991692,61.445782],[54.99292,61.44733],[54.99382,61.448318],[54.994579,61.449471],[54.99509,61.450371],[54.995461,61.451359],[54.995789,61.452339],[54.996151,61.453629],[54.996479,61.454491],[54.997021,61.455688],[54.99786,61.45694],[54.998058,61.457169],[54.99876,61.457989],[54.999859,61.459122],[55.00042,61.459549],[55.00108,61.46006],[55.001888,61.460609],[55.002708,61.461159],[55.00367,61.46183],[55.004639,61.4627],[55.005379,61.46357],[55.00602,61.46452],[55.00666,61.465801],[55.00713,61.466999],[55.007519,61.46833],[55.007858,61.46986],[55.008099,61.471519],[55.008171,61.472672],[55.00824,61.487968],[55.008251,61.4897],[55.00827,61.491631],[55.008282,61.492649],[55.008331,61.495178],[55.00843,61.496571],[55.008659,61.498852],[55.008991,61.501289],[55.009682,61.504978],[55.01041,61.507641],[55.011532,61.511021],[55.012581,61.51416],[55.013309,61.516312],[55.01548,61.522869],[55.016811,61.527439],[55.017639,61.531071],[55.018478,61.53603],[55.019588,61.543861],[55.021111,61.554241],[55.023998,61.57375],[55.024578,61.578789],[55.024818,61.582489],[55.024849,61.58744],[55.02467,61.59557],[55.02454,61.601311],[55.024609,61.60276],[55.024769,61.605431],[55.025021,61.6078],[55.025421,61.61084],[55.026749,61.619942],[55.029579,61.638821],[55.031319,61.65118],[55.034569,61.680481],[55.035259,61.688889],[55.035259,61.69593],[55.034569,61.703819],[55.03339,61.71249],[55.032059,61.723049],[55.032009,61.72665],[55.03231,61.729401],[55.032799,61.731548],[55.03344,61.733521],[55.04266,61.757488],[55.043159,61.758759],[55.04372,61.759941],[55.04438,61.761181],[55.045071,61.762299],[55.04578,61.763302],[55.04644,61.764141],[55.04697,61.764709],[55.047508,61.76524],[55.048679,61.766232],[55.0494,61.766689],[55.050129,61.76709],[55.05154,61.76767],[55.054871,61.768799],[55.06678,61.77285],[55.078411,61.77684],[55.079399,61.7771],[55.080681,61.777309],[55.08197,61.777409],[55.08297,61.77739],[55.084461,61.77729],[55.085041,61.777222],[55.08564,61.777119],[55.087132,61.77673],[55.08857,61.776218],[55.089409,61.77586],[55.09024,61.775459],[55.102551,61.768341],[55.106609,61.765961],[55.107342,61.76545],[55.11039,61.763729],[55.13361,61.750259],[55.137341,61.748631],[55.14967,61.745499],[55.15696,61.743649],[55.163601,61.742901],[55.165352,61.742981],[55.167831,61.743301],[55.170029,61.743801],[55.17173,61.744308],[55.171921,61.744381],[55.17342,61.74498],[55.175461,61.745899],[55.182289,61.74913],[55.186352,61.75108],[55.18853,61.751949],[55.190708,61.75256],[55.198181,61.75436],[55.20409,61.75584],[55.20697,61.756569],[55.208,61.756641],[55.208752,61.756569],[55.20924,61.756451],[55.210201,61.7561],[55.21088,61.75573],[55.211529,61.755268],[55.212528,61.75436],[55.213451,61.75325],[55.21397,61.75246],[55.21537,61.75016],[55.218601,61.7449],[55.221039,61.740891],[55.22345,61.736889],[55.22403,61.73605],[55.224651,61.735291],[55.224831,61.735111],[55.225269,61.734669],[55.22604,61.734032],[55.226971,61.73336],[55.228149,61.732979],[55.228642,61.733219],[55.23011,61.73447],[55.23177,61.73605],[55.232601,61.736912],[55.232922,61.737339],[55.234909,61.743431],[55.236519,61.74818],[55.237141,61.75024],[55.237549,61.751659],[55.240261,61.762218],[55.242809,61.772251],[55.245392,61.782318],[55.2486,61.79491],[55.249069,61.796661],[55.24947,61.798],[55.25161,61.804279],[55.252178,61.805759],[55.252621,61.806992],[55.2551,61.813889],[55.256981,61.819141],[55.257702,61.82119],[55.261089,61.830421],[55.264759,61.840389],[55.26614,61.843891],[55.266972,61.846279],[55.26722,61.847141],[55.267529,61.848389],[55.26783,61.85033],[55.268002,61.853001],[55.26807,61.85487],[55.268059,61.857052],[55.267948,61.858978],[55.267818,61.86047],[55.26495,61.88015],[55.263599,61.888641],[55.26321,61.891022],[55.262878,61.89325],[55.261162,61.904709],[55.260529,61.908791],[55.25972,61.914051],[55.25898,61.91872],[55.25766,61.927021],[55.247292,61.971561],[55.23119,62.039539],[55.230511,62.044521],[55.230061,62.050442],[55.230049,62.055191],[55.230019,62.066662],[55.22987,62.07954],[55.229542,62.082401],[55.229229,62.08503],[55.221161,62.120651],[55.219151,62.130779],[55.218861,62.134121],[55.218761,62.149231],[55.219051,62.221668],[55.219009,62.249611],[55.219002,62.25959],[55.218861,62.359859],[55.21719,62.386688],[55.216511,62.397709],[55.212669,62.458649],[55.212589,62.460918],[55.212551,62.462688],[55.212608,62.466721],[55.21273,62.470371],[55.21286,62.47298],[55.212978,62.474522],[55.213112,62.47604],[55.21339,62.47887],[55.21376,62.48177],[55.214149,62.484749],[55.21566,62.49527],[55.216599,62.501961],[55.219742,62.524139],[55.223789,62.552738],[55.22406,62.555309],[55.22427,62.557701],[55.22443,62.55999],[55.22456,62.56229],[55.224659,62.565819],[55.22467,62.569351],[55.22464,62.572048],[55.224529,62.574848],[55.224239,62.580269],[55.222969,62.603519],[55.222839,62.605961],[55.222801,62.60849],[55.222431,62.62851],[55.22234,62.634449],[55.222141,62.646141],[55.22184,62.6637],[55.221802,62.665722],[55.221828,62.667389],[55.22197,62.669109],[55.222191,62.67083],[55.222462,62.672588],[55.222809,62.6744],[55.22324,62.676208],[55.223721,62.67812],[55.224659,62.68137],[55.225441,62.684299],[55.226212,62.687679],[55.227039,62.691471],[55.227581,62.693821],[55.228748,62.698212],[55.230701,62.705421],[55.231861,62.709789],[55.234619,62.71941],[55.235989,62.72533],[55.236671,62.731159],[55.23682,62.736401],[55.235512,62.767021],[55.23497,62.78035],[55.234951,62.781029],[55.234859,62.783001],[55.234791,62.78511],[55.234329,62.799831],[55.234081,62.829102],[55.234001,62.852989],[55.233929,62.871929],[55.233681,62.929691],[55.233479,62.976898],[55.233459,62.986481],[55.233471,62.988838],[55.233551,62.99118],[55.235119,63.02404],[55.23579,63.037411],[55.23819,63.08873],[55.24054,63.138859],[55.24284,63.165291],[55.244209,63.180828],[55.245461,63.191582],[55.248169,63.214821],[55.253731,63.247841],[55.254421,63.251881],[55.25444,63.252239],[55.254379,63.25293],[55.254311,63.25317],[55.254292,63.253479],[55.254318,63.253819],[55.254391,63.254139],[55.254532,63.25423],[55.25478,63.254688],[55.255001,63.255291],[55.25552,63.258629],[55.25597,63.261429],[55.257401,63.269409],[55.257729,63.270859],[55.258121,63.272518],[55.25856,63.274281],[55.25898,63.27586],[55.259392,63.277309],[55.26033,63.280411],[55.261299,63.28331],[55.26223,63.28582],[55.26289,63.28751],[55.263641,63.28928],[55.26524,63.29282],[55.269779,63.30257],[55.272469,63.308239],[55.289742,63.344082],[55.312511,63.391201],[55.334339,63.437031],[55.33736,63.445621],[55.339611,63.453171],[55.352982,63.506691],[55.361198,63.53952],[55.361931,63.543209],[55.36245,63.547668],[55.36264,63.551231],[55.362099,63.560669],[55.35981,63.590931],[55.357052,63.626511],[55.354858,63.6544],[55.354111,63.664101],[55.352779,63.681179],[55.35252,63.687321],[55.352711,63.724781],[55.352829,63.747829],[55.352982,63.775299],[55.354881,63.7995],[55.35918,63.850399],[55.360851,63.8708],[55.360981,63.872459],[55.361229,63.880951],[55.361519,63.89983],[55.36158,63.900051],[55.361858,63.91151],[55.362202,63.918461],[55.363369,63.92704],[55.36974,63.973782],[55.375999,64.019569],[55.379372,64.044548],[55.379829,64.049911],[55.379879,64.055313],[55.379761,64.058708],[55.379318,64.063507],[55.376541,64.081451],[55.37191,64.109947],[55.37093,64.116043],[55.37001,64.123421],[55.369659,64.128487],[55.369469,64.134583],[55.36961,64.140419],[55.371361,64.170288],[55.37162,64.175087],[55.37418,64.221138],[55.37513,64.237747],[55.37561,64.253632],[55.376541,64.287361],[55.377541,64.322197],[55.377998,64.327454],[55.378731,64.333282],[55.38308,64.359459],[55.387169,64.384857],[55.38763,64.388939],[55.389191,64.41568],[55.38924,64.416542],[55.390659,64.441994],[55.391781,64.46209],[55.392021,64.466301],[55.392231,64.469879],[55.394241,64.505539],[55.395802,64.532097],[55.397911,64.568993],[55.399921,64.603783],[55.401649,64.634758],[55.40313,64.661453],[55.404289,64.682663],[55.404331,64.683434],[55.40469,64.686127],[55.407791,64.702011],[55.415829,64.744667],[55.417759,64.754837],[55.420971,64.771858],[55.42157,64.775002],[55.424469,64.790497],[55.427631,64.807411],[55.428741,64.813278],[55.429642,64.818176],[55.430649,64.823486],[55.43095,64.825287],[55.431149,64.826813],[55.431431,64.829514],[55.431728,64.833153],[55.43198,64.836067],[55.432388,64.840958],[55.432781,64.845383],[55.433781,64.857193],[55.4375,64.902077],[55.441929,64.950661],[55.446789,65.001953],[55.44928,65.028252],[55.45269,65.089447],[55.453121,65.094482],[55.453541,65.098083],[55.453979,65.100883],[55.454521,65.103813],[55.45499,65.105957],[55.455479,65.108009],[55.4561,65.110352],[55.45676,65.112663],[55.45739,65.114647],[55.458172,65.116867],[55.464298,65.13385],[55.472229,65.155891],[55.474258,65.161232],[55.475731,65.165649],[55.476761,65.168533],[55.477951,65.172058],[55.478729,65.174263],[55.47884,65.174583],[55.479229,65.175957],[55.480709,65.180946],[55.481098,65.182266],[55.48172,65.184776],[55.483768,65.191566],[55.484459,65.194237],[55.486099,65.199707],[55.486172,65.199951],[55.486328,65.200493],[55.48645,65.200882],[55.48711,65.20311],[55.489799,65.212097],[55.493038,65.223244],[55.493221,65.223869],[55.493568,65.225082],[55.496841,65.23587],[55.501091,65.24958],[55.50132,65.250618],[55.501362,65.25132],[55.50132,65.251556],[55.50132,65.251862],[55.501381,65.252136],[55.501492,65.252357],[55.501572,65.252441],[55.501701,65.252533],[55.502048,65.253029],[55.50243,65.253777],[55.508209,65.272163],[55.51358,65.289261],[55.513599,65.289337],[55.51458,65.292801],[55.51572,65.29776],[55.51659,65.303421],[55.516941,65.308128],[55.516979,65.31089],[55.51701,65.312027],[55.516911,65.316544],[55.516769,65.31958],[55.516659,65.320442],[55.515739,65.328087],[55.51572,65.328232],[55.51038,65.346527],[55.506351,65.360077],[55.504719,65.36557],[55.503799,65.368629],[55.503262,65.370483],[55.501572,65.376152],[55.500092,65.381126],[55.499531,65.383018],[55.49836,65.386993],[55.497669,65.388397],[55.49757,65.388428],[55.497429,65.38855],[55.497341,65.388687],[55.497269,65.388947],[55.497261,65.389183],[55.49728,65.38942],[55.497318,65.389572],[55.49707,65.390923],[55.495461,65.395638],[55.494221,65.3992],[55.493561,65.401131],[55.493019,65.403038],[55.492779,65.404213],[55.492599,65.40538],[55.492359,65.407806],[55.492359,65.409523],[55.492439,65.411186],[55.492779,65.41362],[55.493252,65.415863],[55.49398,65.4179],[55.49477,65.419724],[55.496449,65.422722],[55.497082,65.424553],[55.49754,65.426537],[55.4977,65.428101],[55.497669,65.429817],[55.497311,65.432121],[55.496719,65.434174],[55.495869,65.435898],[55.495258,65.436653],[55.494282,65.437592],[55.493229,65.438118],[55.4921,65.438217],[55.491268,65.438026],[55.4902,65.437492],[55.489349,65.436729],[55.488659,65.43602],[55.488022,65.435287],[55.487789,65.435051],[55.487331,65.434776],[55.487068,65.434753],[55.48687,65.434776],[55.486629,65.434929],[55.480099,65.443237],[55.477669,65.447357],[55.474899,65.455009],[55.473259,65.459709],[55.468029,65.474663],[55.467461,65.476288],[55.459759,65.498352],[55.4585,65.503067],[55.45787,65.507019],[55.457432,65.512604],[55.455971,65.537918],[55.454269,65.564079],[55.453831,65.573692],[55.453732,65.576553],[55.45319,65.580566],[55.452759,65.583],[55.44976,65.59417],[55.445061,65.611649],[55.44495,65.612061],[55.429741,65.669823],[55.419739,65.707779],[55.394691,65.801437],[55.39352,65.805794],[55.38797,65.828491],[55.387482,65.830513],[55.386089,65.838669],[55.383629,65.853172],[55.382309,65.861343],[55.38002,65.87558],[55.37661,65.896263],[55.374458,65.911629],[55.3708,65.938843],[55.370121,65.945618],[55.369831,65.951973],[55.369781,65.961411],[55.370701,65.972397],[55.377041,66.022263],[55.382309,66.062943],[55.38818,66.089546],[55.389969,66.097618],[55.39669,66.128433],[55.397812,66.136932],[55.40147,66.178818],[55.4062,66.234261],[55.40659,66.248772],[55.40567,66.270103],[55.405609,66.271431],[55.404301,66.3013],[55.402439,66.343353],[55.39996,66.401802],[55.39893,66.433823],[55.39645,66.473557],[55.395969,66.481934],[55.39489,66.500603],[55.391869,66.54969],[55.38982,66.584198],[55.388779,66.599937],[55.38855,66.60041],[55.388321,66.601143],[55.388229,66.601692],[55.388309,66.602173],[55.388512,66.602852],[55.388649,66.603073],[55.388489,66.605331],[55.38826,66.609299],[55.387779,66.616966],[55.387039,66.629768],[55.384701,66.669167],[55.381729,66.717056],[55.381451,66.721474],[55.381241,66.724518],[55.380951,66.727364],[55.38055,66.73053],[55.380138,66.733421],[55.3797,66.73613],[55.379211,66.738777],[55.37851,66.742157],[55.377899,66.744591],[55.376991,66.747993],[55.370651,66.769859],[55.368019,66.778954],[55.360748,66.804863],[55.35627,66.820229],[55.355,66.824783],[55.352791,66.831543],[55.351139,66.835831],[55.34845,66.841583],[55.337379,66.865288],[55.324001,66.894043],[55.310959,66.922279],[55.307251,66.931549],[55.30529,66.939789],[55.303539,66.951118],[55.29982,66.992661],[55.29871,67.004959],[55.29689,67.025284],[55.292389,67.079521],[55.290241,67.089478],[55.28183,67.117592],[55.269909,67.157463],[55.266579,67.169472],[55.25782,67.219833],[55.25647,67.225433],[55.24807,67.253098],[55.244831,67.263847],[55.24469,67.263779],[55.244511,67.263779],[55.244339,67.263893],[55.244202,67.264091],[55.24411,67.264374],[55.24408,67.264687],[55.244122,67.264992],[55.244209,67.265259],[55.24435,67.265457],[55.240101,67.278992],[55.227638,67.317841],[55.214691,67.355843],[55.211689,67.365967],[55.204689,67.397057],[55.196541,67.432419],[55.195518,67.436813],[55.18961,67.463318],[55.188999,67.476341],[55.187962,67.50354],[55.188782,67.511383],[55.192871,67.533623],[55.194649,67.546417],[55.194962,67.553429],[55.19413,67.565613],[55.192741,67.580162],[55.192039,67.602631],[55.191132,67.621902],[55.189522,67.629898],[55.178429,67.668518],[55.174301,67.684967],[55.172569,67.693893],[55.164768,67.734177],[55.163471,67.737984],[55.149719,67.768517],[55.131649,67.807831],[55.12394,67.824364],[55.10191,67.865738],[55.09697,67.875008],[55.094269,67.883163],[55.092571,67.894051],[55.092621,67.918877],[55.092621,67.924637],[55.092609,67.925743],[55.092831,67.976692],[55.093311,67.983856],[55.097321,68.026131],[55.099781,68.05143],[55.104031,68.095139],[55.104511,68.104431],[55.10429,68.114708],[55.103031,68.132607],[55.099152,68.18882],[55.096649,68.203423],[55.092152,68.227898],[55.09082,68.240196],[55.091709,68.253601],[55.0938,68.267563],[55.094559,68.277641],[55.093231,68.286392],[55.087719,68.30201],[55.079151,68.324707],[55.068371,68.35363],[55.054989,68.390182],[55.046741,68.41256],[55.027309,68.466507],[55.014111,68.500633],[54.9939,68.554237],[54.99123,68.560219],[54.98875,68.562553],[54.973499,68.573959],[54.95079,68.59079],[54.924641,68.610069],[54.92448,68.610443],[54.924301,68.611618],[54.923611,68.616402],[54.923111,68.61998],[54.922451,68.624489],[54.92197,68.627922],[54.9212,68.633369],[54.920101,68.640846],[54.919559,68.644333],[54.91917,68.648529],[54.919128,68.653183],[54.919319,68.663483],[54.919361,68.672462],[54.919449,68.681358],[54.91954,68.690643],[54.919628,68.698692],[54.91967,68.706421],[54.919788,68.71479],[54.9198,68.718513],[54.919849,68.724922],[54.919941,68.735184],[54.92001,68.746468],[54.92009,68.758133],[54.920219,68.774109],[54.920429,68.799072],[54.920792,68.843628],[54.920818,68.854874],[54.919331,68.878441],[54.917,68.91478],[54.91502,68.944328],[54.912788,68.978416],[54.910358,69.015228],[54.909859,69.021294],[54.90905,69.034103],[54.908852,69.037292],[54.908489,69.042999],[54.90765,69.055283],[54.90731,69.05954],[54.90712,69.062553],[54.906719,69.065102],[54.906189,69.067772],[54.90509,69.07119],[54.905769,69.073486],[54.905869,69.073723],[54.907501,69.07753],[54.910469,69.085258],[54.911518,69.088371],[54.912521,69.091713],[54.913689,69.094673],[54.914989,69.097481],[54.91534,69.099037],[54.915409,69.100037],[54.915379,69.10125],[54.91354,69.114662],[54.91309,69.117012],[54.912762,69.118294],[54.912628,69.118797],[54.91246,69.119926],[54.912411,69.121162],[54.91267,69.125023],[54.912819,69.127327],[54.912109,69.127617],[54.911671,69.127953],[54.911308,69.128349],[54.911041,69.12896],[54.910751,69.129601],[54.910431,69.130463],[54.910229,69.131439],[54.910198,69.131683],[54.910179,69.131866],[54.910172,69.132111],[54.91016,69.132294],[54.910141,69.132477],[54.910141,69.132881],[54.91016,69.133003],[54.910221,69.133171],[54.9104,69.133217],[54.91058,69.133087],[54.91066,69.132919],[54.910721,69.132637],[54.910801,69.132362],[54.910881,69.132042],[54.910961,69.131866],[54.91153,69.131157],[54.91222,69.130302],[54.912338,69.13015],[54.912861,69.129601],[54.914219,69.128349],[54.915661,69.127457],[54.91748,69.12674],[54.919159,69.126549],[54.92194,69.126427],[54.92292,69.126663],[54.92358,69.12719],[54.924122,69.127861],[54.924679,69.128799],[54.92506,69.129837],[54.926399,69.13607],[54.926281,69.136269],[54.926189,69.136574],[54.926231,69.136848],[54.9263,69.137016],[54.926411,69.137169],[54.926559,69.137253],[54.926628,69.137207],[54.926579,69.137527],[54.924191,69.148048],[54.91798,69.17437],[54.917919,69.174316],[54.917728,69.174271],[54.917542,69.174347],[54.917469,69.174622],[54.91748,69.175148],[54.917549,69.175613],[54.917622,69.175697],[54.91769,69.175789],[54.917992,69.175819],[54.918091,69.175751],[54.91811,69.175591],[54.918251,69.176224],[54.93475,69.219063],[54.93576,69.220993],[54.937019,69.222343],[54.93795,69.222893],[54.945759,69.225929],[54.946678,69.226593],[54.94788,69.228241],[54.948399,69.229248],[54.954651,69.248573],[54.95512,69.250549],[54.955231,69.253548],[54.95219,69.281349],[54.951382,69.285461],[54.914391,69.430771],[54.913651,69.435097],[54.913269,69.439484],[54.913391,69.454674],[54.913952,69.525223],[54.914669,69.599983],[54.914902,69.623459],[54.91605,69.798088],[54.909809,69.909576],[54.90976,69.912453],[54.91502,70.140343],[54.915451,70.190514],[54.917278,70.354233],[54.918461,70.369408],[54.918449,70.374023],[54.918018,70.381271],[54.919399,70.435493],[54.92009,70.462624],[54.919998,70.466408],[54.91975,70.469276],[54.91795,70.480713],[54.91774,70.483856],[54.91927,70.528839],[54.930779,70.631973],[54.940411,70.762863],[54.94083,70.776108],[54.940651,70.779343],[54.93998,70.7827],[54.939251,70.784447],[54.937462,70.787086],[54.921299,70.801826],[54.91959,70.80442],[54.91851,70.807426],[54.91806,70.810226],[54.91798,70.81279],[54.919258,70.882713],[54.921379,70.984528],[54.921398,70.985802],[54.921959,71.016243],[54.92207,71.022346],[54.922741,71.059174],[54.923,71.080643],[54.921589,71.136688],[54.921612,71.140411],[54.922001,71.146027],[54.923069,71.153809],[54.923981,71.157944],[54.92514,71.161377],[54.925671,71.162971],[54.927711,71.167511],[54.929909,71.171478],[54.931171,71.174133],[54.93224,71.176979],[54.937721,71.19474],[54.947842,71.227577],[54.949181,71.232407],[54.950802,71.239929],[54.951969,71.247871],[54.952911,71.25663],[54.955811,71.283669],[54.95607,71.286148],[54.956211,71.287483],[54.973251,71.448219],[54.97401,71.453117],[54.974918,71.457787],[54.976719,71.465149],[54.978142,71.469757],[54.9804,71.476341],[54.981201,71.479446],[54.98233,71.483841],[54.98402,71.492989],[54.99025,71.540962],[54.990749,71.546097],[54.991131,71.555542],[54.987789,71.697289],[54.983429,71.778908],[54.983311,71.78492],[54.983589,71.79248],[54.99284,71.913406],[54.9963,71.958504],[54.996449,71.962212],[54.996399,71.966888],[54.996078,71.97171],[54.978851,72.105797],[54.978149,72.112457],[54.977421,72.122673],[54.972771,72.248459],[54.9659,72.335892],[54.965721,72.33828],[54.965549,72.341904],[54.965488,72.345627],[54.965611,72.34996],[54.96624,72.372711],[54.96669,72.391632],[54.966759,72.395111],[54.966591,72.398827],[54.966301,72.403053],[54.964802,72.419296],[54.963531,72.434708],[54.963501,72.436478],[54.963921,72.454826],[54.964569,72.483093],[54.966141,72.539192],[54.9664,72.543533],[54.96698,72.54879],[54.967319,72.551041],[54.96767,72.552994],[54.968491,72.557251],[54.984421,72.617264],[54.985882,72.625191],[54.98658,72.631699],[54.986809,72.635223],[54.990509,72.690758],[54.990501,72.820793],[54.990311,72.82589],[54.9897,72.831818],[54.98793,72.842369],[54.987728,72.843071],[54.985649,72.850288],[54.976269,72.875366],[54.97007,72.891907],[54.96825,72.896843],[54.96804,72.897087],[54.96788,72.897186],[54.96653,72.897278],[54.965801,72.897331],[54.961491,72.897469],[54.958618,72.897636],[54.956902,72.898079],[54.950729,72.900253],[54.940731,72.903793],[54.935379,72.905693],[54.930721,72.907242],[54.928219,72.908211],[54.92672,72.909103],[54.924301,72.911133],[54.922729,72.912666],[54.913921,72.925461],[54.913521,72.926041],[54.906811,72.935799],[54.904121,72.940048],[54.9016,72.944641],[54.895439,72.955879],[54.887291,72.970757],[54.885941,72.974823],[54.88472,72.978493],[54.883831,72.983292],[54.883438,72.987579],[54.883591,72.994751],[54.883598,72.995728],[54.883911,73.017487],[54.883961,73.024017],[54.88361,73.030411],[54.883308,73.033073],[54.88126,73.045387],[54.877781,73.066292],[54.875408,73.080193],[54.87376,73.090279],[54.87175,73.102318],[54.86882,73.119629],[54.866821,73.131432],[54.866501,73.133957],[54.866371,73.135094],[54.866341,73.135803],[54.866371,73.136703],[54.866741,73.139847],[54.86747,73.146378],[54.867661,73.148499],[54.86784,73.151398],[54.86797,73.156677],[54.867882,73.173286],[54.867519,73.213791],[54.86726,73.237701],[54.867352,73.241989],[54.869431,73.262611],[54.869598,73.264427],[54.869781,73.266312],[54.86998,73.268311],[54.870171,73.270348],[54.870232,73.27092],[54.870258,73.271248],[54.87048,73.273521],[54.870739,73.276932],[54.870739,73.277641],[54.870708,73.278999],[54.87059,73.280632],[54.87038,73.282341],[54.869789,73.285683],[54.86961,73.286743],[54.869431,73.287987],[54.86932,73.288872],[54.86924,73.289886],[54.86916,73.2911],[54.86916,73.292717],[54.869209,73.295464],[54.869141,73.296242],[54.869061,73.296532],[54.868969,73.296753],[54.868969,73.296951],[54.869011,73.29718],[54.869148,73.297836],[54.869148,73.299477],[54.869221,73.300499],[54.869221,73.30645],[54.869251,73.316261],[54.86927,73.321907],[54.869289,73.322884],[54.869301,73.323563],[54.86935,73.324303],[54.869438,73.325089],[54.86953,73.325798],[54.86969,73.326767],[54.869949,73.328011],[54.870258,73.329247],[54.87059,73.330307],[54.87093,73.331169],[54.87138,73.332222],[54.872211,73.33371],[54.873138,73.335159],[54.874279,73.336884],[54.875111,73.338219],[54.875809,73.339592],[54.87616,73.340462],[54.876678,73.342049],[54.87764,73.345131],[54.877991,73.346313],[54.878899,73.349327],[54.880051,73.353203],[54.879929,73.353333],[54.879822,73.353561],[54.879768,73.353767],[54.879749,73.353928],[54.879749,73.354073],[54.879768,73.354309],[54.879829,73.354507],[54.879959,73.354736],[54.880119,73.354889],[54.88031,73.354919],[54.880482,73.354843],[54.880611,73.355293],[54.88126,73.357567],[54.88139,73.358124],[54.881481,73.358727],[54.881741,73.36132],[54.881889,73.363533],[54.88192,73.365334],[54.881729,73.371681],[54.881451,73.379997],[54.881481,73.382294],[54.881592,73.384979],[54.881802,73.388153],[54.88195,73.389641],[54.882149,73.391228],[54.882778,73.395287],[54.883202,73.397476],[54.883801,73.400017],[54.884659,73.403008],[54.887199,73.410408],[54.887531,73.411636],[54.887829,73.412773],[54.887951,73.413879],[54.88802,73.414963],[54.888062,73.420387],[54.888081,73.420929],[54.888142,73.421219],[54.88821,73.421471],[54.88829,73.421638],[54.88842,73.421829],[54.888569,73.421951],[54.888809,73.422203],[54.889042,73.422394],[54.888618,73.423233],[54.88821,73.424088],[54.88789,73.424751],[54.887329,73.425941],[54.88715,73.426353],[54.88644,73.427856],[54.884941,73.431084],[54.882381,73.436417],[54.880909,73.439507],[54.880482,73.440399],[54.868172,73.466171],[54.86668,73.469353],[54.866322,73.470123],[54.866039,73.47081],[54.865761,73.471573],[54.86517,73.473412],[54.85984,73.490753],[54.85368,73.510521],[54.85284,73.512589],[54.8466,73.526047],[54.83498,73.548721],[54.83453,73.549553],[54.834049,73.550377],[54.833618,73.55098],[54.83321,73.551537],[54.832729,73.552147],[54.830601,73.55468],[54.827888,73.557899],[54.822762,73.564011],[54.820751,73.566383],[54.819462,73.567703],[54.817711,73.569542],[54.814739,73.572647],[54.81332,73.574203],[54.811901,73.57592],[54.808929,73.579613],[54.80759,73.581291],[54.80563,73.583649],[54.804951,73.584381],[54.802879,73.586372],[54.801941,73.587173],[54.800018,73.588654],[54.797569,73.590477],[54.792831,73.594032],[54.790249,73.595993],[54.785229,73.599648],[54.783138,73.601173],[54.7789,73.604309],[54.777069,73.605827],[54.775532,73.607147],[54.773121,73.609169],[54.770748,73.611153],[54.769341,73.612419],[54.768372,73.613197],[54.767658,73.613731],[54.766941,73.614067],[54.765961,73.614388],[54.765011,73.614693],[54.762569,73.615463],[54.761711,73.615753],[54.756569,73.617012],[54.754822,73.617607],[54.75317,73.61837],[54.75164,73.61927],[54.74894,73.621391],[54.745152,73.625214],[54.74316,73.62812],[54.741089,73.63163],[54.73513,73.641647],[54.730511,73.64946],[54.728809,73.652367],[54.721882,73.664207],[54.718559,73.669907],[54.71759,73.671562],[54.71666,73.673203],[54.715672,73.674896],[54.71521,73.67569],[54.71471,73.676537],[54.714008,73.677742],[54.713322,73.678917],[54.712662,73.680054],[54.712009,73.68116],[54.71133,73.68232],[54.710011,73.684593],[54.709129,73.686089],[54.708408,73.687332],[54.70797,73.688103],[54.706661,73.690353],[54.705219,73.692848],[54.704529,73.694031],[54.70319,73.69635],[54.697128,73.706757],[54.689751,73.717232],[54.689121,73.718262],[54.688412,73.719704],[54.685791,73.725609],[54.682621,73.732887],[54.681629,73.735649],[54.678638,73.74453],[54.676231,73.752121],[54.675499,73.754539],[54.67506,73.756592],[54.67461,73.759506],[54.669811,73.787872],[54.669552,73.789726],[54.66946,73.790932],[54.66943,73.793213],[54.669441,73.796127],[54.669491,73.80822],[54.669498,73.813004],[54.66938,73.815773],[54.669189,73.818489],[54.66906,73.819817],[54.66888,73.821373],[54.66692,73.835472],[54.664951,73.849541],[54.66441,73.853378],[54.664131,73.856163],[54.66404,73.859467],[54.664108,73.868423],[54.664131,73.870811],[54.664131,73.872337],[54.664139,73.874138],[54.664139,73.875427],[54.664082,73.876633],[54.66396,73.877777],[54.66383,73.878563],[54.663601,73.879478],[54.661869,73.884644],[54.661739,73.884933],[54.661201,73.886253],[54.66032,73.887688],[54.658298,73.890327],[54.657089,73.891907],[54.653198,73.896843],[54.65168,73.8992],[54.650318,73.901703],[54.648449,73.905403],[54.64526,73.911743],[54.637871,73.926323],[54.63044,73.941048],[54.626869,73.948608],[54.625771,73.951218],[54.624969,73.953522],[54.624229,73.956398],[54.623772,73.958412],[54.623428,73.960419],[54.623169,73.962578],[54.622849,73.966873],[54.621651,73.982079],[54.621319,73.984642],[54.62075,73.987991],[54.619888,73.991478],[54.61832,73.99633],[54.6152,74.003807],[54.614269,74.005737],[54.613159,74.007507],[54.61132,74.009789],[54.610828,74.010269],[54.609489,74.011414],[54.607498,74.012581],[54.604549,74.013771],[54.60173,74.014954],[54.5989,74.016251],[54.597881,74.01693],[54.597019,74.017609],[54.595379,74.019257],[54.59425,74.020737],[54.59322,74.022461],[54.59129,74.02655],[54.588409,74.032707],[54.587582,74.034554],[54.587109,74.035896],[54.586449,74.038002],[54.56488,74.108017],[54.564659,74.109169],[54.564449,74.110786],[54.564301,74.112923],[54.56377,74.130463],[54.563648,74.134773],[54.563492,74.136871],[54.563049,74.14006],[54.561069,74.153923],[54.560181,74.160744],[54.560211,74.16169],[54.560322,74.162651],[54.560509,74.163544],[54.567749,74.19046],[54.56805,74.191902],[54.568218,74.193542],[54.568199,74.194687],[54.567101,74.211533],[54.566978,74.212936],[54.5667,74.214546],[54.566319,74.215927],[54.562851,74.228378],[54.559299,74.240852],[54.552349,74.265221],[54.548969,74.276917],[54.54813,74.279793],[54.547531,74.281807],[54.546871,74.283401],[54.546299,74.28463],[54.545761,74.285744],[54.544842,74.287163],[54.54385,74.288544],[54.541809,74.290909],[54.538528,74.294937],[54.536869,74.297394],[54.536251,74.298447],[54.508018,74.353081],[54.506748,74.355583],[54.505489,74.358482],[54.504688,74.360657],[54.501949,74.369324],[54.496738,74.385857],[54.495602,74.389122],[54.494999,74.39032],[54.493629,74.392097],[54.493038,74.392776],[54.492298,74.393509],[54.491581,74.394119],[54.490971,74.394417],[54.49036,74.394653],[54.482731,74.396332],[54.481281,74.396652],[54.47961,74.397217],[54.47773,74.398064],[54.47562,74.399193],[54.474232,74.400238],[54.472851,74.401466],[54.471191,74.403214],[54.465809,74.409119],[54.45887,74.417],[54.445148,74.432838],[54.443569,74.434883],[54.44215,74.43718],[54.438179,74.444542],[54.43362,74.453758],[54.431332,74.458389],[54.429119,74.462929],[54.428329,74.464737],[54.42783,74.46611],[54.427052,74.468918],[54.413139,74.523643],[54.408821,74.545128],[54.4081,74.548126],[54.407089,74.55146],[54.405781,74.555069],[54.404621,74.557716],[54.40308,74.560806],[54.397282,74.571693],[54.395721,74.574806],[54.394821,74.577019],[54.393589,74.580391],[54.390739,74.589546],[54.386841,74.602287],[54.384472,74.608887],[54.381611,74.616341],[54.380341,74.619423],[54.378719,74.622581],[54.377731,74.624138],[54.373112,74.630463],[54.372139,74.631493],[54.370991,74.632347],[54.368649,74.633347],[54.364368,74.634827],[54.361431,74.635269],[54.357738,74.635162],[54.354401,74.635063],[54.350929,74.635101],[54.35017,74.635292],[54.34927,74.635674],[54.347839,74.636597],[54.346142,74.638138],[54.343109,74.641037],[54.340832,74.643372],[54.338032,74.646744],[54.332062,74.654007],[54.330589,74.655312],[54.329369,74.655983],[54.32576,74.657303],[54.32243,74.658546],[54.31868,74.659607],[54.29874,74.664368],[54.28014,74.66861],[54.278061,74.669518],[54.277,74.670227],[54.27573,74.671837],[54.27396,74.674751],[54.270531,74.681053],[54.266659,74.687439],[54.265072,74.68988],[54.26413,74.69091],[54.263069,74.69165],[54.26123,74.69252],[54.258911,74.692818],[54.256908,74.692574],[54.252628,74.692329],[54.243259,74.69162],[54.242008,74.691994],[54.24091,74.692574],[54.23978,74.693321],[54.23801,74.695251],[54.232651,74.700867],[54.230331,74.703293],[54.228249,74.705643],[54.226002,74.708588],[54.217861,74.718651],[54.209229,74.729713],[54.208382,74.731133],[54.205688,74.735611],[54.204262,74.737709],[54.20097,74.741524],[54.1954,74.747887],[54.190639,74.753242],[54.1852,74.759453],[54.17564,74.770332],[54.17469,74.771637],[54.173908,74.773117],[54.173279,74.774544],[54.172661,74.776466],[54.17202,74.77993],[54.17197,74.781616],[54.171879,74.783997],[54.17141,74.797913],[54.1712,74.802879],[54.170959,74.805511],[54.170601,74.80851],[54.170292,74.810463],[54.169842,74.812538],[54.16922,74.815399],[54.16898,74.816101],[54.168621,74.817009],[54.168159,74.818069],[54.167782,74.81871],[54.167339,74.819366],[54.166931,74.819893],[54.166618,74.820236],[54.16618,74.820663],[54.164379,74.822258],[54.163761,74.8228],[54.16143,74.824837],[54.157959,74.828072],[54.15588,74.830551],[54.15414,74.833023],[54.14859,74.841667],[54.145859,74.846199],[54.143539,74.850693],[54.126171,74.884651],[54.124008,74.888924],[54.12291,74.891113],[54.121391,74.893867],[54.119881,74.896347],[54.118961,74.897758],[54.11771,74.89959],[54.114922,74.90313],[54.112419,74.906281],[54.107731,74.912079],[54.095638,74.927193],[54.082512,74.94352],[54.079971,74.946693],[54.07436,74.953697],[54.071671,74.957077],[54.07008,74.958763],[54.06942,74.959419],[54.06868,74.960037],[54.06826,74.960327],[54.0672,74.961037],[54.06625,74.96151],[54.065159,74.961899],[54.06414,74.962181],[54.06308,74.96244],[54.062809,74.962463],[54.06152,74.962547],[54.052841,74.96302],[54.042881,74.963631],[54.03878,74.963852],[54.036629,74.963966],[54.034752,74.964188],[54.032211,74.964867],[54.029732,74.965874],[54.029461,74.966057],[54.02747,74.967407],[54.025749,74.96875],[54.018269,74.976044],[54.003441,74.990593],[53.999821,74.994102],[53.99894,74.995117],[53.998291,74.99604],[53.997601,74.997261],[53.996941,74.998703],[53.984928,75.026604],[53.981758,75.034012],[53.978291,75.04216],[53.970989,75.059402],[53.969181,75.063629],[53.966042,75.071037],[53.96199,75.080719],[53.961559,75.081619],[53.961201,75.082138],[53.96077,75.082573],[53.9603,75.082916],[53.959782,75.083122],[53.958988,75.083282],[53.952808,75.083763],[53.9506,75.083946],[53.93763,75.085129],[53.922729,75.086388],[53.92065,75.086517],[53.919949,75.086433],[53.91959,75.086357],[53.919189,75.08625],[53.918758,75.086113],[53.917461,75.085457],[53.91608,75.084793],[53.89254,75.073143],[53.886509,75.070107],[53.885971,75.069847],[53.885059,75.069397],[53.85207,75.053047],[53.845581,75.049728],[53.84314,75.048271],[53.841831,75.047333],[53.84074,75.046448],[53.840061,75.04612],[53.83939,75.045952],[53.834179,75.045486],[53.827469,75.045013],[53.822979,75.044693],[53.816269,75.044777],[53.814781,75.044838],[53.81382,75.044991],[53.809139,75.046387],[53.80328,75.048576],[53.797321,75.051277],[53.79525,75.052208],[53.790722,75.054222],[53.789162,75.054916],[53.788269,75.055367],[53.78756,75.055847],[53.786701,75.056519],[53.78455,75.058311],[53.778759,75.063278],[53.770481,75.070412],[53.757198,75.081909],[53.743389,75.093674],[53.73756,75.098572],[53.73172,75.103493],[53.720261,75.113182],[53.71302,75.11937],[53.707291,75.124252],[53.701962,75.128807],[53.69809,75.131989],[53.696869,75.132973],[53.69524,75.133926],[53.694248,75.134338],[53.69186,75.135223],[53.68578,75.13723],[53.677029,75.140228],[53.668419,75.143494],[53.659451,75.147034],[53.655479,75.148529],[53.653591,75.149269],[53.652241,75.150063],[53.65065,75.151268],[53.649139,75.152771],[53.64782,75.154587],[53.64653,75.156967],[53.645119,75.159668],[53.64109,75.167503],[53.617321,75.213669],[53.616631,75.214951],[53.615372,75.21682],[53.614319,75.218132],[53.61301,75.219513],[53.609341,75.223221],[53.604671,75.22805],[53.600021,75.232803],[53.596169,75.236603],[53.593948,75.239014],[53.59288,75.240448],[53.591839,75.242027],[53.58976,75.245743],[53.581951,75.260193],[53.58073,75.262482],[53.579708,75.264648],[53.57502,75.274643],[53.563271,75.299721],[53.562321,75.301727],[53.56139,75.303436],[53.56044,75.304993],[53.559071,75.306717],[53.55759,75.308319],[53.555511,75.310303],[53.553242,75.312363],[53.541851,75.323303],[53.537479,75.327553],[53.536171,75.32901],[53.53511,75.330566],[53.534489,75.331772],[53.534012,75.33287],[53.53347,75.334244],[53.53289,75.33622],[53.53075,75.345459],[53.528622,75.355003],[53.528259,75.356331],[53.52763,75.357857],[53.526871,75.359642],[53.519531,75.37545],[53.511829,75.391869],[53.507961,75.400261],[53.50388,75.409187],[53.496349,75.425369],[53.49411,75.429611],[53.487141,75.440918],[53.481949,75.449371],[53.480419,75.451622],[53.47884,75.453377],[53.477699,75.454468],[53.471352,75.459686],[53.45953,75.469933],[53.45129,75.47657],[53.4426,75.484047],[53.423809,75.499657],[53.405899,75.514816],[53.403011,75.517319],[53.400982,75.519676],[53.39257,75.529907],[53.379131,75.546082],[53.376369,75.549454],[53.373638,75.552551],[53.368839,75.557251],[53.361271,75.564484],[53.354622,75.57151],[53.346741,75.579842],[53.33374,75.593536],[53.332199,75.59507],[53.33054,75.596237],[53.32309,75.600822],[53.313171,75.60701],[53.303429,75.614983],[53.292061,75.625847],[53.28054,75.636963],[53.274841,75.642403],[53.269409,75.647438],[53.257622,75.658234],[53.25679,75.659019],[53.256062,75.659882],[53.25528,75.661018],[53.236881,75.692253],[53.224159,75.71373],[53.210369,75.737007],[53.184189,75.781197],[53.1828,75.783539],[53.18124,75.786362],[53.179989,75.7892],[53.178551,75.792747],[53.144051,75.880463],[53.13903,75.893288],[53.137718,75.896294],[53.121521,75.928673],[53.104469,75.962639],[53.103729,75.964798],[53.103119,75.967133],[53.098629,75.986427],[53.093159,76.010643],[53.08239,76.056717],[53.080021,76.06707],[53.079861,76.068283],[53.079788,76.06926],[53.079781,76.070702],[53.080002,76.072983],[53.083778,76.089394],[53.084011,76.092072],[53.083801,76.095413],[53.083351,76.098213],[53.081211,76.11013],[53.08083,76.112244],[53.079491,76.12011],[53.07848,76.123863],[53.077518,76.126373],[53.07658,76.128304],[53.075481,76.130173],[53.074551,76.131371],[53.073181,76.132782],[53.066799,76.138641],[53.060459,76.144562],[53.059891,76.145302],[53.058708,76.147507],[53.057671,76.150543],[53.046391,76.198189],[53.033669,76.251053],[53.03017,76.261673],[53.023602,76.281303],[53.01313,76.312683],[53.0103,76.321152],[52.99239,76.374603],[52.99131,76.377548],[52.988701,76.383408],[52.975609,76.412643],[52.959789,76.447762],[52.92849,76.517548],[52.927078,76.520401],[52.92522,76.523666],[52.923599,76.526367],[52.920731,76.531143],[52.912281,76.545067],[52.895981,76.571693],[52.894341,76.573639],[52.892899,76.575043],[52.89151,76.576134],[52.889301,76.577538],[52.879879,76.583122],[52.865108,76.59198],[52.838959,76.607697],[52.810711,76.624588],[52.79121,76.636238],[52.78701,76.638847],[52.78595,76.63945],[52.784939,76.640167],[52.736191,76.680183],[52.68597,76.721161],[52.684212,76.722443],[52.672199,76.730026],[52.656841,76.739647],[52.62907,76.757202],[52.618359,76.763992],[52.605968,76.771767],[52.58215,76.78669],[52.5345,76.816727],[52.52211,76.821098],[52.50993,76.825706],[52.485432,76.834663],[52.466202,76.84169],[52.40942,76.862663],[52.396179,76.868889],[52.37986,76.876846],[52.35146,76.890556],[52.35067,76.890938],[52.34148,76.89537],[52.329899,76.900993],[52.329559,76.901169],[52.32811,76.901947],[52.327049,76.902847],[52.326469,76.903397],[52.32436,76.90583],[52.313049,76.919693],[52.310089,76.923309],[52.309891,76.928452],[52.309071,76.94117],[52.308632,76.947121],[52.308498,76.949203],[52.308369,76.951317],[52.308079,76.955162],[52.307919,76.957283],[52.307789,76.958031],[52.307579,76.958633],[52.304588,76.960541],[52.302189,76.962097],[52.300522,76.963142],[52.29739,76.965118],[52.296429,76.965652],[52.296188,76.965668],[52.293209,76.965912],[52.291851,76.965919],[52.291389,76.965927],[52.290791,76.965988],[52.287601,76.966316],[52.285809,76.966431],[52.285671,76.966454],[52.28458,76.966713],[52.284031,76.967018],[52.28352,76.967438],[52.28307,76.967552],[52.275909,76.968437],[52.270489,76.96904],[52.268452,76.969261],[52.26461,76.969704],[52.264389,76.969749],[52.256741,76.970581],[52.25338,76.971031],[52.2528,76.97126],[52.252251,76.971741],[52.249111,76.976593],[52.24733,76.979172],[52.245079,76.982422],[52.245258,76.982758],[52.246681,76.985359],[52.245049,76.987846],[52.243629,76.985168],[52.24118,76.988808],[52.23851,76.992683],[52.23737,76.994247],[52.236721,76.995132],[52.232681,77.00103],[52.231129,77.003418],[52.22633,77.009827],[52.224651,77.011932],[52.223228,77.01329],[52.22081,77.014862],[52.20134,77.027008],[52.192451,77.033051],[52.155258,77.060623],[52.128948,77.078407],[52.120579,77.085007],[52.115608,77.089149],[52.114368,77.090462],[52.110329,77.095573],[52.087749,77.126488],[52.02565,77.220383],[52.017818,77.23365],[52.014431,77.238632],[52.009892,77.244614],[52.008942,77.245781],[52.003288,77.252037],[51.994431,77.26181],[51.987881,77.268944],[51.926472,77.334503],[51.91893,77.343452],[51.913319,77.350563],[51.91114,77.354134],[51.909191,77.358391],[51.90554,77.370628],[51.902649,77.381416],[51.90229,77.38253],[51.901718,77.384003],[51.900742,77.38607],[51.891979,77.400917],[51.8848,77.414436],[51.882252,77.419601],[51.881031,77.421867],[51.876968,77.426117],[51.86919,77.435799],[51.863548,77.443611],[51.861462,77.446404],[51.859451,77.448517],[51.856781,77.450691],[51.854179,77.452042],[51.828972,77.461777],[51.824478,77.463768],[51.820309,77.466713],[51.811329,77.473358],[51.805752,77.477402],[51.80146,77.480957],[51.79636,77.485367],[51.789841,77.490677],[51.770279,77.50605],[51.768761,77.507408],[51.76709,77.509178],[51.765709,77.510872],[51.73035,77.557549],[51.729481,77.558502],[51.728081,77.559578],[51.726379,77.560402],[51.725151,77.560593],[51.723949,77.560516],[51.722801,77.560226],[51.701229,77.551262],[51.70013,77.55098],[51.698509,77.550873],[51.697948,77.550949],[51.696819,77.5513],[51.681561,77.556793],[51.67968,77.557678],[51.67807,77.558594],[51.67651,77.559669],[51.65694,77.573929],[51.654819,77.5756],[51.6525,77.577698],[51.650768,77.579529],[51.637829,77.594147],[51.637039,77.594841],[51.635929,77.595558],[51.634789,77.5961],[51.633911,77.596329],[51.615162,77.599907],[51.614288,77.600143],[51.612862,77.600708],[51.61203,77.601196],[51.61095,77.60202],[51.597519,77.613213],[51.594929,77.615112],[51.5923,77.616814],[51.589958,77.61821],[51.54343,77.643517],[51.540958,77.644943],[51.539619,77.645889],[51.537781,77.647423],[51.53088,77.653717],[51.527859,77.656578],[51.52644,77.658257],[51.52536,77.659866],[51.522968,77.663757],[51.507431,77.6903],[51.5005,77.706619],[51.49971,77.708763],[51.491711,77.729446],[51.48793,77.741676],[51.487179,77.746033],[51.479191,77.798149],[51.477859,77.808937],[51.478561,77.820137],[51.47921,77.829269],[51.47839,77.838791],[51.473591,77.889008],[51.472099,77.898453],[51.47068,77.90657],[51.469509,77.91227],[51.468201,77.917809],[51.465511,77.928558],[51.46513,77.931038],[51.465,77.93309],[51.464909,77.935493],[51.464779,77.937134],[51.464298,77.945389],[51.463741,77.956268],[51.461029,77.989197],[51.460812,77.991142],[51.458012,78.012352],[51.45776,78.014717],[51.448521,78.092888],[51.44817,78.096573],[51.448158,78.098442],[51.4487,78.141037],[51.448662,78.141899],[51.447891,78.145554],[51.427341,78.207191],[51.418861,78.225723],[51.41803,78.22789],[51.40752,78.26239],[51.396679,78.298233],[51.39542,78.302254],[51.394371,78.304718],[51.394211,78.304947],[51.39386,78.305511],[51.393478,78.306084],[51.366341,78.342201],[51.358009,78.354073],[51.35482,78.360786],[51.233669,78.603119],[51.220341,78.630928],[51.188259,78.696838],[51.18729,78.69886],[51.186729,78.700058],[51.18626,78.701118],[51.124222,78.829292],[51.12355,78.830757],[51.12236,78.833801],[51.121422,78.837013],[51.12114,78.838249],[51.12051,78.841789],[51.095852,79.064957],[51.095509,79.068718],[51.095379,79.069504],[51.095032,79.071701],[51.09404,79.073753],[51.09264,79.075302],[51.079861,79.086357],[51.078751,79.087646],[51.07251,79.098297],[51.071159,79.100227],[51.05582,79.115723],[51.049122,79.122276],[51.046509,79.123253],[51.041889,79.123398],[51.039131,79.123734],[51.037231,79.125229],[51.035229,79.12896],[51.027439,79.144852],[51.026489,79.147476],[51.02626,79.148773],[51.02179,79.177223],[51.021488,79.178841],[51.020741,79.18203],[51.01981,79.187233],[51.01717,79.20491],[51.016891,79.206558],[51.016541,79.208183],[51.016029,79.210136],[51.015579,79.211617],[51.007591,79.234901],[51.005562,79.242317],[51.003342,79.251389],[51.003021,79.252533],[51.002659,79.253593],[51.001808,79.255669],[50.98951,79.284027],[50.98748,79.287827],[50.962818,79.324883],[50.962559,79.325447],[50.962379,79.326103],[50.962212,79.327141],[50.959042,79.355682],[50.958809,79.356934],[50.958149,79.358727],[50.957802,79.359367],[50.953659,79.365479],[50.930439,79.399277],[50.926579,79.403992],[50.918289,79.412323],[50.916969,79.413887],[50.913879,79.419724],[50.893089,79.460503],[50.872532,79.485619],[50.866772,79.489517],[50.82011,79.513809],[50.816929,79.5168],[50.814468,79.520363],[50.80534,79.535316],[50.795849,79.544861],[50.793091,79.548866],[50.770229,79.570343],[50.766281,79.576218],[50.758541,79.596062],[50.746498,79.631073],[50.731331,79.676567],[50.720749,79.708328],[50.703209,79.74054],[50.69994,79.747147],[50.69088,79.768768],[50.683689,79.79467],[50.67292,79.832642],[50.670799,79.840111],[50.662849,79.868134],[50.661018,79.872467],[50.65765,79.878677],[50.655571,79.882507],[50.63998,79.910912],[50.636139,79.916557],[50.620838,79.939331],[50.61507,79.951691],[50.600399,79.982117],[50.585468,80.013718],[50.580212,80.02227],[50.577808,80.02652],[50.57518,80.034264],[50.573009,80.041977],[50.57056,80.050537],[50.56884,80.056877],[50.566608,80.062363],[50.559872,80.072617],[50.553612,80.081573],[50.54895,80.091049],[50.54501,80.096603],[50.542839,80.097717],[50.533352,80.099632],[50.530899,80.100929],[50.525398,80.104149],[50.522221,80.105339],[50.51479,80.106903],[50.508839,80.10836],[50.507149,80.109169],[50.50613,80.109894],[50.505871,80.110092],[50.505508,80.110397],[50.499519,80.118111],[50.49921,80.118668],[50.498772,80.119797],[50.49789,80.123573],[50.49752,80.124908],[50.496269,80.129204],[50.495819,80.130363],[50.495411,80.131073],[50.49308,80.133904],[50.491718,80.135551],[50.490509,80.136971],[50.490189,80.137268],[50.486549,80.139992],[50.485451,80.140953],[50.481461,80.144653],[50.480961,80.14537],[50.480141,80.147072],[50.479561,80.148903],[50.479019,80.150627],[50.47871,80.151627],[50.478321,80.152977],[50.4776,80.156029],[50.477539,80.156303],[50.474152,80.174263],[50.473228,80.17939],[50.472271,80.184387],[50.47208,80.185463],[50.47179,80.187027],[50.47139,80.18969],[50.470718,80.196457],[50.470322,80.200493],[50.470058,80.202507],[50.469769,80.20388],[50.469521,80.204887],[50.469299,80.205589],[50.46806,80.20974],[50.46624,80.216202],[50.465012,80.21991],[50.46447,80.221497],[50.464031,80.222557],[50.463169,80.224312],[50.461349,80.227753],[50.460651,80.228928],[50.45948,80.230789],[50.458599,80.232033],[50.458118,80.232437],[50.456772,80.233307],[50.453121,80.235207],[50.448212,80.237793],[50.447819,80.237923],[50.447571,80.23793],[50.44733,80.237831],[50.447201,80.237694],[50.4459,80.236343],[50.44566,80.23613],[50.445492,80.235977],[50.445301,80.235924],[50.444969,80.23587],[50.444519,80.236481],[50.443932,80.237343],[50.443802,80.237633],[50.443722,80.237961],[50.443378,80.24015],[50.443199,80.241318],[50.44313,80.242111],[50.443039,80.243042],[50.442871,80.243759],[50.44278,80.244011],[50.442669,80.244308],[50.44231,80.24485],[50.441528,80.245911],[50.440762,80.24691],[50.440552,80.247276],[50.440559,80.251106],[50.440559,80.251862],[50.440571,80.255997],[50.44059,80.259911],[50.439892,80.258827],[50.438789,80.257118],[50.437721,80.25544],[50.437061,80.254433],[50.436649,80.253639],[50.436298,80.253082],[50.435532,80.251907],[50.434078,80.249634],[50.4338,80.249153],[50.432331,80.246696],[50.430851,80.244049],[50.429489,80.241982],[50.427849,80.239441],[50.426769,80.237717],[50.425671,80.235977],[50.424549,80.234207],[50.42345,80.232437],[50.422421,80.230797],[50.422329,80.230598],[50.422291,80.230423],[50.422272,80.230331],[50.422272,80.230019],[50.422218,80.229637],[50.422138,80.229317],[50.421902,80.228851],[50.4217,80.228592],[50.4216,80.228523],[50.42128,80.228302],[50.420979,80.228241],[50.420738,80.228401],[50.420589,80.228691],[50.42046,80.228798],[50.420231,80.228882],[50.419559,80.228821],[50.418201,80.228569],[50.41748,80.228432],[50.416191,80.22805],[50.415661,80.227791],[50.414989,80.227432],[50.414131,80.226929],[50.4053,80.221863],[50.40469,80.221527],[50.403019,80.221031],[50.402401,80.220863],[50.401581,80.220741],[50.401031,80.220657],[50.399311,80.22039],[50.39875,80.220543],[50.398548,80.220642],[50.398361,80.220787],[50.398159,80.220871],[50.397999,80.220901],[50.397629,80.220718],[50.3974,80.220711],[50.397072,80.220772],[50.396671,80.221039],[50.396351,80.221352],[50.395809,80.221992],[50.395439,80.222527],[50.395168,80.223038],[50.39502,80.223373],[50.39489,80.223763],[50.394798,80.223953],[50.394661,80.224113],[50.39455,80.224182],[50.394402,80.224228],[50.39402,80.224243],[50.39362,80.224319],[50.393101,80.224457],[50.392429,80.224716],[50.391159,80.225403],[50.390282,80.226082],[50.389118,80.22702],[50.385971,80.229622],[50.38485,80.23037],[50.38287,80.231682],[50.38155,80.232513],[50.380508,80.233391],[50.37973,80.234268],[50.37862,80.235771],[50.378281,80.236259],[50.378132,80.236458],[50.37574,80.239532],[50.37561,80.239922],[50.374352,80.241722],[50.37109,80.24633],[50.370972,80.246513],[50.368279,80.250412],[50.366982,80.252296],[50.36483,80.254951],[50.364552,80.255524],[50.363361,80.256828],[50.363029,80.256187],[50.36293,80.256058],[50.36277,80.255997],[50.36264,80.256119],[50.362091,80.25679],[50.361591,80.25737],[50.36013,80.259033],[50.359909,80.259407],[50.359852,80.25985],[50.359909,80.260277],[50.35997,80.260773],[50.3601,80.26178],[50.360271,80.263077],[50.36031,80.263931],[50.360378,80.265427],[50.360409,80.266212],[50.360451,80.267143],[50.360451,80.267761],[50.360378,80.268303],[50.36002,80.269943],[50.359829,80.27034],[50.359718,80.270462],[50.35952,80.270691],[50.358528,80.271301],[50.358398,80.271477],[50.357769,80.272652],[50.355282,80.276718],[50.353569,80.279518],[50.352551,80.281174],[50.349991,80.285347],[50.348801,80.287376],[50.34771,80.28933],[50.34613,80.292107],[50.344971,80.294273],[50.34164,80.300957],[50.339989,80.30381],[50.31815,80.339973],[50.317699,80.3405],[50.3097,80.352638],[50.29863,80.370323],[50.288872,80.387657],[50.254799,80.438637],[50.1786,80.543793],[50.147369,80.586998],[50.140499,80.595627],[50.129791,80.608902],[50.12748,80.611763],[50.125332,80.61425],[50.048908,80.68779],[50.013439,80.721893],[49.99485,80.740593],[49.99086,80.744957],[49.980228,80.756561],[49.977631,80.759216],[49.964771,80.772614],[49.960129,80.776558],[49.954281,80.780327],[49.948589,80.782913],[49.837891,80.833717],[49.83419,80.835533],[49.832191,80.837158],[49.80888,80.859039],[49.806938,80.860931],[49.797581,80.872002],[49.795361,80.87458],[49.794201,80.875519],[49.792919,80.875862],[49.782131,80.879662],[49.781448,80.879898],[49.77985,80.880836],[49.77879,80.882042],[49.777302,80.88385],[49.736259,80.945213],[49.733879,80.948143],[49.73111,80.950974],[49.673931,81.008041],[49.668369,81.014137],[49.662201,81.021088],[49.65498,81.028976],[49.646358,81.037537],[49.632919,81.050873],[49.631248,81.052078],[49.62986,81.052513],[49.625141,81.053543],[49.62352,81.054222],[49.621738,81.055252],[49.620129,81.056877],[49.605228,81.073448],[49.603111,81.076279],[49.59388,81.089241],[49.553799,81.14563],[49.5425,81.163139],[49.537991,81.17009],[49.53754,81.17112],[49.536152,81.171982],[49.532249,81.178162],[49.53075,81.180733],[49.523109,81.196442],[49.52261,81.198761],[49.52261,81.200989],[49.523109,81.203651],[49.52306,81.205711],[49.519772,81.231293],[49.5191,81.234207],[49.51704,81.241158],[49.509689,81.271461],[49.500149,81.299011],[49.499371,81.300636],[49.498089,81.302361],[49.48444,81.315964],[49.477909,81.323692],[49.474449,81.328407],[49.4725,81.331413],[49.470879,81.334503],[49.469261,81.338371],[49.455101,81.372704],[49.45393,81.374329],[49.45314,81.375107],[49.452301,81.37545],[49.445,81.376297],[49.443039,81.376823],[49.441429,81.377678],[49.44009,81.378883],[49.436741,81.383087],[49.435452,81.38472],[49.434219,81.38652],[49.433159,81.388237],[49.42725,81.401108],[49.421219,81.414253],[49.418541,81.419479],[49.411678,81.429916],[49.400391,81.447113],[49.39827,81.450287],[49.39156,81.461533],[49.38866,81.466682],[49.382511,81.47673],[49.380718,81.480247],[49.372341,81.49939],[49.37133,81.502136],[49.37072,81.504883],[49.36927,81.512001],[49.368649,81.514236],[49.367981,81.516037],[49.36647,81.518959],[49.364799,81.521713],[49.362339,81.525047],[49.356628,81.532257],[49.35479,81.53389],[49.34597,81.540771],[49.344952,81.541206],[49.343632,81.541473],[49.34333,81.541527],[49.340672,81.541313],[49.33812,81.541054],[49.335979,81.540817],[49.33514,81.540771],[49.334141,81.540863],[49.333038,81.54113],[49.332169,81.54155],[49.331421,81.542183],[49.329498,81.544533],[49.328152,81.546356],[49.32795,81.546631],[49.324299,81.551483],[49.322681,81.553627],[49.321751,81.554893],[49.321259,81.555237],[49.321011,81.555313],[49.32069,81.555267],[49.320511,81.555206],[49.320339,81.555031],[49.320141,81.554764],[49.32,81.554527],[49.319931,81.554253],[49.31987,81.553459],[49.319889,81.551407],[49.320042,81.544144],[49.320061,81.54332],[49.320091,81.541809],[49.320278,81.532089],[49.320541,81.520844],[49.321339,81.486343],[49.321339,81.484283],[49.321331,81.481621],[49.321308,81.47982],[49.32077,81.477058],[49.318619,81.468513],[49.318211,81.467102],[49.317501,81.464767],[49.31506,81.459068],[49.313931,81.456322],[49.29652,81.414993],[49.275181,81.364922],[49.254799,81.316856],[49.235931,81.271873],[49.23465,81.269058],[49.23217,81.264801],[49.230999,81.263184],[49.22913,81.261017],[49.226669,81.258499],[49.218109,81.250893],[49.19363,81.229141],[49.190189,81.22509],[49.189041,81.222366],[49.188091,81.219749],[49.187592,81.217003],[49.187149,81.214172],[49.187019,81.210899],[49.187302,81.204613],[49.187271,81.202583],[49.187061,81.200394],[49.186401,81.197197],[49.185638,81.195068],[49.18441,81.192802],[49.182369,81.190697],[49.179611,81.188919],[49.176208,81.187088],[49.174641,81.186363],[49.173618,81.185463],[49.172539,81.184052],[49.171612,81.182587],[49.17041,81.180519],[49.167099,81.174347],[49.16547,81.171173],[49.160641,81.158813],[49.15929,81.156151],[49.158119,81.154266],[49.1511,81.144478],[49.14925,81.141388],[49.147961,81.138901],[49.14621,81.134613],[49.145481,81.133408],[49.144531,81.132378],[49.142342,81.130493],[49.141048,81.128937],[49.140091,81.127403],[49.129929,81.109627],[49.128189,81.107323],[49.099369,81.076927],[49.09729,81.074699],[49.09594,81.072723],[49.09499,81.070839],[49.094372,81.069122],[49.09425,81.067413],[49.094372,81.065514],[49.0942,81.06337],[49.09351,81.059097],[49.091969,81.054367],[49.091129,81.052399],[49.089951,81.050339],[49.088772,81.048798],[49.071232,81.026314],[49.069771,81.024513],[49.068298,81.023216],[49.06707,81.02253],[49.059021,81.019096],[49.05661,81.017982],[49.048618,81.012573],[49.047379,81.011276],[49.037762,80.998329],[49.03619,80.996353],[49.03511,80.995407],[49.03371,80.994461],[49.020882,80.985367],[49.019501,80.984467],[49.014061,80.979347],[49.012428,80.978073],[49.01086,80.977211],[49.008888,80.976097],[49.00737,80.97464],[49.000839,80.966827],[48.999088,80.965027],[48.997849,80.963913],[48.99498,80.96199],[48.993118,80.960442],[48.99165,80.958298],[48.988419,80.95253],[48.987301,80.950897],[48.985722,80.94944],[48.984138,80.948486],[48.980709,80.947212],[48.978569,80.945923],[48.976822,80.944473],[48.95203,80.920937],[48.950581,80.919563],[48.94915,80.917877],[48.946911,80.913948],[48.913811,80.859528],[48.912689,80.8573],[48.9119,80.855164],[48.91127,80.852921],[48.910431,80.848801],[48.909691,80.846657],[48.903042,80.833443],[48.901741,80.831551],[48.900612,80.830002],[48.898918,80.828293],[48.89711,80.827003],[48.89357,80.825073],[48.887291,80.82206],[48.882999,80.819962],[48.881439,80.819473],[48.867081,80.817131],[48.866169,80.816963],[48.865391,80.816933],[48.864559,80.817062],[48.826309,80.825882],[48.824501,80.82666],[48.82275,80.827507],[48.82127,80.828537],[48.819519,80.830093],[48.80703,80.84082],[48.805389,80.84211],[48.803699,80.842957],[48.80172,80.843483],[48.798328,80.844597],[48.784302,80.850937],[48.783058,80.851288],[48.77718,80.851967],[48.775928,80.851967],[48.773079,80.85186],[48.76965,80.851547],[48.75919,80.850693],[48.756359,80.85054],[48.75177,80.848717],[48.739208,80.843727],[48.73711,80.842453],[48.735809,80.841164],[48.72823,80.829567],[48.726398,80.827591],[48.72459,80.826653],[48.722832,80.826393],[48.715981,80.82486],[48.71294,80.823891],[48.697102,80.817177],[48.691078,80.81456],[48.688881,80.813606],[48.687199,80.81292],[48.685501,80.812332],[48.683559,80.811493],[48.682331,80.810928],[48.68079,80.809769],[48.674721,80.80381],[48.670029,80.798843],[48.654549,80.782288],[48.652519,80.779533],[48.56625,80.656357],[48.562111,80.650528],[48.56052,80.649063],[48.558701,80.648117],[48.521759,80.631844],[48.514252,80.626694],[48.506981,80.62014],[48.470058,80.584862],[48.451328,80.564262],[48.445351,80.558434],[48.431862,80.544952],[48.428841,80.542213],[48.386341,80.499123],[48.384232,80.496117],[48.381611,80.492157],[48.36536,80.463501],[48.36467,80.462471],[48.36404,80.461952],[48.363251,80.4617],[48.359138,80.461868],[48.358231,80.461609],[48.35714,80.460922],[48.335468,80.440071],[48.334209,80.439377],[48.332901,80.43895],[48.33136,80.438698],[48.329479,80.438522],[48.303791,80.436546],[48.282089,80.435089],[48.280609,80.435013],[48.278839,80.435089],[48.276951,80.435349],[48.2565,80.442299],[48.218819,80.454918],[48.201778,80.461182],[48.199951,80.4617],[48.189301,80.464272],[48.18261,80.467102],[48.180321,80.467621],[48.178551,80.467789],[48.175289,80.467697],[48.151119,80.465637],[48.140419,80.464531],[48.138809,80.464012],[48.137661,80.463074],[48.13583,80.462547],[48.133202,80.462044],[48.129929,80.46067],[48.127239,80.459549],[48.125061,80.458183],[48.123798,80.457657],[48.120941,80.457237],[48.11853,80.456459],[48.114059,80.453888],[48.112919,80.453712],[48.110909,80.453712],[48.108559,80.454491],[48.102139,80.455261],[48.100361,80.455261],[48.094521,80.454659],[48.087639,80.453369],[48.082821,80.451309],[48.081959,80.450706],[48.0802,80.448807],[48.078949,80.446602],[48.07795,80.444893],[48.07597,80.443291],[48.073978,80.442009],[48.069759,80.440331],[48.068878,80.439133],[48.067829,80.436317],[48.066292,80.434669],[48.06041,80.433647],[48.05928,80.43306],[48.057381,80.43177],[48.05444,80.429626],[48.053261,80.428909],[48.051949,80.428711],[48.0438,80.429039],[48.0415,80.428818],[48.040199,80.428123],[48.03611,80.425949],[48.032051,80.423782],[48.030571,80.422501],[48.029652,80.421471],[48.02541,80.419167],[48.021198,80.416908],[48.019539,80.416183],[48.018749,80.4161],[48.017658,80.41629],[47.991871,80.420624],[47.99033,80.420883],[47.987949,80.420197],[47.987068,80.419563],[47.984379,80.416069],[47.98214,80.413673],[47.974831,80.406982],[47.963409,80.398438],[47.961182,80.397171],[47.958969,80.396156],[47.957169,80.395592],[47.955151,80.39521],[47.952431,80.394997],[47.948669,80.395233],[47.945518,80.395798],[47.940239,80.396606],[47.92968,80.398376],[47.927811,80.398933],[47.926281,80.399696],[47.924911,80.400841],[47.923679,80.402428],[47.92281,80.403801],[47.92189,80.405907],[47.921028,80.408737],[47.920361,80.413338],[47.920189,80.414627],[47.919071,80.421181],[47.917919,80.424767],[47.916519,80.42717],[47.915371,80.428757],[47.91367,80.430153],[47.912231,80.431068],[47.91,80.431641],[47.90947,80.431587],[47.908821,80.431511],[47.90741,80.43129],[47.90609,80.431107],[47.9039,80.430817],[47.901539,80.430519],[47.901409,80.430496],[47.901131,80.430527],[47.900841,80.430603],[47.9007,80.430649],[47.900421,80.430794],[47.900139,80.430977],[47.899738,80.43132],[47.89922,80.4319],[47.89888,80.432373],[47.89835,80.433281],[47.89814,80.433678],[47.897732,80.434517],[47.897449,80.43515],[47.897202,80.43576],[47.89706,80.436172],[47.896961,80.436607],[47.89687,80.437271],[47.896801,80.43882],[47.896111,80.441483],[47.8895,80.466629],[47.888458,80.469467],[47.88308,80.481781],[47.88253,80.484047],[47.88242,80.485947],[47.884239,80.498688],[47.884121,80.500748],[47.883259,80.503113],[47.872631,80.519592],[47.87114,80.521431],[47.86964,80.522461],[47.868599,80.523232],[47.867851,80.524094],[47.867081,80.525513],[47.865028,80.529671],[47.860371,80.535767],[47.846722,80.551987],[47.84539,80.552849],[47.843552,80.553879],[47.8428,80.554573],[47.84193,80.555679],[47.838188,80.558769],[47.824478,80.568977],[47.81485,80.57679],[47.79208,80.597733],[47.79047,80.599449],[47.788731,80.601768],[47.78735,80.603996],[47.785561,80.606148],[47.782742,80.608887],[47.762951,80.62709],[47.759609,80.629578],[47.752739,80.634468],[47.751869,80.635406],[47.75037,80.637993],[47.749512,80.639267],[47.748291,80.640556],[47.737209,80.650352],[47.735249,80.651627],[47.733231,80.652321],[47.730869,80.652496],[47.71777,80.652618],[47.71574,80.652786],[47.713951,80.653442],[47.71117,80.654472],[47.69194,80.662369],[47.684441,80.665321],[47.681252,80.667],[47.67836,80.667343],[47.67588,80.667603],[47.673679,80.668213],[47.672119,80.66906],[47.668591,80.671379],[47.66703,80.671982],[47.665409,80.671982],[47.66021,80.671204],[47.65744,80.670433],[47.655472,80.669144],[47.653679,80.667603],[47.650089,80.663834],[47.648769,80.661926],[47.64645,80.657806],[47.645531,80.656616],[47.644371,80.655586],[47.638119,80.650703],[47.636971,80.64949],[47.636341,80.648239],[47.635181,80.646782],[47.634201,80.645752],[47.632408,80.64489],[47.63055,80.644043],[47.628189,80.643257],[47.609489,80.641586],[47.595901,80.638283],[47.589649,80.636833],[47.587109,80.635887],[47.58363,80.633636],[47.578072,80.629959],[47.568802,80.623444],[47.56736,80.622231],[47.566078,80.621803],[47.564869,80.621628],[47.55537,80.622414],[47.549568,80.623093],[47.546799,80.623444],[47.543732,80.62336],[47.539551,80.622658],[47.532768,80.622917],[47.529751,80.623001],[47.526279,80.622147],[47.510658,80.61721],[47.487869,80.608543],[47.485722,80.607773],[47.480671,80.605751],[47.47731,80.604637],[47.43161,80.593521],[47.42905,80.592323],[47.421242,80.586311],[47.418598,80.584167],[47.416599,80.582916],[47.396759,80.579399],[47.392311,80.578667],[47.389759,80.579742],[47.387699,80.580429],[47.374851,80.580688],[47.372471,80.581078],[47.363312,80.584846],[47.360371,80.586273],[47.35825,80.586739],[47.352638,80.586647],[47.349819,80.587341],[47.34119,80.59259],[47.331879,80.597717],[47.319569,80.605148],[47.314831,80.610023],[47.300751,80.622543],[47.298939,80.623947],[47.296761,80.625023],[47.295071,80.626427],[47.292019,80.630363],[47.272099,80.654472],[47.270119,80.656708],[47.267269,80.658943],[47.260921,80.663689],[47.257599,80.666351],[47.25127,80.675407],[47.247211,80.683594],[47.246471,80.684959],[47.244949,80.686447],[47.243061,80.68705],[47.239849,80.687317],[47.233131,80.687828],[47.189499,80.691467],[47.144661,80.694481],[47.07082,80.699287],[47.052109,80.699966],[46.981419,80.698601],[46.977669,80.698257],[46.97451,80.696716],[46.971809,80.695],[46.969471,80.692078],[46.967251,80.688477],[46.935261,80.630463],[46.93327,80.626846],[46.930679,80.623589],[46.92189,80.6138],[46.89727,80.5858],[46.892929,80.58168],[46.890121,80.579361],[46.887299,80.57756],[46.861721,80.563393],[46.85849,80.562187],[46.85614,80.561417],[46.853561,80.560738],[46.839649,80.561081],[46.806992,80.561958],[46.728088,80.562302],[46.72385,80.56282],[46.721378,80.564018],[46.717739,80.56694],[46.714088,80.57106],[46.711262,80.575348],[46.709259,80.578957],[46.708199,80.581703],[46.706791,80.58342],[46.703732,80.583588],[46.68948,80.58342],[46.686069,80.583763],[46.683949,80.584793],[46.680531,80.588387],[46.678532,80.590446],[46.676289,80.591827],[46.674171,80.592346],[46.671822,80.59166],[46.666519,80.587883],[46.63953,80.570541],[46.635288,80.568657],[46.631519,80.568138],[46.628571,80.568481],[46.62513,80.569603],[46.557652,80.610458],[46.524948,80.630287],[46.49506,80.64814],[46.45723,80.670799],[46.428841,80.687798],[46.414989,80.696037],[46.413479,80.696259],[46.411678,80.696121],[46.41032,80.695602],[46.409321,80.695183],[46.40836,80.694923],[46.407001,80.694923],[46.405579,80.695351],[46.404751,80.695953],[46.402981,80.697411],[46.396648,80.703484],[46.384979,80.714737],[46.342571,80.749603],[46.303871,80.781372],[46.22459,80.846413],[46.207008,80.860657],[46.204029,80.863136],[46.19865,80.867607],[46.198219,80.868042],[46.197861,80.868729],[46.197861,80.869667],[46.198341,80.870354],[46.199711,80.87233],[46.200661,80.873878],[46.20298,80.880402],[46.203388,80.881767],[46.203449,80.883583],[46.20285,80.889503],[46.202621,80.89164],[46.201191,80.901688],[46.200062,80.904427],[46.19846,80.907349],[46.196499,80.910439],[46.190979,80.928886],[46.186642,80.939537],[46.185211,80.943008],[46.183781,80.947128],[46.182949,80.951332],[46.182598,80.955193],[46.182419,80.971069],[46.180462,80.972443],[46.176182,80.974503],[46.122959,81.002571],[46.11903,81.004288],[46.1157,81.006767],[46.086899,81.024117],[46.085949,81.024971],[46.085411,81.02626],[46.085171,81.027718],[46.084808,81.029182],[46.06403,81.067802],[46.061291,81.072441],[46.05891,81.075699],[46.01363,81.126251],[46.011719,81.128754],[46.010529,81.131401],[45.999378,81.170197],[45.99699,81.176643],[45.98489,81.20359],[45.983398,81.207283],[45.98209,81.2108],[45.974869,81.251556],[45.966999,81.295174],[45.96574,81.300751],[45.952202,81.352943],[45.92617,81.46151],[45.92474,81.467003],[45.923431,81.471207],[45.907719,81.513351],[45.884838,81.574379],[45.883888,81.576439],[45.88311,81.577553],[45.87851,81.58287],[45.841572,81.624672],[45.83918,81.627853],[45.82835,81.650421],[45.82291,81.661407],[45.782639,81.745087],[45.770489,81.775818],[45.711369,81.934608],[45.706032,81.947403],[45.701962,81.955116],[45.697521,81.961212],[45.695599,81.962929],[45.69392,81.963867],[45.69212,81.963959],[45.691051,81.963707],[45.686371,81.962837],[45.683491,81.962761],[45.682468,81.963188],[45.68079,81.964821],[45.58416,82.071327],[45.53891,82.121536],[45.502449,82.168114],[45.47237,82.206497],[45.435539,82.253471],[45.43288,82.256813],[45.352539,82.358437],[45.34301,82.370888],[45.295689,82.430367],[45.287159,82.441269],[45.282871,82.446083],[45.276649,82.452087],[45.258049,82.468567],[45.257339,82.469673],[45.256802,82.471046],[45.25655,82.472603],[45.256371,82.474907],[45.255772,82.476196],[45.255081,82.476967],[45.24276,82.492943],[45.24107,82.495087],[45.23835,82.500153],[45.23605,82.505562],[45.235748,82.50676],[45.235748,82.508476],[45.236408,82.513367],[45.23629,82.51474],[45.235691,82.516289],[45.234779,82.517754],[45.221298,82.542213],[45.217979,82.546928],[45.21302,82.553284],[45.21175,82.554398],[45.210171,82.555344],[45.208,82.556198],[45.2057,82.556969],[45.204491,82.557907],[45.200378,82.561691],[45.197479,82.564438],[45.195782,82.565468],[45.19421,82.56633],[45.19318,82.566406],[45.189789,82.565552],[45.17136,82.560516],[45.166561,82.559196],[45.163719,82.55809],[45.158691,82.556969],[45.152882,82.556717],[45.084499,82.560577],[45.081108,82.560997],[45.071529,82.563843],[45.0508,82.570007],[45.04612,82.571747],[45.04187,82.574661],[45.039688,82.57827],[45.01506,82.595444],[45.01239,82.597504],[45.005718,82.605743],[45.002682,82.608307],[44.99564,82.617073],[44.978771,82.627373],[44.958,82.636978],[44.947311,82.640244],[44.94281,82.639549],[44.936371,82.637833],[44.931629,82.632507],[44.93111,82.630547],[44.9258,82.610367],[44.903549,82.542389],[44.844742,82.543419],[44.835861,82.53981],[44.834709,82.554497],[44.825001,82.547546],[44.808102,82.535461],[44.803349,82.525513],[44.802368,82.523788],[44.798359,82.516747],[44.798481,82.514],[44.79129,82.502159],[44.78569,82.496147],[44.778252,82.493919],[44.77277,82.48774],[44.765209,82.48774],[44.7616,82.496841],[44.755459,82.512283],[44.755829,82.539062],[44.74157,82.540092],[44.725101,82.544388],[44.70644,82.549362],[44.700699,82.548683],[44.683128,82.544563],[44.676418,82.539917],[44.664211,82.517776],[44.65704,82.51091],[44.653099,82.507133],[44.595058,82.5037],[44.58345,82.503532],[44.582352,82.522926],[44.580879,82.523453],[44.557529,82.522873],[44.534039,82.522293],[44.52557,82.522072],[44.52927,82.554169],[44.5313,82.571716],[44.534229,82.594208],[44.53619,82.611549],[44.536442,82.617043],[44.536678,82.620987],[44.544998,82.64502],[44.546589,82.650337],[44.547451,82.655663],[44.548061,82.671463],[44.547199,82.679176],[44.547699,82.683823],[44.547699,82.686737],[44.546959,82.691711],[44.547451,82.696007],[44.547329,82.702187],[44.547569,82.705963],[44.545731,82.742699],[44.546101,82.745613],[44.554199,82.764877],[44.55444,82.765709],[44.557529,82.773193],[44.558979,82.777283],[44.56015,82.781342],[44.568581,82.81691],[44.569359,82.820198],[44.57032,82.823631],[44.571289,82.826576],[44.582081,82.85862],[44.582989,82.861427],[44.584259,82.865913],[44.585281,82.870201],[44.589359,82.889977],[44.590691,82.896233],[44.590988,82.897942],[44.59103,82.898331],[44.591629,82.901283],[44.592972,82.907463],[44.593128,82.908318],[44.594398,82.914139],[44.5956,82.919319],[44.595772,82.919952],[44.596539,82.921898],[44.597641,82.923813],[44.599129,82.92556],[44.59964,82.926018],[44.60025,82.926498],[44.601158,82.927078],[44.602718,82.927742],[44.608871,82.929962],[44.613121,82.931633],[44.61327,82.931717],[44.613789,82.93187],[44.617851,82.933357],[44.619282,82.933968],[44.628521,82.937401],[44.633331,82.93927],[44.63562,82.940033],[44.63689,82.940529],[44.637329,82.94075],[44.637859,82.940918],[44.641899,82.942482],[44.643261,82.943153],[44.643501,82.943359],[44.644581,82.944077],[44.645691,82.945137],[44.64632,82.945908],[44.647072,82.947403],[44.64753,82.948624],[44.647732,82.949257],[44.648071,82.950394],[44.648041,82.952026],[44.648121,82.954086],[44.647881,82.957283],[44.646622,82.960457],[44.645519,82.962517],[44.64283,82.96595],[44.640511,82.969559],[44.638519,82.972366],[44.63554,82.978752],[44.633381,82.985313],[44.632469,82.990089],[44.629028,83.018311],[44.627201,83.026718],[44.621578,83.048523],[44.615349,83.086113],[44.614861,83.091438],[44.615471,83.154221],[44.615681,83.190536],[44.61544,83.220917],[44.612629,83.238258],[44.601631,83.288887],[44.595638,83.3004],[44.59034,83.305893],[44.58234,83.314774],[44.57122,83.328331],[44.569988,83.330223],[44.565102,83.345497],[44.560581,83.365227],[44.551159,83.38755],[44.543209,83.426353],[44.542961,83.428749],[44.542839,83.452782],[44.549931,83.520592],[44.55006,83.523163],[44.549931,83.525574],[44.549568,83.527802],[44.54847,83.530891],[44.522888,83.596626],[44.51738,83.607964],[44.515301,83.610542],[44.493999,83.625816],[44.492531,83.626503],[44.49033,83.626678],[44.482121,83.626846],[44.480289,83.627708],[44.476238,83.630623],[44.474899,83.632339],[44.474159,83.634064],[44.473431,83.637154],[44.46228,83.72023],[44.46032,83.748039],[44.460442,83.753021],[44.464611,83.786148],[44.464851,83.791473],[44.462521,83.859108],[44.453579,83.898933],[44.43998,83.961418],[44.438141,83.967079],[44.41766,84.027496],[44.415581,84.031113],[44.38406,84.079178],[44.382961,84.081062],[44.381969,84.083122],[44.381359,84.086037],[44.379848,84.10498],[44.374119,84.176682],[44.371559,84.24231],[44.37125,84.250366],[44.371029,84.255867],[44.36956,84.293549],[44.369381,84.298866],[44.369419,84.305313],[44.369339,84.310707],[44.36924,84.314056],[44.368771,84.329811],[44.36895,84.336533],[44.369949,84.346283],[44.373421,84.381859],[44.374149,84.38546],[44.401112,84.488602],[44.401451,84.489929],[44.401489,84.49025],[44.401718,84.491364],[44.401939,84.492889],[44.402012,84.49366],[44.40205,84.494843],[44.40202,84.496437],[44.401958,84.497253],[44.401669,84.499237],[44.401421,84.500412],[44.401112,84.501549],[44.40057,84.503014],[44.399769,84.504753],[44.399059,84.506104],[44.39526,84.512733],[44.38364,84.533234],[44.382381,84.535522],[44.381882,84.536552],[44.381409,84.537643],[44.38113,84.538383],[44.38063,84.539909],[44.38044,84.54071],[44.38015,84.542343],[44.37999,84.543556],[44.379902,84.544807],[44.37986,84.546066],[44.37989,84.548592],[44.380539,84.571327],[44.38081,84.584824],[44.38163,84.621742],[44.38187,84.631577],[44.38195,84.634491],[44.38224,84.646912],[44.382339,84.648911],[44.382622,84.652283],[44.382851,84.654289],[44.383221,84.656693],[44.383591,84.65873],[44.38401,84.660812],[44.384491,84.662949],[44.38493,84.66465],[44.387989,84.675621],[44.395012,84.701317],[44.39798,84.712379],[44.398918,84.716614],[44.399319,84.718773],[44.399849,84.722267],[44.40015,84.724907],[44.400311,84.726669],[44.400551,84.730438],[44.401211,84.745941],[44.401871,84.761391],[44.40197,84.763748],[44.402451,84.774986],[44.40266,84.779877],[44.403,84.787857],[44.403179,84.791451],[44.40366,84.803093],[44.40369,84.805023],[44.40366,84.806641],[44.403519,84.809212],[44.403332,84.811028],[44.403172,84.812218],[44.40279,84.814468],[44.402401,84.816269],[44.401421,84.820137],[44.401199,84.821136],[44.400791,84.822662],[44.399288,84.828644],[44.399052,84.829597],[44.397511,84.835991],[44.396,84.842293],[44.39402,84.850548],[44.393211,84.855598],[44.392689,84.859741],[44.392189,84.865494],[44.39209,84.872017],[44.392109,84.87764],[44.39323,84.896751],[44.393291,84.902847],[44.393311,84.907852],[44.39307,84.916458],[44.393051,84.917793],[44.391701,84.944908],[44.391331,84.952461],[44.390469,84.958641],[44.38924,84.965851],[44.37661,85.01683],[44.373291,85.02816],[44.36483,85.052711],[44.36237,85.062317],[44.361019,85.069527],[44.360161,85.077087],[44.359669,85.083946],[44.359299,85.09185],[44.359669,85.099747],[44.36372,85.137863],[44.36433,85.146263],[44.36446,85.15313],[44.36433,85.160858],[44.36348,85.168922],[44.362,85.177849],[44.360039,85.184891],[44.357342,85.192963],[44.33942,85.237083],[44.33696,85.244797],[44.335121,85.251839],[44.333771,85.259743],[44.33316,85.267632],[44.333031,85.275528],[44.333889,85.284798],[44.334751,85.292862],[44.335121,85.299042],[44.335121,85.304192],[44.334511,85.310028],[44.334511,85.314323],[44.334869,85.322731],[44.336349,85.331833],[44.33831,85.342819],[44.338799,85.347282],[44.339169,85.352432],[44.339291,85.359642],[44.33905,85.365479],[44.337582,85.375954],[44.336472,85.384697],[44.335979,85.392601],[44.335979,85.403236],[44.33672,85.415077],[44.33979,85.453369],[44.340279,85.458],[44.341999,85.468483],[44.342731,85.474312],[44.343102,85.478783],[44.34322,85.484093],[44.343102,85.489243],[44.342491,85.495422],[44.338558,85.521858],[44.33794,85.528381],[44.337818,85.53405],[44.33807,85.545891],[44.33807,85.551041],[44.33733,85.556534],[44.336102,85.56237],[44.333771,85.568733],[44.33131,85.573883],[44.327141,85.579369],[44.322109,85.584343],[44.316212,85.588814],[44.312401,85.592758],[44.309212,85.596878],[44.306019,85.602028],[44.30331,85.607857],[44.30085,85.614899],[44.299011,85.622627],[44.298271,85.630524],[44.298149,85.639961],[44.29987,85.69558],[44.299381,85.703308],[44.298401,85.710693],[44.296799,85.718071],[44.28685,85.761147],[44.28574,85.768539],[44.284882,85.776947],[44.283161,85.799103],[44.282051,85.807854],[44.280331,85.816597],[44.27763,85.826042],[44.258949,85.880463],[44.256611,85.889732],[44.255131,85.898483],[44.25415,85.906563],[44.25354,85.914108],[44.25243,85.949982],[44.251942,85.956497],[44.25071,85.965431],[44.247509,85.98243],[44.246769,85.989639],[44.246399,85.995819],[44.246399,86.00354],[44.247021,86.009903],[44.25095,86.031181],[44.25563,86.052467],[44.25956,86.063797],[44.265461,86.077187],[44.26952,86.086113],[44.272099,86.093491],[44.273941,86.101387],[44.275169,86.109123],[44.275539,86.114433],[44.275661,86.120956],[44.275421,86.126793],[44.274681,86.133148],[44.273201,86.141037],[44.26226,86.187561],[44.246159,86.230133],[44.243328,86.239059],[44.24136,86.247993],[44.239891,86.257263],[44.23521,86.288498],[44.23312,86.298447],[44.2314,86.306183],[44.221561,86.339653],[44.216511,86.356651],[44.21455,86.363518],[44.21307,86.370728],[44.21233,86.377251],[44.21196,86.384277],[44.21233,86.39064],[44.212818,86.39682],[44.21418,86.403168],[44.216881,86.412613],[44.217991,86.418793],[44.218479,86.425659],[44.218479,86.432693],[44.217621,86.439217],[44.216019,86.445572],[44.213558,86.452606],[44.20052,86.483513],[44.198429,86.490196],[44.196701,86.497917],[44.195591,86.506851],[44.195221,86.515953],[44.195251,86.543556],[44.19471,86.554619],[44.19352,86.564163],[44.190159,86.588669],[44.189831,86.596909],[44.189831,86.604279],[44.19178,86.646683],[44.19178,86.655891],[44.1908,86.66391],[44.189499,86.671829],[44.186901,86.679314],[44.18372,86.68718],[44.18166,86.691147],[44.18071,86.692917],[44.178638,86.696259],[44.17778,86.697723],[44.176701,86.699837],[44.17556,86.702438],[44.174561,86.70517],[44.17395,86.70713],[44.17337,86.709412],[44.17284,86.71209],[44.172352,86.715782],[44.172249,86.71701],[44.17215,86.71917],[44.172009,86.728439],[44.171959,86.746559],[44.171791,86.759918],[44.171539,86.764847],[44.171219,86.768806],[44.17086,86.772324],[44.170589,86.774559],[44.1702,86.777046],[44.169151,86.782753],[44.16835,86.786324],[44.167511,86.789742],[44.166519,86.793556],[44.164181,86.802719],[44.16357,86.805313],[44.162861,86.808769],[44.16214,86.812958],[44.16148,86.818092],[44.161091,86.822517],[44.16058,86.831001],[44.160439,86.832359],[44.16008,86.834793],[44.159649,86.837013],[44.158669,86.840912],[44.157921,86.843369],[44.15683,86.846336],[44.155701,86.848953],[44.154442,86.851357],[44.153419,86.853218],[44.151951,86.855492],[44.15044,86.858032],[44.14957,86.859619],[44.148289,86.862106],[44.146641,86.865753],[44.145729,86.867897],[44.143909,86.872673],[44.14275,86.875504],[44.141731,86.877777],[44.1404,86.88047],[44.139519,86.882133],[44.13802,86.884773],[44.136848,86.886597],[44.13483,86.889458],[44.133209,86.891541],[44.131359,86.89373],[44.129169,86.896019],[44.119942,86.904999],[44.11771,86.907303],[44.114632,86.910797],[44.111851,86.914253],[44.109699,86.917122],[44.1073,86.920486],[44.105091,86.923759],[44.101471,86.928864],[44.097431,86.934837],[44.092442,86.942001],[44.091,86.944183],[44.08979,86.946167],[44.087761,86.949821],[44.086342,86.952797],[44.085121,86.955643],[44.083771,86.959244],[44.08276,86.962158],[44.08242,86.96331],[44.081749,86.96566],[44.08078,86.969597],[44.080059,86.973022],[44.076771,86.989891],[44.076229,86.992317],[44.07518,86.996613],[44.074291,86.999908],[44.072842,87.004631],[44.070599,87.010902],[44.069149,87.014557],[44.067589,87.018158],[44.066078,87.021446],[44.064331,87.024857],[44.06308,87.027153],[44.060379,87.031731],[44.053638,87.042503],[44.04911,87.049896],[44.046768,87.053978],[44.045158,87.056976],[44.043751,87.059807],[44.042549,87.062439],[44.037979,87.073174],[44.032749,87.085258],[44.03149,87.087898],[44.028469,87.093567],[44.027111,87.095787],[44.024738,87.099281],[44.022659,87.102112],[44.020248,87.105118],[44.017658,87.107986],[44.01181,87.113861],[44.006989,87.118851],[44.00354,87.122307],[44.0014,87.124702],[43.999149,87.127373],[43.995361,87.132362],[43.992489,87.136711],[43.990841,87.139389],[43.974121,87.167473],[43.972591,87.170227],[43.9706,87.174049],[43.969471,87.176369],[43.967602,87.180603],[43.966541,87.183228],[43.965569,87.185707],[43.96439,87.188911],[43.963001,87.192917],[43.954929,87.21653],[43.954769,87.216988],[43.953381,87.221046],[43.951832,87.226028],[43.950878,87.229561],[43.94986,87.233673],[43.9491,87.237152],[43.948372,87.240967],[43.94772,87.244904],[43.946381,87.25338],[43.945599,87.258263],[43.943878,87.26899],[43.943729,87.269943],[43.943661,87.270348],[43.94339,87.272049],[43.943081,87.273956],[43.94278,87.275772],[43.941769,87.280762],[43.941509,87.281837],[43.94083,87.284477],[43.940159,87.287323],[43.939629,87.289253],[43.939541,87.289574],[43.938251,87.293716],[43.93816,87.294029],[43.93755,87.295952],[43.935711,87.301018],[43.93557,87.301392],[43.93351,87.30648],[43.933399,87.306717],[43.9277,87.320503],[43.924629,87.327827],[43.924469,87.328171],[43.922958,87.331383],[43.92083,87.335472],[43.917881,87.340439],[43.915852,87.343498],[43.914989,87.344727],[43.9133,87.346977],[43.911129,87.349716],[43.908119,87.353493],[43.90696,87.35508],[43.905602,87.357002],[43.9044,87.358856],[43.90316,87.360962],[43.901939,87.36319],[43.900761,87.365501],[43.899651,87.367943],[43.898571,87.370491],[43.897621,87.373047],[43.89674,87.375633],[43.89579,87.37886],[43.895031,87.381783],[43.894871,87.382446],[43.894279,87.385109],[43.893951,87.386879],[43.893879,87.387268],[43.893501,87.389687],[43.893108,87.392593],[43.892899,87.394691],[43.892689,87.397362],[43.892529,87.400497],[43.892509,87.400887],[43.892479,87.404518],[43.89249,87.407967],[43.89249,87.411003],[43.89246,87.414047],[43.892361,87.415756],[43.892189,87.417381],[43.89196,87.419029],[43.891548,87.42086],[43.891022,87.422783],[43.8904,87.424583],[43.88958,87.426697],[43.88855,87.429367],[43.888359,87.42984],[43.88744,87.43222],[43.887341,87.43248],[43.886429,87.434799],[43.886311,87.435089],[43.88559,87.436859],[43.88485,87.438332],[43.884232,87.439407],[43.883789,87.440033],[43.883591,87.440277],[43.882641,87.441483],[43.881592,87.442558],[43.880539,87.443443],[43.879509,87.444138],[43.878349,87.444763],[43.87767,87.44503],[43.877491,87.445091],[43.876438,87.445389],[43.875191,87.445633],[43.873199,87.445862],[43.87233,87.446022],[43.871521,87.446297],[43.8708,87.446678],[43.86998,87.447144],[43.869301,87.447701],[43.868549,87.44841],[43.867981,87.449081],[43.86739,87.449913],[43.866821,87.450859],[43.866261,87.452019],[43.865822,87.453217],[43.864849,87.456688],[43.86478,87.456963],[43.86433,87.458298],[43.863811,87.459641],[43.863071,87.461128],[43.862381,87.462318],[43.861549,87.463501],[43.860691,87.464523],[43.85965,87.465569],[43.859409,87.465797],[43.85841,87.466583],[43.85751,87.467148],[43.85651,87.467682],[43.855469,87.468079],[43.854439,87.468384],[43.853588,87.46859],[43.853081,87.468727],[43.851749,87.469116],[43.8503,87.469673],[43.849232,87.470154],[43.848011,87.470772],[43.847389,87.471123],[43.84705,87.471336],[43.8461,87.47197],[43.844799,87.472923],[43.84341,87.474068],[43.842701,87.474693],[43.84201,87.475243],[43.84111,87.475983],[43.83971,87.476959],[43.83831,87.477814],[43.83717,87.478394],[43.8358,87.478996],[43.83424,87.479584],[43.832649,87.480026],[43.832432,87.480072],[43.830681,87.480377],[43.814949,87.482323],[43.813801,87.482513],[43.81266,87.482819],[43.81208,87.482986],[43.811771,87.483124],[43.810558,87.483627],[43.809471,87.4842],[43.808338,87.48494],[43.807209,87.485786],[43.806221,87.486656],[43.80513,87.487793],[43.804131,87.489014],[43.803341,87.490128],[43.802521,87.491386],[43.801628,87.492851],[43.80098,87.493896],[43.800289,87.494873],[43.79995,87.495247],[43.799122,87.496063],[43.798279,87.496712],[43.797352,87.497269],[43.796452,87.497643],[43.79562,87.497864],[43.79528,87.497917],[43.794739,87.497971],[43.79393,87.497971],[43.793282,87.497902],[43.792622,87.497749],[43.79195,87.497513],[43.79126,87.497223],[43.790421,87.496727],[43.78997,87.496391],[43.789669,87.496162],[43.78923,87.495773],[43.788609,87.495148],[43.786831,87.492996],[43.784351,87.489883],[43.78339,87.4888],[43.78244,87.487953],[43.781559,87.487282],[43.780479,87.486618],[43.779621,87.486221],[43.778622,87.485832],[43.777359,87.485489],[43.768581,87.484177],[43.7672,87.483994],[43.765968,87.483688],[43.76461,87.483208],[43.763302,87.482597],[43.762199,87.481934],[43.760948,87.481003],[43.759979,87.480133],[43.75798,87.478256],[43.75629,87.476753],[43.755219,87.475883],[43.75386,87.475052],[43.752739,87.474487],[43.751438,87.473969],[43.750031,87.473557],[43.749001,87.473343],[43.747791,87.473244],[43.74649,87.47319],[43.745319,87.473297],[43.744019,87.473534],[43.742809,87.473877],[43.741699,87.474297],[43.74049,87.474876],[43.739391,87.47554],[43.738281,87.476303],[43.73737,87.477051],[43.73629,87.478119],[43.735081,87.479286],[43.733238,87.481216],[43.72575,87.488892],[43.72366,87.490959],[43.722832,87.491814],[43.722229,87.492439],[43.721432,87.493263],[43.719742,87.494972],[43.717701,87.497032],[43.715801,87.499092],[43.713329,87.501373],[43.711281,87.503128],[43.708069,87.505676],[43.705551,87.507523],[43.702839,87.509422],[43.70277,87.509468],[43.688221,87.519676],[43.686871,87.520798],[43.685829,87.521828],[43.68462,87.523239],[43.683552,87.524712],[43.682499,87.526443],[43.68145,87.528549],[43.680691,87.530472],[43.68005,87.532501],[43.679531,87.534561],[43.679199,87.536484],[43.678959,87.538696],[43.6786,87.543793],[43.67857,87.544243],[43.67757,87.558968],[43.67749,87.560387],[43.677399,87.561157],[43.67728,87.562157],[43.677139,87.563583],[43.67701,87.564293],[43.67683,87.564903],[43.676601,87.565376],[43.676239,87.56588],[43.675919,87.566231],[43.675499,87.566544],[43.674992,87.56675],[43.674511,87.566833],[43.67387,87.566788],[43.67218,87.566673],[43.67149,87.566566],[43.667702,87.566078],[43.66563,87.565826],[43.664051,87.56575],[43.662689,87.565804],[43.661449,87.565971],[43.660259,87.566231],[43.659241,87.566559],[43.65818,87.566978],[43.657131,87.567467],[43.655708,87.568199],[43.649658,87.571487],[43.639301,87.577278],[43.637989,87.578117],[43.636768,87.579117],[43.635891,87.580017],[43.635071,87.58107],[43.634281,87.582336],[43.633598,87.583778],[43.633041,87.585251],[43.63274,87.586411],[43.632462,87.587967],[43.63224,87.589622],[43.632118,87.591454],[43.631851,87.597633],[43.63166,87.602814],[43.631641,87.603279],[43.631451,87.607712],[43.631241,87.612137],[43.631008,87.615463],[43.630951,87.616127],[43.630699,87.618637],[43.630329,87.621849],[43.62991,87.62468],[43.629162,87.629738],[43.627029,87.64415],[43.626369,87.648972],[43.626221,87.650948],[43.626209,87.652649],[43.626259,87.654282],[43.626381,87.655884],[43.626579,87.657341],[43.626831,87.658737],[43.627178,87.6605],[43.628189,87.664627],[43.62838,87.665329],[43.629429,87.669518],[43.629879,87.671638],[43.630192,87.673363],[43.63036,87.674721],[43.630501,87.676178],[43.630569,87.677811],[43.63055,87.679382],[43.630421,87.681129],[43.63026,87.682762],[43.630001,87.684677],[43.62574,87.709663],[43.62455,87.716537],[43.624481,87.717003],[43.624031,87.719711],[43.623959,87.720032],[43.62365,87.721848],[43.62323,87.724319],[43.619122,87.748306],[43.618641,87.750763],[43.618141,87.753036],[43.617962,87.754066],[43.60783,87.790024],[43.606331,87.79483],[43.604469,87.798782],[43.598629,87.809593],[43.5658,87.868134],[43.56356,87.873283],[43.562561,87.877747],[43.553478,87.936623],[43.550369,87.947952],[43.548012,87.953453],[43.545639,87.958076],[43.54229,87.962029],[43.51017,87.990517],[43.5047,87.995667],[43.501419,87.997803],[43.498638,87.998932],[43.49448,88],[43.492001,88.000366],[43.490589,88.001099],[43.48933,88.002701],[43.487259,88.007523],[43.485432,88.01181],[43.473808,88.040779],[43.471821,88.044037],[43.451771,88.064278],[43.42305,88.092621],[43.421719,88.094742],[43.418388,88.102074],[43.41431,88.110977],[43.40517,88.127991],[43.40303,88.132248],[43.401909,88.137573],[43.401039,88.144524],[43.401039,88.14724],[43.401409,88.150192],[43.40102,88.15242],[43.398079,88.160744],[43.39703,88.162621],[43.395271,88.164429],[43.388039,88.171944],[43.386688,88.174652],[43.37188,88.212837],[43.369881,88.215889],[43.367619,88.218224],[43.363781,88.220337],[43.352619,88.226151],[43.350868,88.227867],[43.350121,88.229424],[43.348751,88.233704],[43.346882,88.247093],[43.347191,88.253166],[43.347919,88.274597],[43.347969,88.280197],[43.3475,88.284607],[43.343578,88.307373],[43.343201,88.309288],[43.342369,88.311203],[43.34161,88.312332],[43.340641,88.313347],[43.336269,88.316933],[43.335411,88.31813],[43.333851,88.322166],[43.332958,88.323196],[43.331371,88.325027],[43.329269,88.329193],[43.328281,88.330704],[43.32671,88.331947],[43.324421,88.333443],[43.31831,88.337143],[43.317211,88.338058],[43.316551,88.338982],[43.316002,88.339928],[43.312481,88.348618],[43.311829,88.349541],[43.308739,88.353241],[43.307331,88.3545],[43.305771,88.355309],[43.304501,88.35553],[43.303329,88.355553],[43.302132,88.355293],[43.301041,88.354797],[43.299999,88.354073],[43.299019,88.352921],[43.29567,88.347366],[43.294922,88.34639],[43.29427,88.345863],[43.293468,88.345444],[43.292549,88.345306],[43.286049,88.345741],[43.28421,88.346138],[43.279449,88.348213],[43.278389,88.348846],[43.277592,88.349823],[43.275612,88.354141],[43.275002,88.354927],[43.27446,88.355331],[43.273899,88.355469],[43.273232,88.355362],[43.272732,88.355019],[43.27166,88.353889],[43.270939,88.353447],[43.27021,88.353317],[43.26955,88.35347],[43.268181,88.354393],[43.264778,88.35762],[43.263809,88.358849],[43.263401,88.360359],[43.26244,88.370163],[43.261951,88.37146],[43.261261,88.372208],[43.26041,88.372498],[43.25938,88.372566],[43.256512,88.372383],[43.255489,88.372543],[43.25478,88.372917],[43.24931,88.377213],[43.246029,88.379967],[43.244301,88.382111],[43.23455,88.400726],[43.232761,88.408127],[43.232342,88.411072],[43.232262,88.423782],[43.231758,88.42601],[43.227589,88.431534],[43.22604,88.433823],[43.224918,88.436653],[43.222912,88.445251],[43.222118,88.44709],[43.220909,88.448799],[43.217781,88.45314],[43.21653,88.454224],[43.214489,88.455139],[43.21336,88.455887],[43.211441,88.458023],[43.2104,88.458809],[43.206848,88.46019],[43.20443,88.461479],[43.199009,88.465073],[43.196541,88.467239],[43.19408,88.470032],[43.192829,88.471207],[43.191368,88.472076],[43.189159,88.473167],[43.188202,88.473831],[43.186279,88.47554],[43.185108,88.476303],[43.183319,88.476707],[43.180149,88.477287],[43.17802,88.477966],[43.174019,88.479759],[43.172951,88.480476],[43.172161,88.481453],[43.169781,88.484947],[43.168968,88.485672],[43.168079,88.486183],[43.167301,88.486397],[43.16626,88.48629],[43.162991,88.485527],[43.161709,88.485367],[43.16024,88.485497],[43.158871,88.485817],[43.157822,88.486397],[43.15678,88.487129],[43.15575,88.488297],[43.15485,88.489777],[43.15295,88.493713],[43.151932,88.495148],[43.150249,88.497177],[43.147289,88.499817],[43.145618,88.500908],[43.11911,88.508789],[43.113972,88.510857],[43.10878,88.514526],[43.104771,88.516747],[43.095871,88.520363],[43.08585,88.524307],[43.085049,88.52462],[43.084221,88.527397],[43.083469,88.533073],[43.064529,88.645844],[43.063782,88.650993],[43.06353,88.655983],[43.064659,88.704552],[43.062901,88.758797],[43.062149,88.766693],[43.061272,88.770302],[43.060139,88.773048],[43.054749,88.780937],[43.034679,88.809776],[43.031158,88.816467],[43.022129,88.835701],[43.020741,88.840851],[43.01685,88.861969],[43.01511,88.895157],[43.014431,88.903923],[43.01189,88.944511],[43.010181,88.985939],[43.008678,89.023689],[43.00766,89.051407],[43.006378,89.084343],[43.00621,89.086533],[43.00592,89.088699],[43.005348,89.091614],[43.004471,89.094673],[42.995232,89.121597],[42.994888,89.122597],[42.993141,89.127441],[42.986832,89.144073],[42.986031,89.1464],[42.983082,89.154968],[42.980911,89.161613],[42.97858,89.169212],[42.975029,89.179268],[42.974419,89.18145],[42.974018,89.182877],[42.970001,89.211029],[42.96912,89.214462],[42.968922,89.214996],[42.967739,89.218063],[42.957939,89.240379],[42.949902,89.258751],[42.931519,89.301567],[42.922131,89.323463],[42.92075,89.327423],[42.919739,89.332222],[42.919361,89.336693],[42.920872,89.430923],[42.92112,89.450844],[42.920872,89.456848],[42.91634,89.50766],[42.91534,89.513321],[42.912819,89.523277],[42.912071,89.528427],[42.91132,89.550583],[42.91169,89.55246],[42.912701,89.55452],[42.916729,89.560028],[42.917099,89.560532],[42.91848,89.563278],[42.919609,89.566368],[42.921749,89.569633],[42.924389,89.571167],[42.926029,89.572372],[42.929161,89.573227],[42.93055,89.574257],[42.931801,89.575813],[42.93243,89.578209],[42.93243,89.584053],[42.93306,89.586617],[42.935951,89.593658],[42.93721,89.597092],[42.937969,89.6007],[42.938339,89.604637],[42.938091,89.609283],[42.936081,89.6213],[42.934952,89.625237],[42.933819,89.628853],[42.933441,89.632111],[42.933441,89.634857],[42.933941,89.645332],[42.933689,89.64962],[42.931801,89.66198],[42.92263,89.702316],[42.921879,89.705238],[42.921879,89.708328],[42.922249,89.711418],[42.924259,89.721718],[42.9245,89.722847],[42.925522,89.727898],[42.926029,89.730988],[42.926029,89.734077],[42.92577,89.736481],[42.901379,89.832443],[42.900501,89.836906],[42.900249,89.841187],[42.900249,89.845154],[42.902519,89.868317],[42.903271,89.875359],[42.903271,89.879303],[42.902889,89.882736],[42.90189,89.887199],[42.89333,89.916039],[42.882519,89.957413],[42.879749,89.968567],[42.87484,89.992432],[42.875099,90.001534],[42.876228,90.003593],[42.877361,90.007881],[42.87812,90.013542],[42.87849,90.033287],[42.87925,90.038597],[42.880501,90.043587],[42.883518,90.048897],[42.8839,90.050797],[42.883518,90.052513],[42.882019,90.064011],[42.882389,90.07534],[42.885159,90.088043],[42.887299,90.107613],[42.887299,90.111557],[42.885658,90.118088],[42.884529,90.125473],[42.884529,90.155167],[42.884781,90.160141],[42.88755,90.178169],[42.89032,90.194313],[42.891571,90.202888],[42.892578,90.218163],[42.89283,90.225548],[42.894341,90.255417],[42.89547,90.257637],[42.897228,90.260223],[42.91433,90.276871],[42.916088,90.278587],[42.92572,90.286217],[42.926281,90.286659],[42.928669,90.289574],[42.954681,90.325447],[42.965561,90.339417],[42.969109,90.352364],[42.96933,90.354347],[42.97477,90.391518],[42.975849,90.398308],[42.976601,90.404121],[42.976608,90.404427],[42.979778,90.425003],[42.980309,90.428658],[42.981098,90.434731],[42.983521,90.450653],[42.98632,90.469856],[42.986919,90.474617],[42.987289,90.476891],[42.98819,90.483231],[42.98856,90.485153],[42.98893,90.486382],[42.989491,90.487823],[42.998089,90.50766],[42.998421,90.508636],[42.998821,90.510246],[42.999931,90.518677],[43.000271,90.520767],[43.000511,90.522957],[43.001389,90.528778],[43.00177,90.531792],[43.001911,90.532593],[43.002289,90.5355],[43.003151,90.540283],[43.00349,90.541817],[43.00515,90.55069],[43.005402,90.551743],[43.005741,90.553596],[43.00655,90.559807],[43.006821,90.561119],[43.010551,90.585213],[43.010761,90.586189],[43.01086,90.586868],[43.011879,90.59243],[43.012051,90.593674],[43.014481,90.607651],[43.015041,90.611397],[43.01532,90.612556],[43.016499,90.6185],[43.016621,90.618858],[43.01749,90.624069],[43.017841,90.625748],[43.01783,90.625999],[43.01865,90.62989],[43.019321,90.633347],[43.019691,90.634842],[43.019711,90.635452],[43.020451,90.639526],[43.023109,90.652611],[43.0243,90.659431],[43.025982,90.66787],[43.026249,90.669579],[43.027802,90.678146],[43.028332,90.680779],[43.028751,90.683296],[43.028961,90.684067],[43.029202,90.685738],[43.02927,90.686523],[43.030109,90.691254],[43.030991,90.695862],[43.031811,90.700508],[43.03191,90.701439],[43.033859,90.712013],[43.034119,90.713043],[43.034389,90.713882],[43.034821,90.714951],[43.035488,90.716331],[43.037731,90.720207],[43.038509,90.721474],[43.03936,90.722672],[43.039669,90.723244],[43.039711,90.723442],[43.041012,90.7258],[43.049889,90.741318],[43.078011,90.789993],[43.079781,90.793114],[43.091789,90.813927],[43.094238,90.818253],[43.105728,90.83815],[43.127251,90.875664],[43.128132,90.877113],[43.129059,90.878807],[43.152161,90.918983],[43.15641,90.926468],[43.15712,90.927567],[43.15815,90.928741],[43.160381,90.930939],[43.16106,90.931686],[43.161839,90.932793],[43.162491,90.934036],[43.162708,90.934593],[43.163059,90.935707],[43.167259,90.954353],[43.174629,90.9879],[43.177311,90.999687],[43.186829,91.042557],[43.18734,91.045181],[43.193069,91.070633],[43.197281,91.089661],[43.198051,91.092934],[43.200958,91.105988],[43.201221,91.106888],[43.201569,91.107857],[43.2425,91.200439],[43.247059,91.210648],[43.26371,91.248741],[43.269489,91.261757],[43.271019,91.265343],[43.275181,91.274818],[43.277649,91.280586],[43.28059,91.287086],[43.282509,91.291519],[43.285599,91.298424],[43.296082,91.322212],[43.296822,91.323753],[43.297359,91.324638],[43.303131,91.333267],[43.309929,91.343613],[43.311359,91.345619],[43.315521,91.3517],[43.31625,91.352943],[43.31702,91.354584],[43.32486,91.374878],[43.32983,91.387619],[43.33807,91.410332],[43.343979,91.426453],[43.347961,91.437576],[43.348209,91.438461],[43.348942,91.440407],[43.3494,91.441437],[43.352039,91.44873],[43.352589,91.451378],[43.3535,91.460182],[43.354031,91.465851],[43.354301,91.468117],[43.355129,91.476349],[43.355499,91.478973],[43.361481,91.501579],[43.363602,91.509407],[43.364449,91.512863],[43.37183,91.539879],[43.3741,91.548363],[43.374298,91.548882],[43.374851,91.549858],[43.375061,91.550453],[43.375771,91.553467],[43.37603,91.555138],[43.375938,91.555389],[43.37709,91.559853],[43.377621,91.562492],[43.380009,91.581299],[43.381809,91.596481],[43.382011,91.597931],[43.382099,91.598396],[43.382301,91.598907],[43.382561,91.601357],[43.382629,91.602577],[43.382641,91.604263],[43.382542,91.606644],[43.382259,91.609413],[43.381939,91.611397],[43.37965,91.621933],[43.378841,91.625473],[43.3764,91.634987],[43.37545,91.637947],[43.37505,91.639877],[43.374619,91.641647],[43.370998,91.655388],[43.37027,91.658417],[43.365871,91.675323],[43.365059,91.678452],[43.364731,91.67955],[43.363499,91.684471],[43.361439,91.692139],[43.359531,91.699547],[43.359241,91.701263],[43.359169,91.702637],[43.35928,91.703987],[43.359509,91.705276],[43.359982,91.707161],[43.36982,91.742973],[43.372631,91.753021],[43.37392,91.757812],[43.37442,91.759483],[43.375198,91.762428],[43.375401,91.763397],[43.375561,91.764717],[43.375599,91.765999],[43.375408,91.768929],[43.37521,91.770554],[43.374908,91.772171],[43.37463,91.773232],[43.374088,91.774811],[43.373291,91.776604],[43.364761,91.792717],[43.364399,91.793503],[43.363998,91.794601],[43.36359,91.796387],[43.36343,91.797989],[43.363441,91.799316],[43.363579,91.800652],[43.364021,91.802567],[43.366032,91.808868],[43.37429,91.834282],[43.375271,91.837433],[43.381149,91.855637],[43.382408,91.8592],[43.38306,91.861214],[43.393181,91.890991],[43.394131,91.893608],[43.404839,91.925247],[43.407921,91.934532],[43.408772,91.936867],[43.410931,91.943413],[43.411652,91.945847],[43.41333,91.951942],[43.41539,91.959442],[43.4156,91.960617],[43.415649,91.961197],[43.415649,91.961807],[43.415539,91.963013],[43.415421,91.963593],[43.41518,91.964447],[43.413719,91.968903],[43.408131,91.984978],[43.38829,92.04274],[43.38768,92.044403],[43.384071,92.055069],[43.383888,92.055931],[43.383739,92.062576],[43.383549,92.063652],[43.383751,92.077217],[43.383621,92.07988],[43.379551,92.111923],[43.3783,92.121323],[43.37817,92.12278],[43.378181,92.123451],[43.378139,92.123787],[43.37804,92.124077],[43.378078,92.124092],[43.377602,92.12693],[43.376678,92.134521],[43.37648,92.134933],[43.37635,92.13591],[43.376438,92.136101],[43.37492,92.146538],[43.3741,92.150238],[43.373829,92.150787],[43.373161,92.151619],[43.371979,92.152588],[43.371311,92.152802],[43.368759,92.1539],[43.343491,92.165489],[43.336319,92.16864],[43.33614,92.16864],[43.333519,92.169991],[43.322121,92.175133],[43.315922,92.177841],[43.315189,92.178223],[43.31448,92.17868],[43.31414,92.178963],[43.313519,92.179672],[43.31295,92.180489],[43.311031,92.183868],[43.309029,92.187683],[43.308578,92.188721],[43.308182,92.190086],[43.30558,92.201569],[43.305191,92.203537],[43.305031,92.204117],[43.304661,92.205032],[43.304211,92.205818],[43.303791,92.206337],[43.300419,92.209373],[43.29726,92.213799],[43.29509,92.219322],[43.293221,92.224327],[43.29282,92.225693],[43.29261,92.226868],[43.29121,92.236771],[43.290798,92.238876],[43.290199,92.241379],[43.290039,92.241692],[43.289768,92.243027],[43.289742,92.243393],[43.289631,92.243736],[43.289581,92.245827],[43.2896,92.249359],[43.28965,92.249733],[43.28944,92.251373],[43.28904,92.253258],[43.288872,92.253853],[43.288399,92.254959],[43.28759,92.2565],[43.286591,92.257843],[43.28548,92.259117],[43.266258,92.280243],[43.26268,92.284241],[43.258411,92.288857],[43.257809,92.289658],[43.25742,92.290321],[43.256969,92.29129],[43.256691,92.292053],[43.256378,92.293137],[43.2561,92.294647],[43.25592,92.296593],[43.255692,92.301987],[43.255619,92.306412],[43.255081,92.324226],[43.254978,92.326187],[43.254929,92.3265],[43.25465,92.327293],[43.25452,92.328056],[43.254539,92.331291],[43.254822,92.3321],[43.25502,92.332977],[43.25502,92.33429],[43.255081,92.334824],[43.255112,92.336983],[43.25491,92.351593],[43.25494,92.351967],[43.255192,92.352547],[43.255161,92.358383],[43.255341,92.369583],[43.255348,92.373428],[43.25544,92.37973],[43.255489,92.381088],[43.25544,92.38237],[43.255562,92.386459],[43.255569,92.38871],[43.255501,92.3909],[43.255562,92.41449],[43.255508,92.41684],[43.25544,92.417953],[43.255112,92.442863],[43.255032,92.44442],[43.254902,92.451012],[43.254879,92.455528],[43.254799,92.458504],[43.254829,92.460274],[43.254902,92.460899],[43.255131,92.46122],[43.255089,92.468697],[43.25489,92.477119],[43.254978,92.48597],[43.25494,92.488167],[43.25486,92.489609],[43.254711,92.507919],[43.25457,92.517036],[43.254532,92.517326],[43.254589,92.518883],[43.25581,92.530167],[43.25584,92.53196],[43.25576,92.533012],[43.255421,92.53582],[43.253208,92.549698],[43.252701,92.552528],[43.252499,92.553307],[43.251751,92.555443],[43.250801,92.557281],[43.250229,92.55851],[43.243992,92.570717],[43.242409,92.573624],[43.242149,92.574242],[43.236401,92.585487],[43.230221,92.597183],[43.22961,92.598503],[43.228851,92.599838],[43.2285,92.600647],[43.227299,92.602959],[43.22636,92.604622],[43.225151,92.607018],[43.222401,92.612137],[43.221802,92.61338],[43.219791,92.61718],[43.218559,92.61972],[43.2174,92.62175],[43.216888,92.622757],[43.2164,92.624069],[43.214039,92.628708],[43.213139,92.630333],[43.2122,92.632301],[43.212051,92.632523],[43.211658,92.63279],[43.210991,92.632889],[43.21035,92.633072],[43.210129,92.633209],[43.20993,92.633461],[43.207069,92.639236],[43.206989,92.639481],[43.205688,92.641998],[43.20525,92.64299],[43.204369,92.644783],[43.20388,92.645653],[43.19825,92.65416],[43.197201,92.655479],[43.196789,92.656464],[43.196609,92.657181],[43.19635,92.6577],[43.196079,92.65802],[43.190941,92.662827],[43.190338,92.663452],[43.188599,92.665031],[43.186859,92.666748],[43.185692,92.668007],[43.184761,92.669159],[43.183418,92.670967],[43.180092,92.676376],[43.172909,92.687592],[43.17234,92.688583],[43.169239,92.693604],[43.168331,92.695328],[43.167881,92.696358],[43.167221,92.698227],[43.166851,92.6996],[43.165169,92.706772],[43.16357,92.714363],[43.163559,92.714729],[43.161999,92.72184],[43.16135,92.722961],[43.15799,92.729736],[43.156681,92.732277],[43.155411,92.734993],[43.154388,92.737671],[43.153999,92.739197],[43.15382,92.740334],[43.153301,92.742409],[43.152962,92.744377],[43.15284,92.745354],[43.152012,92.750618],[43.151588,92.752319],[43.15163,92.752579],[43.151291,92.753853],[43.150669,92.755867],[43.150249,92.757011],[43.14949,92.75869],[43.14801,92.761574],[43.14732,92.762558],[43.145931,92.7649],[43.144001,92.767769],[43.1413,92.771973],[43.139622,92.77475],[43.138191,92.777542],[43.13784,92.778351],[43.136761,92.78141],[43.133678,92.791237],[43.133209,92.792923],[43.132771,92.79425],[43.132648,92.794487],[43.13208,92.796402],[43.130611,92.801697],[43.130001,92.804459],[43.129471,92.807159],[43.12764,92.815422],[43.12764,92.815628],[43.127708,92.816093],[43.128059,92.817108],[43.12809,92.817642],[43.127239,92.822151],[43.124889,92.833717],[43.12468,92.834572],[43.124001,92.836807],[43.123409,92.83847],[43.121769,92.843559],[43.117249,92.856644],[43.116928,92.857742],[43.097961,92.913582],[43.09219,92.930397],[43.091251,92.932861],[43.089909,92.936729],[43.08939,92.938499],[43.088219,92.941933],[43.085678,92.949699],[43.08448,92.953049],[43.084339,92.95372],[43.083939,92.954758],[43.081841,92.961029],[43.081139,92.962883],[43.077202,92.974609],[43.073639,92.984818],[43.07309,92.986237],[43.072651,92.98764],[43.071579,92.990761],[43.070629,92.993958],[43.06773,93.002113],[43.06179,93.019722],[43.059059,93.027451],[43.05798,93.03083],[43.05611,93.036209],[43.055599,93.037857],[43.054531,93.040833],[43.0536,93.043671],[43.050701,93.051971],[43.048828,93.05748],[43.04847,93.058357],[43.04398,93.071747],[43.04361,93.072983],[43.036949,93.0923],[43.030769,93.110497],[43.030392,93.111504],[43.02821,93.117996],[43.02644,93.122902],[43.02552,93.125717],[43.021511,93.137383],[43.020081,93.141777],[43.019531,93.143211],[43.018318,93.146812],[43.014252,93.158577],[43.012951,93.162216],[43.012581,93.163368],[43.012489,93.163933],[43.011021,93.167953],[43.01017,93.170631],[43.009911,93.171303],[42.956379,93.327377],[42.943939,93.363609],[42.93602,93.384903],[42.923698,93.417068],[42.914711,93.439667],[42.90744,93.457962],[42.906872,93.459129],[42.90659,93.460068],[42.90519,93.464157],[42.90258,93.470917],[42.902351,93.471611],[42.90118,93.474586],[42.89896,93.47998],[42.897121,93.484833],[42.895458,93.488991],[42.89336,93.494431],[42.892899,93.495789],[42.892529,93.496559],[42.88739,93.512894],[42.887272,93.517189],[42.888271,93.531914],[42.862091,93.564423],[42.861511,93.564209],[42.861229,93.564102],[42.86145,93.564613],[42.861591,93.565399],[42.861431,93.566383],[42.86108,93.567436],[42.860889,93.568802],[42.860519,93.574074],[42.860298,93.582787],[42.859718,93.588753],[42.859089,93.594093],[42.858608,93.596024],[42.858109,93.597328],[42.85775,93.598083],[42.844662,93.621597],[42.833488,93.641823],[42.828079,93.651497],[42.825699,93.655746],[42.824928,93.657333],[42.82415,93.659142],[42.823341,93.661308],[42.82259,93.663757],[42.821941,93.666389],[42.821411,93.669212],[42.82106,93.672157],[42.820869,93.675217],[42.820148,93.715927],[42.819351,93.749474],[42.819149,93.751984],[42.81884,93.754433],[42.81839,93.756721],[42.817348,93.760773],[42.816341,93.763344],[42.815842,93.763969],[42.81535,93.764908],[42.814701,93.766747],[42.812519,93.771149],[42.812069,93.772324],[42.811932,93.773102],[42.727871,93.941811],[42.721931,93.953537],[42.720589,93.955933],[42.719109,93.958252],[42.717548,93.960472],[42.699131,93.982513],[42.699059,93.983383],[42.698891,93.983681],[42.698071,93.984612],[42.696949,93.986053],[42.695301,93.987839],[42.69413,93.989487],[42.69381,93.99012],[42.69331,93.990646],[42.692101,93.991898],[42.69136,93.992996],[42.69014,93.994179],[42.687519,93.99733],[42.687038,93.997597],[42.686771,93.99736],[42.686432,93.997581],[42.65414,94.036118],[42.646832,94.044739],[42.645691,94.045403],[42.644489,94.046288],[42.644058,94.046982],[42.643921,94.047897],[42.64352,94.048683],[42.615822,94.081642],[42.615479,94.082474],[42.61515,94.083054],[42.61348,94.085068],[42.613319,94.085991],[42.612419,94.087349],[42.611771,94.087723],[42.610729,94.087997],[42.610352,94.088097],[42.5938,94.107742],[42.591869,94.110123],[42.591282,94.110817],[42.576759,94.127983],[42.57444,94.130577],[42.574371,94.130829],[42.55592,94.152588],[42.5546,94.153893],[42.552959,94.1549],[42.55114,94.155441],[42.549179,94.155487],[42.511021,94.154877],[42.50568,94.154716],[42.48864,94.154488],[42.479259,94.154243],[42.455231,94.153893],[42.45348,94.15358],[42.452808,94.153816],[42.416431,94.153236],[42.404751,94.152946],[42.390621,94.152786],[42.387569,94.152687],[42.38446,94.152702],[42.37709,94.15255],[42.375671,94.152588],[42.374401,94.152344],[42.37154,94.150558],[42.36993,94.14994],[42.368191,94.150368],[42.36639,94.151428],[42.364391,94.152222],[42.36224,94.152328],[42.34985,94.15213],[42.347618,94.152443],[42.345421,94.153099],[42.343281,94.154137],[42.341251,94.155533],[42.33934,94.15728],[42.33762,94.159363],[42.323891,94.17894],[42.299648,94.213142],[42.29924,94.213348],[42.29882,94.213783],[42.292431,94.222908],[42.292061,94.223824],[42.291611,94.224564],[42.26054,94.268501],[42.259979,94.269096],[42.258591,94.268639],[42.25832,94.269371],[42.258259,94.271477],[42.25798,94.272148],[42.221859,94.32328],[42.21785,94.328712],[42.201809,94.351463],[42.186401,94.3731],[42.18565,94.374268],[42.182468,94.378754],[42.17992,94.382103],[42.07518,94.501556],[42.07399,94.503014],[42.071751,94.506172],[42.070728,94.507843],[42.069248,94.510452],[42.05822,94.531387],[42.05555,94.536324],[42.034328,94.57663],[42.028992,94.586594],[42.01165,94.619476],[42.006409,94.629227],[42.002441,94.636864],[41.996479,94.647957],[41.97168,94.694656],[41.970669,94.696457],[41.96846,94.699707],[41.964611,94.704811],[41.961651,94.708549],[41.953011,94.719757],[41.951698,94.721367],[41.93182,94.747139],[41.928169,94.751717],[41.92601,94.754211],[41.917702,94.764259],[41.907219,94.776627],[41.906189,94.778198],[41.905659,94.779518],[41.90535,94.780724],[41.905182,94.781952],[41.905979,94.819061],[41.905891,94.82193],[41.904789,94.824211],[41.896778,94.833511],[41.889599,94.842018],[41.88821,94.843773],[41.886959,94.845734],[41.885899,94.847763],[41.872711,94.87912],[41.87204,94.881699],[41.871601,94.88427],[41.87085,94.886482],[41.86935,94.887657],[41.86618,94.889374],[41.864529,94.890427],[41.854229,94.897636],[41.853321,94.898354],[41.850658,94.900124],[41.845459,94.90377],[41.843231,94.905518],[41.84193,94.906731],[41.834141,94.91481],[41.83263,94.916656],[41.831348,94.918793],[41.830341,94.921066],[41.822659,94.947006],[41.822681,94.946938],[41.821529,94.950897],[41.811859,94.981277],[41.811451,94.982964],[41.811062,94.987167],[41.80801,95.009956],[41.807579,95.012787],[41.803242,95.035828],[41.80278,95.037987],[41.801811,95.039459],[41.800449,95.040283],[41.79937,95.041672],[41.798981,95.043709],[41.798931,95.046043],[41.79929,95.048683],[41.801491,95.056557],[41.807201,95.081543],[41.807819,95.084007],[41.808601,95.086418],[41.81176,95.094139],[41.812141,95.095657],[41.813389,95.102814],[41.81377,95.104523],[41.813801,95.106232],[41.81308,95.107803],[41.805882,95.116547],[41.79686,95.127617],[41.795639,95.128998],[41.795818,95.128799],[41.795311,95.129143],[41.795021,95.12973],[41.794418,95.130508],[41.793739,95.131241],[41.792912,95.131813],[41.791931,95.132187],[41.787621,95.133377],[41.785759,95.134048],[41.783821,95.13443],[41.77948,95.133087],[41.777401,95.133003],[41.769032,95.136383],[41.767269,95.13694],[41.761452,95.13842],[41.759869,95.138908],[41.758209,95.139793],[41.725281,95.170288],[41.716209,95.178574],[41.713089,95.181328],[41.7062,95.186333],[41.70443,95.187531],[41.702549,95.188553],[41.69426,95.191917],[41.69257,95.192741],[41.69117,95.193787],[41.690331,95.194557],[41.685749,95.199341],[41.67609,95.209084],[41.674431,95.210327],[41.67263,95.21125],[41.670658,95.211891],[41.66626,95.213074],[41.664299,95.214027],[41.662991,95.215828],[41.660839,95.219803],[41.65979,95.221008],[41.65844,95.221863],[41.648361,95.225349],[41.646259,95.226189],[41.644218,95.227188],[41.608528,95.247704],[41.60677,95.248993],[41.605129,95.250458],[41.603642,95.25209],[41.55867,95.303436],[41.557178,95.304878],[41.55547,95.306084],[41.5536,95.306976],[41.537659,95.313148],[41.521111,95.319687],[41.503269,95.326576],[41.499722,95.327744],[41.486279,95.331001],[41.483829,95.33149],[41.48151,95.331749],[41.418961,95.336037],[41.41769,95.336189],[41.34993,95.340813],[41.348049,95.341026],[41.346149,95.341423],[41.309109,95.351532],[41.299801,95.353996],[41.295872,95.355118],[41.286308,95.357643],[41.27911,95.359596],[41.267288,95.36293],[41.239849,95.370354],[41.235882,95.371529],[41.23431,95.371887],[41.230549,95.372963],[41.227638,95.37355],[41.210209,95.375168],[41.1908,95.376801],[41.1786,95.377998],[41.171768,95.378571],[41.170151,95.37912],[41.145889,95.396797],[41.144199,95.398277],[41.142658,95.39991],[41.14127,95.401672],[41.125759,95.42276],[41.12434,95.424553],[41.122841,95.426117],[41.121288,95.427467],[41.112598,95.434418],[41.11095,95.435333],[41.107349,95.436142],[41.10556,95.436951],[41.09116,95.448433],[41.089539,95.449463],[41.084831,95.452087],[41.083542,95.45327],[41.082561,95.454788],[41.078522,95.461853],[41.077301,95.463303],[41.075081,95.464668],[41.07473,95.464867],[41.073681,95.465584],[41.072338,95.466461],[41.06773,95.469482],[41.06414,95.472038],[41.061741,95.472977],[41.059601,95.473038],[41.05727,95.472641],[41.04948,95.469711],[41.047211,95.468109],[41.045151,95.467041],[41.043018,95.467041],[41.04055,95.467773],[41.037159,95.469513],[41.035561,95.469711],[41.033291,95.469711],[41.030491,95.469437],[41.028629,95.469437],[41.024899,95.470383],[41.021969,95.470909],[41.020901,95.470711],[41.019501,95.469383],[41.01804,95.468109],[41.015301,95.466637],[41.013241,95.466309],[41.008911,95.465981],[41.00671,95.466309],[41.004841,95.467308],[41.003052,95.468842],[41.000679,95.471848],[40.997429,95.475533],[40.993698,95.478722],[40.941299,95.523643],[40.882931,95.57193],[40.860771,95.59272],[40.852169,95.60096],[40.85096,95.601868],[40.849178,95.602623],[40.84457,95.604057],[40.84127,95.604858],[40.835602,95.606003],[40.832191,95.606857],[40.827271,95.608528],[40.824211,95.60997],[40.818081,95.613297],[40.815659,95.614197],[40.794498,95.620667],[40.79213,95.62159],[40.790161,95.622757],[40.739639,95.653053],[40.683159,95.68631],[40.560768,95.758293],[40.559139,95.75927],[40.557941,95.760551],[40.55727,95.761803],[40.556862,95.763359],[40.55566,95.769852],[40.55521,95.773392],[40.550732,95.791092],[40.5439,95.818512],[40.54306,95.821533],[40.543018,95.821587],[40.540649,95.831047],[40.53907,95.837341],[40.530319,95.872833],[40.529411,95.877419],[40.528881,95.881477],[40.528851,95.881737],[40.528599,95.886452],[40.528671,95.890549],[40.528831,95.892937],[40.529091,95.895401],[40.531139,95.913231],[40.531509,95.916992],[40.532009,95.922897],[40.532108,95.924156],[40.532829,95.935677],[40.533211,95.940323],[40.533291,95.941277],[40.533428,95.942421],[40.533798,95.945557],[40.534019,95.947113],[40.535252,95.954674],[40.53624,95.964233],[40.537189,95.976349],[40.539242,95.992767],[40.539989,96.005859],[40.54044,96.010193],[40.541,96.01384],[40.542919,96.026047],[40.543171,96.028214],[40.54752,96.070686],[40.54813,96.076599],[40.548721,96.084511],[40.549389,96.096077],[40.550598,96.11734],[40.55098,96.121567],[40.551849,96.128128],[40.556881,96.156647],[40.557098,96.158058],[40.557629,96.161926],[40.557949,96.165993],[40.55872,96.179993],[40.560951,96.199028],[40.563648,96.226624],[40.568291,96.274063],[40.56879,96.278961],[40.569698,96.285233],[40.57069,96.290207],[40.571339,96.292847],[40.57394,96.302109],[40.57439,96.30407],[40.574661,96.305313],[40.575359,96.308998],[40.57552,96.309914],[40.575581,96.310371],[40.575699,96.31115],[40.575871,96.312462],[40.576149,96.314682],[40.576519,96.319397],[40.576649,96.32518],[40.576401,96.338333],[40.57526,96.417137],[40.575562,96.426323],[40.576611,96.438957],[40.57682,96.443626],[40.576698,96.448219],[40.576618,96.451401],[40.576591,96.453537],[40.575729,96.465378],[40.575241,96.483818],[40.574841,96.488899],[40.573952,96.494553],[40.570702,96.510117],[40.569939,96.516006],[40.569469,96.522537],[40.569019,96.527107],[40.568401,96.531517],[40.567451,96.536507],[40.566219,96.54361],[40.565731,96.550591],[40.565731,96.553001],[40.566029,96.558853],[40.566509,96.568413],[40.566341,96.575249],[40.565929,96.582329],[40.565948,96.586288],[40.5662,96.590271],[40.566681,96.594307],[40.56736,96.599838],[40.567348,96.608368],[40.56723,96.61602],[40.567322,96.618179],[40.56736,96.618927],[40.56749,96.620659],[40.56765,96.622299],[40.5686,96.630157],[40.568958,96.634697],[40.571991,96.703812],[40.572929,96.710403],[40.575539,96.721573],[40.576149,96.725319],[40.576641,96.731293],[40.576611,96.736549],[40.576099,96.742088],[40.574718,96.750931],[40.574219,96.758362],[40.57423,96.758377],[40.574219,96.758362],[40.574409,96.762466],[40.575451,96.787216],[40.575531,96.792084],[40.5755,96.794434],[40.57523,96.799507],[40.574692,96.804893],[40.574379,96.807129],[40.570881,96.826408],[40.56163,96.876579],[40.559639,96.891777],[40.558578,96.896599],[40.558071,96.89843],[40.556839,96.9021],[40.555069,96.906273],[40.55328,96.909668],[40.540058,96.932861],[40.537289,96.936836],[40.536251,96.938164],[40.53344,96.941261],[40.530682,96.943817],[40.528179,96.94577],[40.5242,96.948303],[40.504028,96.959183],[40.497231,96.96241],[40.477169,96.971222],[40.476452,96.97155],[40.47179,96.973953],[40.467999,96.976357],[40.460899,96.981567],[40.451939,96.988083],[40.448231,96.990463],[40.44437,96.99221],[40.433559,96.996193],[40.428959,96.998672],[40.425781,97.000961],[40.424198,97.002312],[40.406921,97.019852],[40.404881,97.021606],[40.402088,97.023651],[40.40044,97.024658],[40.396702,97.026466],[40.391609,97.028053],[40.38802,97.028587],[40.381908,97.028717],[40.378609,97.02903],[40.375011,97.029701],[40.372089,97.03054],[40.359791,97.034866],[40.35503,97.03727],[40.35025,97.040588],[40.345829,97.044617],[40.341431,97.049957],[40.333191,97.061417],[40.330521,97.06485],[40.327141,97.068367],[40.323559,97.071114],[40.317268,97.075447],[40.31308,97.077667],[40.30891,97.079277],[40.305,97.080132],[40.30098,97.080467],[40.2971,97.080467],[40.293091,97.080917],[40.288311,97.082108],[40.26688,97.089203],[40.261761,97.091362],[40.257099,97.094933],[40.254799,97.097038],[40.237301,97.113998],[40.235271,97.116211],[40.232948,97.119034],[40.22443,97.130653],[40.220871,97.135269],[40.219921,97.136414],[40.217701,97.138802],[40.205471,97.150963],[40.202042,97.154533],[40.200539,97.156303],[40.198158,97.159508],[40.19643,97.162216],[40.194881,97.164932],[40.189041,97.176514],[40.188332,97.177803],[40.186069,97.181587],[40.185371,97.182716],[40.18232,97.18705],[40.175079,97.196701],[40.172459,97.200439],[40.17054,97.203568],[40.164322,97.214851],[40.157082,97.225838],[40.156799,97.226334],[40.155731,97.228149],[40.154251,97.23082],[40.154121,97.231056],[40.153229,97.232811],[40.151112,97.237022],[40.151009,97.237213],[40.150982,97.237267],[40.15041,97.238358],[40.148998,97.240868],[40.148609,97.241547],[40.146091,97.245667],[40.13966,97.255379],[40.138168,97.257477],[40.134159,97.262863],[40.132679,97.264732],[40.132481,97.264969],[40.131519,97.266159],[40.130619,97.26725],[40.125278,97.273499],[40.12468,97.274246],[40.124599,97.274353],[40.12376,97.275459],[40.123138,97.276314],[40.12138,97.278954],[40.11932,97.282463],[40.11787,97.285347],[40.11655,97.2883],[40.11364,97.29567],[40.112259,97.298973],[40.11026,97.303169],[40.108639,97.30616],[40.105339,97.311546],[40.103359,97.314743],[40.102581,97.315987],[40.0993,97.32074],[40.09594,97.324959],[40.0928,97.328407],[40.06662,97.353867],[40.065639,97.354958],[40.064789,97.355988],[40.063549,97.357536],[40.061871,97.359947],[40.06131,97.360832],[40.05941,97.364128],[40.058689,97.36557],[40.057331,97.368607],[40.05637,97.371147],[40.055241,97.374786],[40.05481,97.376282],[40.053959,97.380447],[40.05278,97.388863],[40.05191,97.393333],[40.050781,97.397476],[40.049431,97.401314],[40.047131,97.406311],[40.045422,97.409241],[40.042198,97.414253],[40.040081,97.417473],[40.037971,97.421021],[40.036121,97.424217],[40.034519,97.427292],[40.034119,97.428253],[40.03228,97.431709],[40.032021,97.43222],[40.029869,97.437187],[40.028511,97.441032],[40.025341,97.452019],[40.024109,97.455811],[40.023418,97.457764],[40.022968,97.458961],[40.02103,97.463692],[40.02071,97.464432],[40.013981,97.47892],[40.0061,97.496628],[40.00304,97.503929],[40.000721,97.509857],[39.995461,97.523727],[39.993599,97.52903],[39.990631,97.53772],[39.989929,97.539772],[39.98962,97.540733],[39.98864,97.543823],[39.988411,97.544548],[39.986259,97.552422],[39.98164,97.571747],[39.97945,97.579453],[39.979401,97.57962],[39.979351,97.579788],[39.979118,97.580513],[39.97887,97.581322],[39.976971,97.587341],[39.97562,97.59185],[39.974819,97.594749],[39.96983,97.615303],[39.96867,97.621437],[39.967949,97.626289],[39.96727,97.630531],[39.967091,97.631401],[39.96701,97.631737],[39.966751,97.63295],[39.966461,97.634132],[39.965889,97.6362],[39.964611,97.64003],[39.96413,97.641243],[39.96328,97.643227],[39.961391,97.647102],[39.95739,97.655563],[39.956459,97.657761],[39.952839,97.667587],[39.951511,97.671204],[39.950329,97.673973],[39.94931,97.676064],[39.948441,97.677696],[39.947762,97.678322],[39.947701,97.679047],[39.945889,97.682449],[39.945339,97.683403],[39.942699,97.687782],[39.940701,97.691788],[39.940109,97.693176],[39.93856,97.697433],[39.937222,97.702263],[39.93539,97.708588],[39.93507,97.709503],[39.933929,97.712547],[39.931839,97.717484],[39.92952,97.723167],[39.926521,97.73188],[39.922089,97.748093],[39.920631,97.752792],[39.920231,97.753883],[39.918991,97.757027],[39.916229,97.762711],[39.9146,97.765404],[39.905449,97.779282],[39.90078,97.786346],[39.90041,97.786903],[39.900028,97.787529],[39.899231,97.788834],[39.897919,97.791153],[39.897499,97.791946],[39.896629,97.793671],[39.896309,97.794373],[39.896091,97.794868],[39.894321,97.799217],[39.891281,97.808968],[39.889759,97.813011],[39.88876,97.81517],[39.886631,97.819153],[39.883789,97.823463],[39.883369,97.824059],[39.879879,97.829247],[39.87809,97.832474],[39.876228,97.836693],[39.875481,97.838623],[39.875309,97.839104],[39.874962,97.840103],[39.874771,97.840714],[39.874722,97.840858],[39.874321,97.842209],[39.87315,97.847214],[39.872742,97.849541],[39.872719,97.849663],[39.871429,97.857353],[39.870522,97.862541],[39.87038,97.863327],[39.869308,97.869034],[39.86927,97.869331],[39.868679,97.872292],[39.868259,97.874458],[39.868149,97.875038],[39.867668,97.877579],[39.867458,97.878647],[39.867161,97.880318],[39.86507,97.893143],[39.864841,97.894348],[39.86422,97.897163],[39.863911,97.898407],[39.863331,97.900642],[39.862461,97.903877],[39.861549,97.907227],[39.860451,97.910782],[39.859531,97.913383],[39.859241,97.914131],[39.85743,97.918419],[39.854691,97.92511],[39.85107,97.93644],[39.84874,97.942169],[39.842659,97.954224],[39.840599,97.958992],[39.839581,97.961853],[39.839069,97.963516],[39.838879,97.964233],[39.8386,97.965218],[39.838329,97.966293],[39.837719,97.969017],[39.83675,97.975533],[39.836411,97.980408],[39.835941,97.993233],[39.835751,97.995903],[39.835651,97.996964],[39.835098,98.001427],[39.83408,98.007278],[39.831661,98.019257],[39.830971,98.021942],[39.830681,98.022926],[39.830608,98.023193],[39.829281,98.027473],[39.827961,98.031921],[39.82518,98.042007],[39.825031,98.042557],[39.824108,98.045792],[39.823841,98.046638],[39.823441,98.047951],[39.82259,98.050499],[39.821659,98.053322],[39.821201,98.054817],[39.821121,98.055061],[39.8181,98.065804],[39.81255,98.082474],[39.808788,98.093147],[39.802261,98.115982],[39.801849,98.117073],[39.80143,98.118294],[39.800541,98.119141],[39.79985,98.119301],[39.799099,98.119057],[39.79842,98.118523],[39.796982,98.117729],[39.797039,98.118134],[39.79652,98.124336],[39.795589,98.126411],[39.795639,98.127251],[39.79586,98.127724],[39.796619,98.128571],[39.797409,98.129433],[39.798111,98.130386],[39.798328,98.130989],[39.798359,98.131729],[39.798031,98.133743],[39.79755,98.134857],[39.797009,98.135643],[39.796982,98.135674],[39.795631,98.137154],[39.793541,98.139603],[39.792252,98.141647],[39.791519,98.143112],[39.790741,98.145149],[39.79002,98.147614],[39.78804,98.154617],[39.780701,98.180634],[39.780441,98.182091],[39.780369,98.184196],[39.780418,98.184914],[39.78051,98.18557],[39.780621,98.186218],[39.780739,98.186783],[39.780972,98.187592],[39.781261,98.188377],[39.78223,98.190567],[39.783298,98.192757],[39.78352,98.193237],[39.784309,98.195053],[39.784859,98.196823],[39.785831,98.202904],[39.786282,98.204277],[39.78849,98.208946],[39.789669,98.211243],[39.790169,98.212196],[39.790649,98.213097],[39.795959,98.22258],[39.796169,98.223091],[39.79623,98.223351],[39.796291,98.223663],[39.79631,98.224037],[39.79631,98.224358],[39.796169,98.225693],[39.796021,98.227623],[39.795841,98.230141],[39.795841,98.23053],[39.79583,98.230713],[39.79578,98.231667],[39.795582,98.233299],[39.795071,98.242218],[39.794651,98.248848],[39.794151,98.250504],[39.79324,98.256889],[39.791481,98.268311],[39.788021,98.290779],[39.787079,98.297058],[39.786751,98.299362],[39.786461,98.301552],[39.786091,98.303917],[39.78603,98.304298],[39.785851,98.305321],[39.785561,98.306793],[39.785389,98.307648],[39.785061,98.309273],[39.784409,98.312523],[39.783039,98.321411],[39.782021,98.326538],[39.78178,98.327927],[39.78056,98.335876],[39.780079,98.339653],[39.779881,98.340431],[39.77956,98.34304],[39.77919,98.345444],[39.779011,98.347023],[39.778999,98.347427],[39.778149,98.352997],[39.777851,98.354439],[39.777699,98.356102],[39.776501,98.364517],[39.77597,98.367798],[39.77401,98.378723],[39.773579,98.380791],[39.770519,98.391006],[39.769279,98.395576],[39.76878,98.397713],[39.768452,98.39946],[39.767502,98.403862],[39.766529,98.408043],[39.765881,98.410362],[39.765621,98.41169],[39.76543,98.413017],[39.765171,98.415977],[39.76498,98.417648],[39.764271,98.422722],[39.764061,98.424698],[39.763851,98.427673],[39.763199,98.432503],[39.76268,98.440178],[39.76162,98.446182],[39.76141,98.447723],[39.761269,98.451622],[39.761139,98.452782],[39.760559,98.456367],[39.760319,98.458473],[39.76017,98.463516],[39.760139,98.469017],[39.759861,98.482643],[39.759819,98.487099],[39.759769,98.487679],[39.759571,98.488739],[39.7593,98.489487],[39.75909,98.489853],[39.75882,98.490143],[39.752739,98.493233],[39.752029,98.493523],[39.748878,98.495064],[39.738289,98.500366],[39.737671,98.500641],[39.736931,98.500282],[39.736752,98.500252],[39.73658,98.500671],[39.73679,98.50193],[39.736031,98.507088],[39.736031,98.507393],[39.735859,98.508347],[39.735641,98.50882],[39.7356,98.509163],[39.735699,98.509377],[39.735691,98.509933],[39.734879,98.515533],[39.734459,98.517387],[39.73423,98.518143],[39.73349,98.519363],[39.731339,98.522148],[39.7281,98.52726],[39.726971,98.529518],[39.72406,98.536087],[39.723068,98.540077],[39.71999,98.550377],[39.716782,98.56115],[39.71537,98.565041],[39.714031,98.566704],[39.713058,98.567459],[39.712219,98.569153],[39.71146,98.570107],[39.710419,98.571487],[39.70673,98.576279],[39.702721,98.58242],[39.69894,98.586761],[39.697819,98.588203],[39.684139,98.604286],[39.683121,98.605476],[39.68119,98.608124],[39.64846,98.658203],[39.644569,98.662773],[39.643269,98.664513],[39.643261,98.664833],[39.640518,98.667847],[39.607601,98.703133],[39.603149,98.708679],[39.601139,98.711227],[39.600971,98.711632],[39.59441,98.719849],[39.593201,98.721451],[39.59219,98.723343],[39.58913,98.733551],[39.587379,98.740196],[39.585281,98.747566],[39.586021,98.747627],[39.58485,98.749229],[39.582649,98.756844],[39.5784,98.772346],[39.576038,98.780312],[39.576111,98.780357],[39.574329,98.787033],[39.571388,98.82679],[39.571251,98.831139],[39.571301,98.872383],[39.571121,98.874039],[39.566021,98.892883],[39.565189,98.89576],[39.564991,98.895973],[39.562901,98.903687],[39.562199,98.905434],[39.561409,98.907211],[39.55806,98.91468],[39.55444,98.923119],[39.551739,98.928078],[39.550549,98.929718],[39.549809,98.930473],[39.543041,98.936996],[39.538151,98.939117],[39.5303,98.942497],[39.52425,98.944443],[39.522961,98.944969],[39.503269,98.959221],[39.49918,98.962677],[39.491112,98.96904],[39.488869,98.970703],[39.48769,98.971458],[39.474831,98.977982],[39.465591,98.982658],[39.464249,98.982803],[39.463219,98.98259],[39.44043,98.976547],[39.435268,98.975197],[39.430759,98.975433],[39.425461,98.975754],[39.419109,98.976158],[39.41626,98.976799],[39.41169,98.978249],[39.4104,98.978859],[39.409111,98.979713],[39.4021,98.985313],[39.380379,99.001549],[39.378712,99.00293],[39.372959,99.013206],[39.37006,99.019577],[39.368221,99.028664],[39.36755,99.030533],[39.365459,99.035042],[39.364899,99.036003],[39.363689,99.03862],[39.363079,99.040916],[39.363289,99.041077],[39.36293,99.042053],[39.363091,99.042236],[39.361801,99.045723],[39.359161,99.054321],[39.357269,99.060623],[39.356419,99.063431],[39.355801,99.069542],[39.35556,99.072449],[39.35223,99.082733],[39.35083,99.087013],[39.350349,99.089203],[39.349941,99.091743],[39.34956,99.092812],[39.348621,99.093613],[39.34539,99.09465],[39.344879,99.094971],[39.34433,99.095482],[39.343491,99.09729],[39.341419,99.103348],[39.341179,99.104057],[39.34127,99.104378],[39.340809,99.105591],[39.340618,99.106758],[39.34029,99.111366],[39.339458,99.122627],[39.339291,99.125473],[39.339031,99.125504],[39.339062,99.128487],[39.338871,99.13018],[39.33667,99.143822],[39.336281,99.145317],[39.32988,99.160294],[39.322922,99.176064],[39.321411,99.179459],[39.320782,99.180527],[39.318958,99.183006],[39.318039,99.184242],[39.317589,99.185204],[39.317451,99.185966],[39.317371,99.193848],[39.317188,99.195152],[39.31657,99.19735],[39.316299,99.198288],[39.315861,99.19986],[39.308239,99.227097],[39.296791,99.268066],[39.28944,99.29332],[39.28841,99.296143],[39.28421,99.303787],[39.280941,99.309776],[39.279888,99.311493],[39.275028,99.316841],[39.27433,99.318031],[39.272221,99.323334],[39.268768,99.333458],[39.26857,99.333878],[39.267639,99.335373],[39.26635,99.336998],[39.257931,99.347504],[39.257141,99.34848],[39.255829,99.350327],[39.254318,99.353149],[39.253361,99.35553],[39.23188,99.428017],[39.229439,99.436272],[39.22887,99.43763],[39.22739,99.439957],[39.227379,99.439842],[39.227371,99.440033],[39.224831,99.45179],[39.224781,99.453484],[39.22506,99.455002],[39.226871,99.460564],[39.2272,99.461502],[39.23122,99.469063],[39.232792,99.472069],[39.235748,99.478867],[39.235939,99.479828],[39.236271,99.48394],[39.236511,99.485748],[39.236938,99.48687],[39.237652,99.487846],[39.238331,99.488426],[39.238541,99.488548],[39.243401,99.489937],[39.24633,99.490753],[39.248489,99.491364],[39.249229,99.491653],[39.250969,99.492699],[39.25309,99.494164],[39.25983,99.497643],[39.261341,99.498772],[39.26313,99.498993],[39.263592,99.499229],[39.263969,99.499763],[39.264339,99.502136],[39.264141,99.505539],[39.26405,99.506943],[39.263851,99.509521],[39.263149,99.512421],[39.263081,99.513512],[39.26321,99.529457],[39.26326,99.543068],[39.265942,99.56086],[39.26627,99.562759],[39.266659,99.563828],[39.273312,99.579262],[39.276791,99.585587],[39.278049,99.588112],[39.27961,99.591179],[39.281841,99.596123],[39.28392,99.60022],[39.284031,99.600441],[39.284969,99.602753],[39.28653,99.607536],[39.292389,99.616859],[39.295189,99.621613],[39.296101,99.62326],[39.298328,99.627823],[39.3046,99.639008],[39.306141,99.642014],[39.30703,99.6437],[39.308552,99.646027],[39.309608,99.647614],[39.310169,99.648857],[39.311272,99.651543],[39.311722,99.653023],[39.314941,99.665878],[39.317089,99.671997],[39.325272,99.695152],[39.32645,99.698471],[39.329399,99.706573],[39.33012,99.709038],[39.330921,99.713821],[39.331009,99.715332],[39.330898,99.717041],[39.330791,99.718712],[39.330509,99.720238],[39.32444,99.733963],[39.321629,99.743492],[39.321362,99.745087],[39.32066,99.749489],[39.320358,99.750679],[39.319859,99.75238],[39.318211,99.756866],[39.315269,99.763817],[39.314651,99.765297],[39.3125,99.77124],[39.31179,99.773804],[39.307232,99.798157],[39.30724,99.798363],[39.30624,99.802261],[39.30579,99.803619],[39.304039,99.806503],[39.303089,99.808601],[39.301231,99.813339],[39.29937,99.818626],[39.29678,99.824249],[39.296059,99.825783],[39.293911,99.835258],[39.292961,99.837967],[39.29208,99.841263],[39.290489,99.84359],[39.289532,99.846039],[39.289379,99.847412],[39.289509,99.847923],[39.28949,99.851601],[39.289471,99.851898],[39.289619,99.854874],[39.289989,99.858093],[39.29121,99.868439],[39.29097,99.882759],[39.290371,99.885643],[39.289841,99.887009],[39.287552,99.891113],[39.286179,99.893799],[39.280209,99.907257],[39.279621,99.90831],[39.278042,99.910347],[39.275551,99.913368],[39.26358,99.931847],[39.247608,99.94902],[39.23772,99.959663],[39.233768,99.964027],[39.23381,99.964043],[39.232891,99.964813],[39.231831,99.965424],[39.229019,99.966759],[39.225101,99.967987],[39.223831,99.968613],[39.22287,99.969307],[39.221859,99.970322],[39.219028,99.973518],[39.217831,99.97477],[39.21484,99.977562],[39.21381,99.978691],[39.212311,99.981117],[39.211529,99.982117],[39.19817,99.993927],[39.19735,99.994827],[39.196949,99.995842],[39.196239,100.002251],[39.195889,100.00692],[39.19577,100.009262],[39.195641,100.010391],[39.19548,100.011673],[39.195061,100.01268],[39.193489,100.014412],[39.19268,100.015167],[39.192551,100.015137],[39.19252,100.01532],[39.19136,100.016487],[39.188541,100.019142],[39.18771,100.019958],[39.186081,100.02076],[39.182491,100.021347],[39.181751,100.021812],[39.181061,100.022751],[39.179779,100.025513],[39.17931,100.026199],[39.177872,100.028793],[39.177399,100.029953],[39.177029,100.031303],[39.176819,100.033096],[39.17691,100.037521],[39.176941,100.039017],[39.176842,100.043663],[39.175491,100.048759],[39.1749,100.050201],[39.174461,100.051987],[39.173759,100.055367],[39.172501,100.060173],[39.172588,100.060211],[39.172401,100.06073],[39.173038,100.069504],[39.17247,100.071899],[39.17226,100.073692],[39.17321,100.080002],[39.173149,100.081558],[39.173031,100.082077],[39.17268,100.083633],[39.172081,100.086273],[39.172218,100.086403],[39.171829,100.086838],[39.169621,100.091873],[39.1684,100.095497],[39.167149,100.098007],[39.16608,100.099167],[39.164761,100.100052],[39.16383,100.100693],[39.161388,100.10215],[39.16087,100.102692],[39.160172,100.103897],[39.157539,100.112488],[39.156929,100.113617],[39.156281,100.11451],[39.154079,100.11734],[39.153561,100.118408],[39.15316,100.119682],[39.15292,100.122673],[39.153061,100.123978],[39.154091,100.125526],[39.15649,100.128166],[39.157162,100.129143],[39.157452,100.130127],[39.156582,100.138634],[39.15657,100.138817],[39.156021,100.142693],[39.15493,100.14962],[39.15379,100.154404],[39.152962,100.157829],[39.151051,100.167427],[39.150871,100.167763],[39.147491,100.171143],[39.14727,100.171333],[39.14608,100.172897],[39.145721,100.173111],[39.143879,100.175812],[39.139511,100.181587],[39.138802,100.182419],[39.136372,100.184402],[39.135288,100.185448],[39.131851,100.192169],[39.131569,100.193153],[39.131149,100.197807],[39.130459,100.201263],[39.130039,100.202682],[39.127258,100.208557],[39.125149,100.213287],[39.121849,100.219254],[39.12056,100.221153],[39.117352,100.224907],[39.1129,100.232071],[39.112129,100.233353],[39.111488,100.234528],[39.110161,100.238693],[39.108261,100.24482],[39.106621,100.253532],[39.10601,100.255219],[39.099529,100.265472],[39.097809,100.267929],[39.09132,100.274979],[39.08886,100.278084],[39.08638,100.282143],[39.085449,100.283142],[39.083241,100.285378],[39.08152,100.287308],[39.079159,100.29039],[39.07848,100.290787],[39.077999,100.291763],[39.07642,100.293739],[39.074471,100.296593],[39.072319,100.299248],[39.07132,100.300247],[39.06966,100.301903],[39.057961,100.314529],[39.05022,100.322197],[39.04755,100.324883],[39.046558,100.325798],[39.043289,100.327919],[39.042301,100.328537],[39.041359,100.329247],[39.04044,100.330383],[39.03764,100.336403],[39.037201,100.337173],[39.031891,100.344978],[39.03001,100.347763],[39.01815,100.358269],[39.017208,100.359367],[39.014439,100.363419],[39.011909,100.366524],[39.011131,100.367569],[39.009892,100.370148],[39.009491,100.371307],[39.009411,100.37294],[39.009701,100.374458],[39.009899,100.376793],[39.009682,100.378067],[39.009171,100.379158],[39.00856,100.379959],[39.00684,100.381622],[39.006271,100.382782],[39.003311,100.390747],[39.000702,100.395638],[38.99966,100.398117],[38.99839,100.401466],[38.997978,100.402969],[38.997711,100.404762],[38.997398,100.406532],[38.996571,100.408501],[38.995571,100.410332],[38.995041,100.411652],[38.994362,100.414619],[38.994259,100.416],[38.994469,100.417084],[38.996239,100.421806],[38.996651,100.423264],[38.996609,100.428879],[38.996151,100.43045],[38.99585,100.430832],[38.991089,100.435509],[38.99017,100.435982],[38.989288,100.435959],[38.985409,100.434433],[38.980579,100.432991],[38.979401,100.433357],[38.97773,100.434357],[38.975861,100.437202],[38.974949,100.437912],[38.972141,100.438797],[38.960949,100.43602],[38.95298,100.433403],[38.95216,100.433128],[38.95126,100.432938],[38.95063,100.433144],[38.94836,100.434303],[38.942612,100.437157],[38.941761,100.437927],[38.938251,100.44165],[38.93692,100.443031],[38.9352,100.443413],[38.93541,100.444107],[38.935711,100.44725],[38.93644,100.452507],[38.93647,100.453751],[38.936588,100.45488],[38.936989,100.461548],[38.937401,100.465958],[38.937389,100.467453],[38.937469,100.468674],[38.937469,100.470398],[38.937439,100.472549],[38.937401,100.47464],[38.93734,100.477226],[38.937359,100.480133],[38.937489,100.482933],[38.937889,100.488083],[38.937908,100.488579],[38.93792,100.488907],[38.937729,100.488991],[38.934582,100.488632],[38.927471,100.487907],[38.92429,100.487694],[38.92131,100.487503],[38.918362,100.487297],[38.915371,100.487099],[38.911781,100.486893],[38.9081,100.486671],[38.906281,100.486549],[38.905769,100.486267],[38.905651,100.486282],[38.905361,100.486313],[38.905312,100.486366],[38.90453,100.487389],[38.903542,100.4888],[38.897739,100.496407],[38.894131,100.499657],[38.89225,100.500999],[38.888939,100.503441],[38.885078,100.50631],[38.878761,100.511673],[38.877159,100.51358],[38.87524,100.515968],[38.87027,100.52195],[38.860298,100.534897],[38.85957,100.537666],[38.85746,100.541687],[38.85574,100.54493],[38.854431,100.547401],[38.853851,100.548477],[38.853451,100.54921],[38.8521,100.551849],[38.851349,100.553253],[38.85001,100.555794],[38.84811,100.559349],[38.846142,100.563026],[38.84539,100.564133],[38.8442,100.565521],[38.839249,100.569122],[38.83136,100.571358],[38.83297,100.576851],[38.82534,100.582687],[38.81625,100.590927],[38.796181,100.60878],[38.763531,100.63195],[38.754429,100.637619],[38.725109,100.655472],[38.708359,100.664742],[38.70488,100.667488],[38.702068,100.670227],[38.688271,100.686203],[38.687061,100.687569],[38.676609,100.705421],[38.675941,100.706451],[38.66629,100.71315],[38.667099,100.716751],[38.6675,100.720528],[38.667759,100.723961],[38.672321,100.771339],[38.655701,100.774429],[38.61655,100.780777],[38.531059,100.795723],[38.483768,100.804131],[38.480141,100.805328],[38.47905,100.805946],[38.468189,100.812027],[38.46254,100.814774],[38.459721,100.815804],[38.448559,100.818031],[38.446949,100.818893],[38.445869,100.820427],[38.443581,100.8237],[38.441841,100.82576],[38.44009,100.82679],[38.43874,100.827637],[38.43565,100.829018],[38.416019,100.837936],[38.360451,100.86335],[38.358158,100.864899],[38.33218,100.886353],[38.31292,100.896477],[38.31076,100.897339],[38.305241,100.898201],[38.302811,100.898888],[38.277481,100.908836],[38.27182,100.911423],[38.267109,100.914162],[38.263329,100.916908],[38.240681,100.934937],[38.23893,100.935966],[38.230438,100.937851],[38.22525,100.938667],[38.22401,100.938904],[38.21764,100.940109],[38.215462,100.939423],[38.214828,100.939209],[38.21431,100.938957],[38.201801,100.93528],[38.20174,100.935257],[38.200401,100.934982],[38.194172,100.932129],[38.19355,100.932167],[38.191509,100.932266],[38.189819,100.932564],[38.188801,100.933067],[38.187191,100.933891],[38.183262,100.935593],[38.18232,100.93589],[38.18116,100.936142],[38.179989,100.936096],[38.178612,100.935837],[38.176151,100.935226],[38.17593,100.935158],[38.17543,100.935127],[38.17474,100.935226],[38.174381,100.935333],[38.173191,100.935997],[38.170811,100.938019],[38.169861,100.938141],[38.169529,100.938133],[38.16922,100.938057],[38.168282,100.936287],[38.166069,100.937134],[38.166561,100.93586],[38.16634,100.935364],[38.16626,100.934853],[38.165741,100.934723],[38.16497,100.93383],[38.162579,100.934982],[38.162231,100.93528],[38.161411,100.936569],[38.161209,100.936867],[38.16053,100.937439],[38.16029,100.937447],[38.15947,100.936722],[38.158779,100.936073],[38.15852,100.93576],[38.153389,100.931503],[38.152328,100.93026],[38.151409,100.928841],[38.1483,100.923149],[38.14677,100.922836],[38.14465,100.922813],[38.13913,100.922333],[38.138729,100.921997],[38.137669,100.920853],[38.13485,100.920441],[38.133919,100.920181],[38.133221,100.920242],[38.132881,100.920341],[38.126369,100.917053],[38.125771,100.917122],[38.12159,100.91671],[38.118771,100.917053],[38.11718,100.916672],[38.11676,100.91642],[38.11602,100.916412],[38.114201,100.916252],[38.113411,100.916367],[38.113071,100.916458],[38.113041,100.916473],[38.112598,100.916527],[38.112209,100.916611],[38.110981,100.917023],[38.11047,100.917229],[38.108398,100.917892],[38.105492,100.918831],[38.10294,100.919861],[38.101051,100.921097],[38.099892,100.921783],[38.09866,100.922501],[38.096241,100.920647],[38.095921,100.920799],[38.09502,100.921738],[38.09444,100.922363],[38.094238,100.922523],[38.092918,100.922768],[38.092659,100.922768],[38.091438,100.922371],[38.091202,100.92234],[38.09095,100.922371],[38.089951,100.92292],[38.089588,100.922997],[38.087589,100.922287],[38.086342,100.921783],[38.086128,100.921959],[38.085819,100.922127],[38.085381,100.922028],[38.08466,100.921509],[38.08456,100.921089],[38.084301,100.920227],[38.084221,100.920036],[38.08353,100.918831],[38.082909,100.91761],[38.08292,100.917099],[38.083038,100.916718],[38.083771,100.915039],[38.083309,100.911873],[38.0812,100.912231],[38.079781,100.910057],[38.077671,100.908447],[38.07642,100.907082],[38.075939,100.907028],[38.075169,100.906967],[38.073582,100.906807],[38.073139,100.906593],[38.072418,100.905533],[38.07119,100.903549],[38.070061,100.902039],[38.069592,100.901604],[38.069229,100.90123],[38.069118,100.901176],[38.068958,100.901093],[38.068691,100.900917],[38.066059,100.89875],[38.06493,100.896889],[38.064602,100.896294],[38.064362,100.895851],[38.064049,100.894623],[38.063911,100.894112],[38.06369,100.893761],[38.063389,100.893471],[38.061901,100.89257],[38.061508,100.892326],[38.061089,100.892036],[38.060539,100.891502],[38.06015,100.891083],[38.060131,100.89106],[38.05999,100.890923],[38.05806,100.889229],[38.057362,100.888283],[38.057281,100.888191],[38.056889,100.887894],[38.056358,100.887466],[38.055229,100.886688],[38.05442,100.886139],[38.053909,100.886078],[38.05283,100.886497],[38.050999,100.887207],[38.04887,100.887001],[38.047798,100.886871],[38.04686,100.887138],[38.04538,100.887756],[38.044159,100.888252],[38.042259,100.888908],[38.040859,100.889023],[38.039219,100.888992],[38.03812,100.889374],[38.035961,100.89048],[38.035191,100.891068],[38.033932,100.892174],[38.032829,100.893143],[38.0313,100.894478],[38.03019,100.89547],[38.029259,100.896149],[38.02895,100.896317],[38.028,100.8964],[38.02663,100.896248],[38.025509,100.896248],[38.024231,100.896317],[38.02322,100.896011],[38.021809,100.895432],[38.02076,100.89502],[38.01973,100.894882],[38.018162,100.894783],[38.016579,100.894653],[38.01572,100.894791],[38.014729,100.895241],[38.013451,100.895851],[38.01292,100.896111],[38.012611,100.896347],[38.0116,100.897499],[38.01049,100.898743],[38.009499,100.89991],[38.00872,100.901077],[38.007912,100.902313],[38.007401,100.903084],[38.006409,100.904556],[38.005939,100.90535],[38.00589,100.90554],[38.005859,100.906082],[38.006119,100.907249],[38.00631,100.907837],[38.006321,100.908043],[38.006199,100.908684],[38.005638,100.909477],[38.004921,100.909714],[38.004341,100.909889],[38.004211,100.909973],[38.00399,100.910172],[38.00354,100.910957],[38.00296,100.912216],[38.002159,100.913986],[38.001869,100.914558],[38.00148,100.915024],[38.000629,100.915543],[38.000141,100.916023],[38.000061,100.916191],[37.999931,100.916763],[37.99995,100.917664],[37.99976,100.918251],[37.999069,100.91922],[37.998081,100.920486],[37.994629,100.922951],[37.993259,100.923653],[37.992119,100.92395],[37.991749,100.924187],[37.991718,100.924271],[37.992081,100.924622],[37.992352,100.924583],[37.993462,100.924759],[37.994831,100.925262],[37.99577,100.925636],[37.995949,100.925858],[37.995369,100.926323],[37.994511,100.92617],[37.99313,100.926003],[37.991619,100.926338],[37.98933,100.927071],[37.988651,100.927277],[37.987629,100.927383],[37.986462,100.927254],[37.985901,100.927437],[37.985729,100.927917],[37.985729,100.928139],[37.985909,100.929626],[37.985851,100.929916],[37.98558,100.929962],[37.985111,100.929047],[37.98457,100.92804],[37.9841,100.927498],[37.983879,100.927353],[37.98291,100.927193],[37.981701,100.927467],[37.98,100.927994],[37.978321,100.928558],[37.976299,100.929497],[37.973499,100.930946],[37.97234,100.931587],[37.970921,100.932564],[37.969349,100.933693],[37.968651,100.934273],[37.96822,100.934914],[37.967701,100.935738],[37.966919,100.936974],[37.965889,100.938133],[37.96278,100.941231],[37.95332,100.950447],[37.95113,100.952316],[37.948059,100.954712],[37.946251,100.956261],[37.942341,100.960251],[37.940208,100.962517],[37.938641,100.964043],[37.925011,100.976463],[37.923859,100.977821],[37.912819,100.993507],[37.91153,100.995216],[37.906441,101.00177],[37.902988,101.006012],[37.897812,101.012581],[37.895741,101.015099],[37.894581,101.016342],[37.893471,101.017319],[37.886219,101.022598],[37.884129,101.0242],[37.882912,101.02549],[37.876579,101.034492],[37.87384,101.037201],[37.87289,101.038643],[37.871059,101.042099],[37.869381,101.045097],[37.865761,101.050629],[37.86404,101.053368],[37.861839,101.05851],[37.86116,101.060448],[37.860329,101.064133],[37.860329,101.065292],[37.8606,101.065331],[37.86047,101.066803],[37.86034,101.069008],[37.86026,101.069633],[37.860062,101.070129],[37.859489,101.070717],[37.85928,101.070801],[37.85873,101.070824],[37.85714,101.070374],[37.855881,101.070053],[37.855511,101.070183],[37.85537,101.070267],[37.854889,101.070847],[37.854771,101.07119],[37.854061,101.072327],[37.85331,101.073563],[37.85252,101.074989],[37.85228,101.075417],[37.85191,101.076263],[37.851521,101.077271],[37.850632,101.080223],[37.85051,101.080566],[37.8503,101.081352],[37.849998,101.082458],[37.84977,101.083717],[37.849621,101.084793],[37.849548,101.085373],[37.849491,101.085854],[37.849098,101.08725],[37.848598,101.088982],[37.847919,101.091454],[37.847698,101.093063],[37.84763,101.09433],[37.847599,101.094627],[37.84753,101.095673],[37.847462,101.096786],[37.847321,101.098503],[37.847118,101.099922],[37.846741,101.101959],[37.846489,101.103348],[37.846371,101.104027],[37.846199,101.104767],[37.8461,101.105431],[37.845741,101.10656],[37.84515,101.107933],[37.844719,101.109108],[37.84457,101.110367],[37.844479,101.112419],[37.844398,101.114662],[37.844311,101.115028],[37.84383,101.115433],[37.843449,101.115288],[37.842651,101.114532],[37.84185,101.11367],[37.840961,101.112709],[37.840488,101.112244],[37.840469,101.11219],[37.840439,101.112259],[37.840351,101.112129],[37.84013,101.111938],[37.839489,101.111588],[37.83905,101.111526],[37.83865,101.111588],[37.8381,101.111923],[37.8377,101.112373],[37.837238,101.113403],[37.8367,101.114769],[37.836479,101.115669],[37.8363,101.117081],[37.83577,101.12207],[37.835499,101.124001],[37.835121,101.125214],[37.834309,101.127197],[37.833679,101.129219],[37.833359,101.130989],[37.83305,101.133148],[37.83321,101.134811],[37.833881,101.137657],[37.834099,101.138351],[37.834702,101.13916],[37.83567,101.139702],[37.836121,101.139923],[37.836418,101.140373],[37.83614,101.140572],[37.835178,101.140648],[37.83382,101.140762],[37.832279,101.14077],[37.830601,101.140587],[37.82917,101.140778],[37.827431,101.140717],[37.825581,101.140388],[37.82452,101.1399],[37.823139,101.139297],[37.82214,101.139259],[37.821178,101.139618],[37.819019,101.140663],[37.817181,101.141411],[37.816669,101.141617],[37.815929,101.142174],[37.814751,101.143822],[37.813019,101.146439],[37.811901,101.148109],[37.811069,101.148567],[37.809551,101.148941],[37.807381,101.149544],[37.806061,101.150299],[37.804459,101.151299],[37.804119,101.151428],[37.80278,101.151962],[37.801182,101.152908],[37.798481,101.154587],[37.79567,101.156326],[37.795521,101.156441],[37.794899,101.157471],[37.793388,101.160606],[37.792149,101.163231],[37.791801,101.164368],[37.791191,101.167183],[37.790531,101.170303],[37.789902,101.173157],[37.789532,101.173958],[37.788589,101.17514],[37.787369,101.176498],[37.786541,101.177071],[37.785759,101.177933],[37.78442,101.179588],[37.783279,101.181313],[37.782421,101.183456],[37.7813,101.186394],[37.780449,101.188187],[37.779011,101.190361],[37.777809,101.191879],[37.77594,101.193947],[37.774529,101.194939],[37.772461,101.196312],[37.770329,101.197906],[37.7682,101.200546],[37.76577,101.203506],[37.76276,101.207207],[37.760689,101.210091],[37.75843,101.213463],[37.757191,101.215767],[37.755589,101.219109],[37.75441,101.222031],[37.753521,101.223457],[37.752949,101.224693],[37.752522,101.226517],[37.751942,101.228729],[37.751259,101.230072],[37.749901,101.232407],[37.749359,101.233803],[37.74844,101.236168],[37.7481,101.236839],[37.746868,101.238503],[37.745739,101.239891],[37.745441,101.240372],[37.74519,101.241577],[37.745049,101.24324],[37.744511,101.244423],[37.743649,101.246094],[37.742661,101.247627],[37.74091,101.249893],[37.739029,101.252281],[37.73679,101.255127],[37.734909,101.257561],[37.733028,101.260033],[37.732281,101.261452],[37.730949,101.264313],[37.730011,101.265556],[37.72863,101.266953],[37.727772,101.26783],[37.727531,101.268387],[37.727402,101.270111],[37.72736,101.27079],[37.727242,101.271141],[37.727051,101.271507],[37.726719,101.272079],[37.726391,101.272667],[37.725971,101.273331],[37.725208,101.274597],[37.724411,101.275932],[37.723999,101.277107],[37.723961,101.278053],[37.72422,101.279388],[37.724289,101.279747],[37.724159,101.28093],[37.723862,101.281448],[37.722301,101.283569],[37.721378,101.284973],[37.720901,101.286507],[37.72065,101.287338],[37.720161,101.288406],[37.719929,101.288811],[37.719589,101.289467],[37.719028,101.290482],[37.718262,101.291878],[37.71706,101.294037],[37.715969,101.296043],[37.714989,101.297813],[37.714699,101.298309],[37.71434,101.299026],[37.713829,101.300072],[37.713799,101.300117],[37.713242,101.300728],[37.712799,101.301132],[37.712601,101.301208],[37.712269,101.301277],[37.71159,101.301208],[37.71125,101.30101],[37.711079,101.300903],[37.71077,101.300743],[37.710209,101.300133],[37.709751,101.29969],[37.709309,101.299187],[37.708691,101.298683],[37.70834,101.298576],[37.707771,101.298767],[37.706871,101.299149],[37.706551,101.299294],[37.70607,101.299492],[37.705238,101.29985],[37.704762,101.300049],[37.704361,101.300217],[37.703651,101.300507],[37.70253,101.300987],[37.700699,101.30172],[37.698448,101.302338],[37.695919,101.302711],[37.69265,101.303146],[37.690048,101.303581],[37.68877,101.304001],[37.686951,101.304588],[37.686069,101.304909],[37.6847,101.305496],[37.68343,101.306107],[37.680759,101.307327],[37.67836,101.308121],[37.67527,101.309196],[37.672642,101.31041],[37.669472,101.311913],[37.668152,101.312767],[37.666481,101.313927],[37.665161,101.314903],[37.664322,101.315666],[37.662891,101.317139],[37.66127,101.318573],[37.660339,101.319321],[37.659191,101.320152],[37.65731,101.321297],[37.655869,101.322144],[37.654308,101.323029],[37.652191,101.324303],[37.648499,101.326591],[37.645439,101.328568],[37.64394,101.329826],[37.643021,101.330872],[37.64254,101.331497],[37.641319,101.333237],[37.639839,101.335373],[37.638199,101.337723],[37.636379,101.340317],[37.634541,101.342957],[37.632141,101.34639],[37.629341,101.350357],[37.627628,101.352814],[37.626659,101.354301],[37.62627,101.355598],[37.625721,101.357979],[37.625141,101.359108],[37.62434,101.360046],[37.62286,101.361603],[37.621571,101.363548],[37.62019,101.365372],[37.619209,101.366013],[37.617599,101.366814],[37.616562,101.367691],[37.61496,101.369507],[37.613701,101.370613],[37.610222,101.373337],[37.607319,101.375664],[37.60474,101.37793],[37.602089,101.380333],[37.598621,101.383461],[37.594391,101.387299],[37.591091,101.390297],[37.58691,101.394119],[37.583401,101.397293],[37.580681,101.399773],[37.580269,101.400131],[37.579899,101.400482],[37.579269,101.401047],[37.5783,101.401932],[37.57708,101.403053],[37.575291,101.404663],[37.57296,101.406754],[37.57003,101.409286],[37.566971,101.411903],[37.56599,101.412727],[37.56562,101.413033],[37.564522,101.413963],[37.563381,101.414726],[37.561989,101.415352],[37.56007,101.416077],[37.557541,101.417061],[37.554241,101.418373],[37.551399,101.419312],[37.547798,101.420357],[37.545071,101.421227],[37.542511,101.42215],[37.540421,101.422928],[37.53783,101.423813],[37.53566,101.424393],[37.534081,101.424332],[37.531898,101.42424],[37.529049,101.424202],[37.525181,101.424263],[37.52179,101.424278],[37.519741,101.424316],[37.516869,101.424393],[37.512939,101.424461],[37.508251,101.424538],[37.503899,101.424629],[37.500198,101.424683],[37.49575,101.424767],[37.492561,101.424797],[37.489559,101.424988],[37.487999,101.425407],[37.48576,101.425972],[37.482288,101.426201],[37.479931,101.426361],[37.4776,101.426498],[37.475159,101.426643],[37.473331,101.426697],[37.471889,101.426514],[37.47049,101.426529],[37.467419,101.426758],[37.46513,101.426933],[37.464211,101.42672],[37.464119,101.426697],[37.463982,101.426659],[37.463848,101.426582],[37.463139,101.426132],[37.46244,101.425659],[37.461079,101.424744],[37.459431,101.423668],[37.457729,101.422523],[37.45628,101.421501],[37.455479,101.420937],[37.45435,101.419746],[37.452621,101.417473],[37.451469,101.415993],[37.44981,101.413803],[37.44854,101.412338],[37.44804,101.412064],[37.44775,101.411888],[37.445492,101.411247],[37.443668,101.410637],[37.441891,101.40976],[37.44035,101.409012],[37.440208,101.408943],[37.43853,101.40863],[37.436539,101.408112],[37.434071,101.406921],[37.433498,101.406593],[37.432201,101.406242],[37.431061,101.406303],[37.42942,101.406502],[37.427738,101.406723],[37.425339,101.407478],[37.422489,101.408386],[37.420898,101.408218],[37.419739,101.407829],[37.417549,101.40773],[37.416061,101.407822],[37.414471,101.408257],[37.412609,101.408791],[37.411018,101.409241],[37.409962,101.409531],[37.40871,101.409767],[37.4076,101.409538],[37.406799,101.409302],[37.40564,101.409393],[37.404781,101.409843],[37.403141,101.410782],[37.401932,101.411163],[37.39996,101.411751],[37.398479,101.412033],[37.397221,101.412209],[37.396179,101.412369],[37.394939,101.412666],[37.394131,101.413139],[37.39407,101.413162],[37.393711,101.413223],[37.393089,101.412956],[37.391979,101.412209],[37.390869,101.411697],[37.389389,101.411148],[37.38903,101.410583],[37.38913,101.40995],[37.389179,101.409843],[37.389591,101.409142],[37.38966,101.408524],[37.389408,101.408096],[37.38839,101.406822],[37.387348,101.405571],[37.387112,101.405411],[37.386189,101.405357],[37.38554,101.40522],[37.384762,101.404449],[37.38401,101.403732],[37.38353,101.403618],[37.3825,101.403793],[37.38203,101.403572],[37.381908,101.40332],[37.38184,101.40303],[37.38163,101.401863],[37.381161,101.400917],[37.38028,101.399353],[37.379539,101.398064],[37.37907,101.397758],[37.378651,101.397919],[37.378529,101.398209],[37.378262,101.399963],[37.378239,101.400597],[37.378601,101.401222],[37.37904,101.401627],[37.37915,101.401901],[37.379169,101.402367],[37.37854,101.403183],[37.378342,101.40345],[37.378269,101.404053],[37.378471,101.404953],[37.378979,101.406151],[37.37957,101.407173],[37.379631,101.407341],[37.37973,101.407913],[37.379639,101.409309],[37.379372,101.409698],[37.378639,101.41011],[37.378429,101.410233],[37.378311,101.410339],[37.377861,101.411201],[37.377651,101.411713],[37.377571,101.411819],[37.376991,101.412308],[37.376259,101.412827],[37.374969,101.413727],[37.374741,101.413841],[37.373779,101.413933],[37.37265,101.414131],[37.372059,101.41494],[37.371849,101.415283],[37.37146,101.415459],[37.371319,101.415199],[37.37151,101.41481],[37.37159,101.414726],[37.37183,101.41449],[37.372509,101.413429],[37.373138,101.413017],[37.37431,101.412582],[37.37439,101.412537],[37.37524,101.411491],[37.376221,101.41021],[37.376579,101.409309],[37.37677,101.408707],[37.376801,101.407959],[37.376671,101.407494],[37.376549,101.407181],[37.375622,101.406151],[37.37534,101.405891],[37.374939,101.405739],[37.37405,101.405937],[37.372532,101.406487],[37.37244,101.406502],[37.371429,101.406052],[37.370049,101.405357],[37.369881,101.40464],[37.36993,101.404381],[37.370461,101.402924],[37.370449,101.402229],[37.370121,101.401772],[37.369801,101.401688],[37.368721,101.401741],[37.36731,101.401833],[37.36607,101.402046],[37.36491,101.402313],[37.363361,101.402893],[37.362251,101.403313],[37.36216,101.403671],[37.362228,101.403793],[37.362572,101.403816],[37.362751,101.403793],[37.36301,101.403664],[37.364571,101.40313],[37.364681,101.403091],[37.36499,101.403091],[37.365139,101.40345],[37.36483,101.403687],[37.364071,101.403687],[37.36314,101.404083],[37.362671,101.404282],[37.361889,101.404373],[37.361141,101.404373],[37.361,101.404381],[37.360821,101.404442],[37.360691,101.404716],[37.36097,101.405006],[37.362041,101.40477],[37.362999,101.404846],[37.363091,101.404861],[37.364029,101.404579],[37.364319,101.404488],[37.364849,101.404587],[37.36517,101.404739],[37.365719,101.40477],[37.366051,101.404442],[37.366531,101.404007],[37.366619,101.404022],[37.36742,101.404083],[37.367668,101.404312],[37.36755,101.404663],[37.36747,101.404694],[37.36647,101.404694],[37.366249,101.404793],[37.365921,101.405167],[37.365761,101.405357],[37.36499,101.405739],[37.363918,101.405998],[37.362591,101.406319],[37.36179,101.406464],[37.361012,101.406601],[37.360149,101.406754],[37.35891,101.406799],[37.358398,101.406807],[37.357201,101.407204],[37.356079,101.407928],[37.356022,101.407967],[37.35553,101.408157],[37.354881,101.407799],[37.353771,101.406982],[37.35355,101.40683],[37.337841,101.397949],[37.335972,101.398239],[37.33374,101.398643],[37.333111,101.398743],[37.33165,101.399529],[37.3283,101.401382],[37.327991,101.401611],[37.327702,101.402107],[37.327591,101.40287],[37.327621,101.403572],[37.32711,101.4048],[37.325871,101.406174],[37.32552,101.40638],[37.325272,101.406433],[37.324612,101.406219],[37.323872,101.405457],[37.32349,101.405167],[37.32299,101.405228],[37.321861,101.406189],[37.32111,101.407578],[37.32032,101.409317],[37.320179,101.40947],[37.319901,101.409416],[37.319881,101.408897],[37.319931,101.408813],[37.320728,101.407356],[37.321331,101.406303],[37.322369,101.404823],[37.322861,101.404213],[37.323071,101.403961],[37.323219,101.403831],[37.32349,101.40377],[37.324001,101.403893],[37.324501,101.403793],[37.3246,101.403587],[37.324551,101.402191],[37.324982,101.401337],[37.326141,101.400253],[37.326759,101.399658],[37.326931,101.399437],[37.326889,101.399101],[37.326778,101.398987],[37.326469,101.399132],[37.325409,101.400177],[37.32468,101.400787],[37.32391,101.401749],[37.323589,101.402153],[37.322632,101.40284],[37.32106,101.404533],[37.32021,101.405121],[37.31958,101.40609],[37.3195,101.406197],[37.31847,101.407379],[37.316929,101.409149],[37.31678,101.409607],[37.317039,101.412064],[37.317181,101.412399],[37.31757,101.412689],[37.318748,101.412956],[37.31889,101.412971],[37.319851,101.412727],[37.32058,101.412491],[37.32103,101.412643],[37.322189,101.413002],[37.32336,101.413361],[37.324661,101.413834],[37.324821,101.413918],[37.325069,101.414093],[37.325199,101.414383],[37.325119,101.414848],[37.324951,101.415009],[37.322498,101.415657],[37.322071,101.415771],[37.320229,101.415787],[37.31879,101.416527],[37.31702,101.417488],[37.314079,101.41925],[37.312801,101.420464],[37.31229,101.420959],[37.311039,101.421883],[37.308819,101.423248],[37.308151,101.423737],[37.307831,101.424103],[37.30756,101.424423],[37.307129,101.424561],[37.3064,101.424431],[37.306149,101.424408],[37.305901,101.424454],[37.305309,101.424759],[37.304619,101.42485],[37.303761,101.424797],[37.303371,101.424927],[37.302719,101.425468],[37.302361,101.425636],[37.302189,101.425346],[37.30238,101.425018],[37.303379,101.424522],[37.304871,101.424004],[37.306099,101.422768],[37.307281,101.422249],[37.307781,101.422028],[37.307709,101.421837],[37.306499,101.422058],[37.305401,101.42244],[37.30378,101.423218],[37.30299,101.423508],[37.30265,101.423378],[37.301788,101.422119],[37.299229,101.4188],[37.29887,101.418297],[37.297771,101.417084],[37.296501,101.415581],[37.295761,101.414757],[37.294979,101.414841],[37.29454,101.41497],[37.293732,101.414757],[37.292919,101.414383],[37.292629,101.414322],[37.290932,101.414398],[37.288929,101.414543],[37.287491,101.414978],[37.286819,101.415253],[37.285591,101.415314],[37.285339,101.415314],[37.284981,101.415489],[37.28487,101.416031],[37.284981,101.4161],[37.286949,101.415756],[37.287498,101.415688],[37.28775,101.415672],[37.28846,101.415657],[37.288528,101.415657],[37.288681,101.415703],[37.288731,101.415993],[37.288582,101.416199],[37.28772,101.416443],[37.28672,101.41655],[37.28492,101.416656],[37.282841,101.416847],[37.280769,101.416542],[37.277889,101.416054],[37.275749,101.415771],[37.273762,101.416153],[37.272942,101.416183],[37.272301,101.415916],[37.271969,101.415771],[37.270729,101.415771],[37.2687,101.416069],[37.26685,101.416168],[37.263821,101.41597],[37.2612,101.415314],[37.25959,101.41494],[37.25724,101.414398],[37.25568,101.41433],[37.253761,101.414413],[37.253609,101.414429],[37.251259,101.414558],[37.250561,101.415009],[37.24929,101.416481],[37.248531,101.417526],[37.244671,101.429771],[37.243301,101.435257],[37.242859,101.437271],[37.242939,101.438911],[37.24342,101.442207],[37.2449,101.44738],[37.245338,101.450417],[37.245529,101.452568],[37.245449,101.454262],[37.24464,101.464493],[37.24445,101.466148],[37.24437,101.466454],[37.244041,101.466988],[37.243401,101.467506],[37.243069,101.467857],[37.242939,101.468613],[37.243969,101.471687],[37.244919,101.472878],[37.245079,101.473251],[37.24514,101.475067],[37.243679,101.483513],[37.243172,101.48555],[37.242458,101.486748],[37.241989,101.487427],[37.24176,101.488922],[37.241661,101.490196],[37.24086,101.491463],[37.238831,101.495354],[37.238529,101.500031],[37.237782,101.50103],[37.236099,101.501312],[37.2356,101.501694],[37.2346,101.503036],[37.23447,101.503258],[37.234409,101.503517],[37.234539,101.504219],[37.235321,101.506203],[37.235191,101.507553],[37.235222,101.507881],[37.236031,101.509827],[37.235661,101.512444],[37.235168,101.516289],[37.23476,101.517311],[37.233669,101.518204],[37.233139,101.520264],[37.2327,101.520737],[37.23246,101.520737],[37.230881,101.520073],[37.230061,101.520126],[37.22958,101.520447],[37.229382,101.520668],[37.22855,101.521217],[37.228031,101.521927],[37.227242,101.522346],[37.226849,101.522469],[37.225948,101.523193],[37.224831,101.524261],[37.223831,101.526154],[37.222679,101.528816],[37.222561,101.528976],[37.22216,101.529846],[37.221958,101.530083],[37.221588,101.530113],[37.221241,101.529846],[37.22076,101.529358],[37.220341,101.529297],[37.219872,101.5298],[37.21909,101.531013],[37.218342,101.531342],[37.218159,101.531631],[37.218189,101.532112],[37.218819,101.534027],[37.219021,101.535423],[37.219009,101.535713],[37.21862,101.536133],[37.218182,101.53595],[37.216209,101.532883],[37.215919,101.532661],[37.215542,101.53273],[37.212608,101.537086],[37.21244,101.53727],[37.20805,101.53756],[37.207062,101.537064],[37.206692,101.537086],[37.206261,101.537643],[37.206009,101.537888],[37.20583,101.537933],[37.205631,101.537872],[37.20414,101.536377],[37.20364,101.536217],[37.203091,101.537331],[37.202221,101.538544],[37.20163,101.539177],[37.199741,101.539398],[37.199051,101.539177],[37.199131,101.539062],[37.200741,101.539124],[37.201439,101.538971],[37.20163,101.538849],[37.201561,101.538239],[37.200771,101.538116],[37.19978,101.538231],[37.19849,101.538254],[37.197311,101.538109],[37.19585,101.537376],[37.19503,101.537163],[37.19453,101.537262],[37.192909,101.538673],[37.18969,101.541893],[37.1894,101.542267],[37.18771,101.543747],[37.187351,101.544594],[37.18652,101.54702],[37.185921,101.547348],[37.18494,101.54747],[37.184078,101.547211],[37.182579,101.546593],[37.179371,101.547737],[37.177158,101.54882],[37.175419,101.549004],[37.174992,101.54911],[37.173851,101.550056],[37.171951,101.551811],[37.16856,101.555199],[37.16573,101.557533],[37.165051,101.558037],[37.1646,101.558212],[37.16185,101.558594],[37.150612,101.56044],[37.149799,101.560539],[37.148972,101.561523],[37.14526,101.565498],[37.145012,101.565239],[37.144112,101.564613],[37.142639,101.563789],[37.141941,101.563713],[37.141781,101.563766],[37.141171,101.564651],[37.140381,101.568283],[37.140129,101.569633],[37.139511,101.570518],[37.139111,101.570717],[37.13829,101.570168],[37.136162,101.569733],[37.127941,101.568977],[37.120708,101.566162],[37.115791,101.566833],[37.11084,101.566566],[37.11071,101.566589],[37.110439,101.566727],[37.110569,101.566597],[37.110451,101.56649],[37.10928,101.566307],[37.106831,101.565643],[37.10585,101.565697],[37.102749,101.566742],[37.100529,101.56694],[37.10001,101.56694],[37.09763,101.566391],[37.08778,101.565727],[37.084541,101.565201],[37.081539,101.566353],[37.078499,101.568489],[37.076111,101.570312],[37.07375,101.571854],[37.068119,101.575279],[37.06662,101.573463],[37.057621,101.568863],[37.054428,101.567383],[37.04855,101.566383],[37.045929,101.566063],[37.039959,101.569397],[37.038471,101.569267],[37.036831,101.568779],[37.031479,101.56675],[37.030899,101.566673],[37.0303,101.566719],[37.025002,101.56855],[37.023991,101.569206],[37.023399,101.569893],[37.021519,101.573753],[37.020229,101.57666],[37.01791,101.581337],[37.009121,101.59391],[37.005348,101.598343],[37.004761,101.600288],[37.00333,101.606148],[37.001411,101.615402],[37.001499,101.617416],[37.001041,101.619637],[36.99847,101.625504],[36.998131,101.625938],[36.996529,101.62748],[36.988991,101.633797],[36.98806,101.634453],[36.974491,101.64325],[36.96608,101.653717],[36.96159,101.659042],[36.96096,101.659973],[36.950859,101.667549],[36.948372,101.669502],[36.946701,101.670937],[36.943699,101.673103],[36.940811,101.675346],[36.938049,101.677582],[36.934719,101.680923],[36.927681,101.686798],[36.92522,101.689323],[36.92408,101.691132],[36.922691,101.694366],[36.921761,101.6968],[36.919979,101.702789],[36.919071,101.704964],[36.918449,101.706131],[36.916691,101.708611],[36.916679,101.708733],[36.91671,101.708809],[36.916759,101.70887],[36.917049,101.709122],[36.917431,101.709488],[36.91782,101.71003],[36.918171,101.710632],[36.918308,101.711243],[36.918079,101.711983],[36.91766,101.712891],[36.917179,101.713943],[36.916649,101.714989],[36.91605,101.716057],[36.915352,101.717194],[36.914558,101.718353],[36.9137,101.719528],[36.912769,101.720703],[36.911789,101.72187],[36.910728,101.723038],[36.909641,101.724213],[36.908501,101.725403],[36.907349,101.726593],[36.9062,101.727783],[36.905048,101.728996],[36.903889,101.730202],[36.902481,101.731659],[36.901321,101.732872],[36.900169,101.734077],[36.89901,101.735283],[36.89492,101.739517],[36.893959,101.740387],[36.892769,101.741287],[36.89156,101.742027],[36.89032,101.74263],[36.889,101.743149],[36.88768,101.743683],[36.886391,101.744308],[36.885139,101.745033],[36.88385,101.745789],[36.88253,101.746559],[36.88118,101.74736],[36.879841,101.748154],[36.87849,101.748947],[36.87714,101.749786],[36.87339,101.75248],[36.868092,101.756477],[36.866772,101.757263],[36.86541,101.758003],[36.864021,101.758713],[36.85524,101.761681],[36.85376,101.762123],[36.85231,101.762558],[36.850849,101.762993],[36.849369,101.763443],[36.832531,101.766273],[36.821499,101.769531],[36.812901,101.772072],[36.81139,101.772331],[36.758228,101.771317],[36.756771,101.770851],[36.755322,101.770401],[36.753849,101.769951],[36.75116,101.769203],[36.74971,101.768867],[36.748341,101.7686],[36.746971,101.768387],[36.745579,101.768204],[36.744171,101.768021],[36.742722,101.767822],[36.684299,101.766548],[36.68285,101.766586],[36.6814,101.766693],[36.67997,101.7668],[36.6786,101.76696],[36.67728,101.767159],[36.676041,101.767357],[36.6749,101.767563],[36.67384,101.767769],[36.672791,101.767982],[36.671791,101.768181],[36.670921,101.768356],[36.670441,101.768448],[36.670219,101.768509],[36.669899,101.76857],[36.66946,101.768646],[36.6689,101.768784],[36.668201,101.768944],[36.667488,101.769127],[36.66687,101.769287],[36.66642,101.769417],[36.666119,101.769524],[36.665741,101.769691],[36.66518,101.769867],[36.66449,101.770111],[36.663719,101.770401],[36.662949,101.770714],[36.662121,101.771027],[36.661228,101.771378],[36.66024,101.771767],[36.659199,101.772171],[36.658131,101.772583],[36.657089,101.772987],[36.656109,101.773369],[36.655209,101.773781],[36.654449,101.774147],[36.653919,101.774353],[36.653351,101.774567],[36.653011,101.774696],[36.652409,101.774918],[36.651878,101.775124],[36.65136,101.775291],[36.65062,101.775543],[36.6497,101.775574],[36.648708,101.775352],[36.648239,101.774963],[36.648102,101.774643],[36.647961,101.774147],[36.647781,101.773842],[36.647572,101.773697],[36.647209,101.773727],[36.646111,101.774017],[36.644958,101.774422],[36.64172,101.776169],[36.64053,101.776848],[36.640259,101.777359],[36.64035,101.777939],[36.640629,101.778648],[36.640591,101.779846],[36.640331,101.78064],[36.63974,101.782043],[36.639099,101.783524],[36.63863,101.784576],[36.638149,101.785751],[36.637661,101.787308],[36.636921,101.790131],[36.636768,101.790733],[36.636501,101.791649],[36.63623,101.792412],[36.63588,101.793198],[36.635471,101.793922],[36.634838,101.794792],[36.634369,101.795288],[36.63266,101.796669],[36.631969,101.797287],[36.63147,101.797859],[36.630901,101.798683],[36.630348,101.799767],[36.63007,101.800583],[36.629768,101.801903],[36.629539,101.80378],[36.62936,101.804733],[36.629009,101.805862],[36.628529,101.806923],[36.62804,101.807693],[36.627628,101.808243],[36.623409,101.813072],[36.622681,101.814003],[36.622162,101.814781],[36.621712,101.815613],[36.62014,101.818932],[36.619671,101.819687],[36.61898,101.820557],[36.618038,101.82151],[36.616959,101.822289],[36.612671,101.824448],[36.611801,101.824959],[36.610989,101.825569],[36.61042,101.826103],[36.609501,101.82708],[36.605671,101.831581],[36.60498,101.832253],[36.604431,101.832687],[36.603031,101.833603],[36.596249,101.837624],[36.595249,101.838371],[36.594379,101.839287],[36.5938,101.840103],[36.59309,101.841537],[36.592079,101.844223],[36.591572,101.845154],[36.590981,101.845978],[36.58989,101.846977],[36.588341,101.847977],[36.58757,101.848618],[36.58704,101.849213],[36.586411,101.850014],[36.58567,101.851311],[36.583961,101.855827],[36.58371,101.856491],[36.583389,101.857323],[36.582649,101.85907],[36.582081,101.860291],[36.581921,101.860588],[36.581089,101.862213],[36.580181,101.863838],[36.57859,101.866623],[36.578281,101.867188],[36.576771,101.869682],[36.575649,101.871872],[36.57513,101.873138],[36.57481,101.874153],[36.573139,101.879433],[36.572811,101.880302],[36.572319,101.881653],[36.572071,101.882149],[36.571621,101.882858],[36.571098,101.883499],[36.569538,101.885063],[36.568748,101.886147],[36.56823,101.887062],[36.568001,101.887573],[36.56741,101.889587],[36.567242,101.893753],[36.56715,101.89492],[36.566921,101.896339],[36.56657,101.897942],[36.565361,101.90155],[36.565159,101.90213],[36.56501,101.902573],[36.5648,101.903381],[36.564171,101.906937],[36.563869,101.909027],[36.563831,101.90934],[36.563728,101.910263],[36.563499,101.91169],[36.562759,101.915443],[36.562241,101.917618],[36.56118,101.921127],[36.560188,101.923721],[36.559429,101.925407],[36.55801,101.928009],[36.55735,101.929329],[36.556789,101.930763],[36.556438,101.932068],[36.55624,101.933167],[36.556141,101.934288],[36.55595,101.940407],[36.555901,101.941208],[36.555679,101.942772],[36.555401,101.944077],[36.5532,101.952919],[36.552898,101.954018],[36.552471,101.955353],[36.552071,101.956352],[36.551609,101.957291],[36.550812,101.958611],[36.548988,101.960968],[36.5485,101.961594],[36.54364,101.967583],[36.542759,101.968826],[36.54158,101.970863],[36.540878,101.972298],[36.539371,101.975861],[36.538769,101.977127],[36.53796,101.9786],[36.536041,101.981743],[36.535351,101.982986],[36.53484,101.984047],[36.533951,101.986221],[36.532661,101.989998],[36.531658,101.992554],[36.529919,101.9963],[36.527691,102.000778],[36.525009,102.006371],[36.524189,102.008232],[36.52359,102.009804],[36.523079,102.011726],[36.522671,102.013718],[36.522041,102.01722],[36.521339,102.021637],[36.520679,102.025291],[36.520351,102.026657],[36.520031,102.027733],[36.5186,102.031937],[36.51833,102.033043],[36.518169,102.033867],[36.518051,102.034721],[36.517971,102.035873],[36.517879,102.039383],[36.51767,102.041382],[36.51725,102.04335],[36.51638,102.04631],[36.5159,102.048157],[36.515629,102.049507],[36.51543,102.050903],[36.515289,102.052628],[36.51524,102.054077],[36.5154,102.058456],[36.51535,102.060219],[36.515121,102.062248],[36.5144,102.066704],[36.51424,102.067497],[36.514011,102.068283],[36.51366,102.069122],[36.51329,102.069763],[36.512821,102.070381],[36.51405,102.069],[36.514992,102.067719],[36.51535,102.066994],[36.515541,102.066483],[36.515732,102.065666],[36.51582,102.064537],[36.515701,102.062073],[36.51564,102.061752],[36.515499,102.059753],[36.515388,102.061218],[36.515121,102.062866],[36.514889,102.064522],[36.51487,102.066162],[36.515049,102.06778],[36.515442,102.06929],[36.51601,102.070717],[36.51664,102.072037],[36.5172,102.073357],[36.517639,102.074722],[36.517929,102.076103],[36.518059,102.07756],[36.518009,102.079102],[36.517689,102.080673],[36.517288,102.082336],[36.517052,102.084053],[36.51693,102.085716],[36.516819,102.087341],[36.516708,102.088913],[36.516579,102.090446],[36.51646,102.091858],[36.51635,102.093132],[36.516201,102.094276],[36.515961,102.095322],[36.515678,102.096283],[36.515369,102.097137],[36.515072,102.097809],[36.514832,102.098297],[36.514339,102.099182],[36.513672,102.100212],[36.51292,102.10144],[36.5121,102.102783],[36.51125,102.104141],[36.51041,102.105492],[36.50956,102.106888],[36.508709,102.108208],[36.50795,102.109558],[36.507332,102.110977],[36.506771,102.112473],[36.506302,102.113983],[36.505932,102.115494],[36.50565,102.116966],[36.505459,102.118408],[36.505341,102.119873],[36.505291,102.121384],[36.505291,102.122963],[36.505291,102.124634],[36.505291,102.12635],[36.50528,102.128067],[36.505291,102.129753],[36.505291,102.131401],[36.50531,102.133011],[36.505291,102.134583],[36.505219,102.136162],[36.5051,102.137733],[36.504951,102.139252],[36.504768,102.140717],[36.504539,102.142174],[36.504269,102.143677],[36.503948,102.145271],[36.503571,102.146896],[36.503159,102.148529],[36.502682,102.150146],[36.502178,102.151779],[36.50169,102.153442],[36.50119,102.155128],[36.500721,102.156883],[36.50029,102.158699],[36.499939,102.160583],[36.499569,102.162857],[36.499088,102.165863],[36.49881,102.167648],[36.498482,102.16935],[36.498081,102.171013],[36.497581,102.172569],[36.49699,102.174057],[36.4963,102.175423],[36.495522,102.17672],[36.494671,102.178017],[36.493801,102.179337],[36.492939,102.180656],[36.492069,102.181938],[36.491199,102.183212],[36.490349,102.184479],[36.48954,102.185707],[36.488831,102.186958],[36.48822,102.188217],[36.48764,102.189484],[36.487148,102.190773],[36.486759,102.192101],[36.48645,102.193459],[36.486191,102.194839],[36.486019,102.196243],[36.485859,102.197617],[36.485649,102.199074],[36.485439,102.200699],[36.48521,102.202408],[36.485001,102.204178],[36.484791,102.20594],[36.484558,102.207703],[36.484329,102.209351],[36.48407,102.210953],[36.483749,102.212486],[36.483391,102.214043],[36.483021,102.215584],[36.482571,102.21711],[36.482151,102.21859],[36.481731,102.220016],[36.481258,102.221397],[36.480751,102.222717],[36.48024,102.224037],[36.47971,102.225327],[36.47921,102.226562],[36.47876,102.22773],[36.478329,102.228928],[36.478088,102.230209],[36.477921,102.231552],[36.477879,102.232903],[36.477989,102.234261],[36.478088,102.235641],[36.478168,102.237137],[36.47826,102.23877],[36.47839,102.240379],[36.478519,102.241943],[36.47868,102.243439],[36.478882,102.244881],[36.47913,102.246277],[36.479408,102.247627],[36.479759,102.248993],[36.480141,102.25042],[36.480499,102.251892],[36.480862,102.253357],[36.48122,102.254807],[36.481579,102.256302],[36.481979,102.25782],[36.482441,102.259323],[36.48296,102.260757],[36.483471,102.262192],[36.48407,102.263641],[36.484718,102.265106],[36.48539,102.266541],[36.486012,102.267982],[36.48658,102.269432],[36.487011,102.270943],[36.48732,102.272476],[36.48745,102.274063],[36.487461,102.275627],[36.487289,102.277168],[36.486992,102.278641],[36.486599,102.28009],[36.486149,102.281517],[36.48563,102.282944],[36.485119,102.284378],[36.484581,102.285851],[36.4841,102.287376],[36.483749,102.28891],[36.48354,102.290466],[36.483398,102.292061],[36.483471,102.293587],[36.48362,102.29512],[36.48381,102.296677],[36.483978,102.298286],[36.484161,102.299919],[36.484341,102.301567],[36.48452,102.303177],[36.48465,102.304802],[36.484718,102.306412],[36.484749,102.307991],[36.484741,102.309563],[36.484699,102.311142],[36.484612,102.312683],[36.484482,102.314201],[36.484291,102.315689],[36.484081,102.317146],[36.483829,102.31855],[36.483559,102.319923],[36.483261,102.321312],[36.48291,102.322769],[36.482632,102.324226],[36.482399,102.325684],[36.482201,102.327171],[36.482059,102.328697],[36.48196,102.330231],[36.48185,102.331787],[36.48175,102.333397],[36.481651,102.33503],[36.481541,102.336693],[36.481441,102.338341],[36.4813,102.339897],[36.481152,102.341423],[36.48093,102.342857],[36.480652,102.344177],[36.480251,102.345413],[36.47982,102.346573],[36.479279,102.347778],[36.478661,102.348984],[36.477901,102.350281],[36.477112,102.351631],[36.476299,102.352989],[36.475491,102.354332],[36.47472,102.355698],[36.474079,102.357162],[36.473549,102.358688],[36.473122,102.360329],[36.472778,102.361992],[36.472519,102.363678],[36.47226,102.365356],[36.472,102.367058],[36.471741,102.368736],[36.471489,102.370407],[36.471241,102.372093],[36.471001,102.373756],[36.470749,102.375412],[36.47049,102.377068],[36.47023,102.378731],[36.46999,102.380379],[36.46973,102.382027],[36.469398,102.383659],[36.469101,102.385353],[36.468819,102.387062],[36.468571,102.388809],[36.468391,102.390533],[36.468281,102.392227],[36.468201,102.393929],[36.46817,102.395607],[36.46822,102.397293],[36.468311,102.398956],[36.468418,102.400627],[36.46854,102.402298],[36.46867,102.403969],[36.4688,102.405609],[36.468929,102.40728],[36.469059,102.409012],[36.46917,102.410759],[36.46925,102.412483],[36.469299,102.414177],[36.46928,102.415909],[36.469231,102.417641],[36.46909,102.419342],[36.468929,102.421013],[36.468739,102.422737],[36.468529,102.424477],[36.468342,102.426208],[36.468151,102.427872],[36.46796,102.429443],[36.467758,102.430946],[36.467579,102.432426],[36.467388,102.433937],[36.467171,102.435501],[36.466999,102.43705],[36.466881,102.438629],[36.466801,102.440239],[36.466751,102.441872],[36.46674,102.443466],[36.46677,102.445053],[36.466801,102.446579],[36.466801,102.448067],[36.46674,102.449516],[36.466549,102.450996],[36.466309,102.452454],[36.4659,102.453903],[36.465401,102.455292],[36.464828,102.456596],[36.464211,102.457817],[36.463581,102.459007],[36.46294,102.460167],[36.462299,102.461288],[36.461739,102.462334],[36.461151,102.463387],[36.460579,102.464439],[36.45993,102.465591],[36.45916,102.467003],[36.458431,102.468513],[36.457821,102.470093],[36.457352,102.471764],[36.457008,102.473488],[36.456791,102.475258],[36.4566,102.477028],[36.45644,102.47876],[36.456329,102.480461],[36.456181,102.482147],[36.456032,102.483803],[36.455952,102.485474],[36.455891,102.48716],[36.45591,102.488869],[36.455978,102.490601],[36.4561,102.492317],[36.45628,102.494019],[36.456459,102.495728],[36.456589,102.497452],[36.45657,102.499168],[36.456371,102.500893],[36.45607,102.502541],[36.455582,102.504173],[36.45496,102.50576],[36.45438,102.507317],[36.453819,102.508827],[36.453251,102.510307],[36.45274,102.511742],[36.452179,102.513206],[36.451561,102.514618],[36.45089,102.516006],[36.45015,102.517303],[36.44923,102.51857],[36.448299,102.519783],[36.447399,102.520927],[36.446529,102.522049],[36.445629,102.523178],[36.444729,102.524338],[36.443859,102.525436],[36.443008,102.526543],[36.442249,102.52755],[36.44162,102.528481],[36.441051,102.529404],[36.440578,102.530243],[36.440128,102.531029],[36.43969,102.532089],[36.439209,102.533524],[36.438808,102.53508],[36.43853,102.536713],[36.4384,102.53833],[36.438389,102.539978],[36.438499,102.541557],[36.438751,102.543022],[36.439079,102.544373],[36.439468,102.545677],[36.439899,102.546959],[36.44035,102.548233],[36.440811,102.549522],[36.441269,102.550812],[36.441669,102.552162],[36.442009,102.553596],[36.442211,102.555061],[36.442242,102.55658],[36.442051,102.558067],[36.44173,102.559517],[36.441269,102.56089],[36.440651,102.562233],[36.43996,102.563477],[36.439201,102.564728],[36.438412,102.565933],[36.43763,102.567123],[36.43684,102.568329],[36.43605,102.569527],[36.43528,102.570717],[36.43449,102.57193],[36.433681,102.573174],[36.43288,102.574402],[36.432121,102.575684],[36.431419,102.576973],[36.430759,102.578323],[36.430141,102.579697],[36.429531,102.5811],[36.42897,102.582497],[36.428459,102.583946],[36.427971,102.585457],[36.42757,102.587013],[36.4272,102.588516],[36.42683,102.590019],[36.426521,102.591553],[36.426239,102.593063],[36.4259,102.594582],[36.42551,102.596077],[36.425091,102.597572],[36.424599,102.599121],[36.424049,102.60067],[36.423489,102.602203],[36.422932,102.603737],[36.422352,102.605301],[36.42178,102.606827],[36.42123,102.60833],[36.420719,102.609802],[36.420238,102.611267],[36.419849,102.612663],[36.419529,102.614037],[36.419258,102.615433],[36.41898,102.616821],[36.41869,102.618233],[36.418468,102.619659],[36.418301,102.621063],[36.41819,102.622437],[36.41806,102.623863],[36.417931,102.625282],[36.417809,102.626678],[36.41769,102.628036],[36.417568,102.629356],[36.41745,102.630707],[36.417339,102.632027],[36.417221,102.633324],[36.41711,102.63459],[36.417,102.635918],[36.416828,102.637367],[36.416611,102.638893],[36.416279,102.640312],[36.415859,102.641762],[36.415352,102.643158],[36.414768,102.644478],[36.414131,102.645714],[36.413441,102.646812],[36.412739,102.64785],[36.411991,102.648811],[36.411201,102.649727],[36.410412,102.650673],[36.40955,102.651558],[36.40871,102.652481],[36.407871,102.653397],[36.407082,102.65432],[36.406368,102.655373],[36.405788,102.656548],[36.405411,102.657738],[36.405239,102.658928],[36.40517,102.660103],[36.405258,102.661217],[36.405491,102.662277],[36.4058,102.663422],[36.406132,102.664673],[36.406269,102.666008],[36.40617,102.667488],[36.405979,102.668938],[36.405548,102.670311],[36.40501,102.6716],[36.404251,102.672897],[36.4034,102.674133],[36.402451,102.675148],[36.401409,102.675972],[36.400311,102.676628],[36.399181,102.677101],[36.398029,102.677467],[36.396889,102.677834],[36.395802,102.678284],[36.364868,102.688026],[36.36396,102.688309],[36.362999,102.688637],[36.362,102.68911],[36.361,102.689774],[36.3601,102.690628],[36.35936,102.691597],[36.358742,102.692703],[36.358269,102.693863],[36.357868,102.695084],[36.357529,102.696289],[36.357231,102.69751],[36.356941,102.698799],[36.35667,102.700218],[36.356491,102.701668],[36.356461,102.703102],[36.35659,102.704483],[36.356838,102.70578],[36.357239,102.707047],[36.357792,102.708229],[36.358471,102.709267],[36.35918,102.710274],[36.35981,102.711349],[36.360279,102.71257],[36.360569,102.713837],[36.36071,102.715134],[36.360661,102.716423],[36.360439,102.717644],[36.360062,102.718781],[36.35965,102.720009],[36.3591,102.721207],[36.35844,102.722366],[36.357651,102.723473],[36.356758,102.724503],[36.355801,102.725403],[36.354801,102.726173],[36.35376,102.726898],[36.35268,102.727661],[36.351768,102.728653],[36.351051,102.729797],[36.350521,102.731071],[36.350109,102.732437],[36.349739,102.73391],[36.349369,102.735382],[36.348991,102.736839],[36.348671,102.738258],[36.348381,102.739609],[36.347988,102.741013],[36.34753,102.742332],[36.34005,102.754784],[36.339161,102.755432],[36.338169,102.756142],[36.33712,102.75695],[36.33596,102.757759],[36.334949,102.758667],[36.334141,102.75975],[36.33358,102.760887],[36.33321,102.76194],[36.332981,102.762993],[36.332859,102.764],[36.332878,102.765083],[36.333118,102.766228],[36.333401,102.767479],[36.333641,102.76873],[36.333832,102.77002],[36.33387,102.771461],[36.333691,102.773102],[36.333351,102.774803],[36.333031,102.776466],[36.33279,102.778137],[36.332611,102.779831],[36.33255,102.781532],[36.332619,102.783272],[36.332779,102.784943],[36.333,102.786591],[36.333241,102.788223],[36.333469,102.789871],[36.33371,102.791519],[36.333961,102.793167],[36.334221,102.794807],[36.334469,102.796463],[36.334751,102.798119],[36.335018,102.799782],[36.33527,102.80146],[36.335522,102.803047],[36.335701,102.804604],[36.335709,102.806122],[36.335571,102.80764],[36.33527,102.809128],[36.334789,102.810516],[36.33424,102.811836],[36.333691,102.813164],[36.333199,102.814468],[36.332821,102.815819],[36.33255,102.817177],[36.332378,102.818512],[36.332352,102.819801],[36.332409,102.821037],[36.332481,102.82225],[36.332569,102.823647],[36.33268,102.825363],[36.332802,102.827103],[36.33292,102.828842],[36.333038,102.830582],[36.33316,102.832314],[36.333271,102.834053],[36.333302,102.83577],[36.333069,102.837486],[36.332649,102.839211],[36.332062,102.840851],[36.331589,102.842529],[36.331371,102.844269],[36.33147,102.846001],[36.331718,102.847679],[36.332001,102.849373],[36.33226,102.851051],[36.332458,102.852707],[36.332451,102.854446],[36.33223,102.856232],[36.331841,102.85791],[36.331322,102.859482],[36.330509,102.860924],[36.32962,102.862282],[36.328651,102.863586],[36.327679,102.864929],[36.326698,102.866257],[36.325729,102.867592],[36.32476,102.868896],[36.323879,102.87027],[36.323071,102.871727],[36.322418,102.873322],[36.321899,102.874947],[36.321522,102.87661],[36.32122,102.878304],[36.32093,102.879982],[36.32061,102.881683],[36.32021,102.883362],[36.319729,102.885094],[36.31918,102.886726],[36.318581,102.888237],[36.31789,102.889702],[36.31715,102.891113],[36.31636,102.892509],[36.31546,102.893852],[36.31448,102.895157],[36.313461,102.896408],[36.312439,102.897636],[36.311409,102.898888],[36.310379,102.900078],[36.309341,102.901283],[36.308311,102.902496],[36.30732,102.903763],[36.3064,102.905037],[36.305618,102.906418],[36.304939,102.907898],[36.304379,102.90947],[36.30394,102.91111],[36.303631,102.912811],[36.303459,102.914543],[36.303349,102.916283],[36.303249,102.918022],[36.303169,102.919777],[36.303082,102.921577],[36.30299,102.923393],[36.302891,102.925148],[36.302811,102.926842],[36.302719,102.928467],[36.30275,102.930069],[36.302879,102.931648],[36.30307,102.933121],[36.303219,102.934509],[36.303249,102.935883],[36.303261,102.937149],[36.303242,102.938301],[36.303188,102.939346],[36.30312,102.940231],[36.302509,102.94854],[36.302429,102.949707],[36.302299,102.951012],[36.302052,102.952461],[36.30167,102.954018],[36.301109,102.95565],[36.300381,102.957191],[36.29958,102.958641],[36.298752,102.96006],[36.297901,102.961487],[36.297039,102.962936],[36.296181,102.964371],[36.29533,102.96582],[36.29446,102.967308],[36.293629,102.968842],[36.292938,102.970451],[36.292339,102.972061],[36.291771,102.973679],[36.291199,102.975304],[36.290668,102.976952],[36.290089,102.978577],[36.289429,102.980171],[36.288651,102.981689],[36.287769,102.983124],[36.286812,102.984482],[36.285789,102.985733],[36.284691,102.986877],[36.283539,102.987923],[36.282318,102.988853],[36.281071,102.989723],[36.279819,102.990578],[36.278629,102.991524],[36.2775,102.992592],[36.276402,102.993752],[36.275372,102.994957],[36.274429,102.99633],[36.273571,102.99781],[36.272812,102.999336],[36.27206,103.000877],[36.271278,103.002441],[36.2705,103.004028],[36.26984,103.0056],[36.269218,103.007156],[36.268581,103.008713],[36.267792,103.010246],[36.267071,103.011818],[36.266232,103.013313],[36.265228,103.014641],[36.264111,103.015762],[36.262798,103.016663],[36.26141,103.017357],[36.26004,103.017838],[36.258659,103.018257],[36.257309,103.018677],[36.255932,103.019127],[36.25457,103.019524],[36.25322,103.019897],[36.251839,103.020363],[36.250542,103.02108],[36.249359,103.022057],[36.248291,103.023262],[36.247379,103.024658],[36.24667,103.026222],[36.245949,103.027779],[36.245079,103.029182],[36.24408,103.030457],[36.243038,103.031708],[36.241989,103.032951],[36.240891,103.034233],[36.23983,103.035477],[36.23877,103.03672],[36.237789,103.037971],[36.236752,103.039223],[36.23576,103.040527],[36.234989,103.04203],[36.234489,103.043694],[36.234299,103.045448],[36.23436,103.047256],[36.234612,103.049057],[36.234859,103.050789],[36.234909,103.052551],[36.234669,103.054314],[36.23418,103.055977],[36.233521,103.057579],[36.232681,103.059013],[36.2318,103.060432],[36.230919,103.061852],[36.230049,103.063278],[36.229179,103.064713],[36.228291,103.066116],[36.227409,103.067543],[36.226589,103.068893],[36.225819,103.070343],[36.225121,103.071907],[36.224529,103.073502],[36.223999,103.075157],[36.22348,103.076859],[36.223,103.07856],[36.222569,103.080292],[36.22208,103.081963],[36.2215,103.083603],[36.22084,103.085167],[36.220119,103.08667],[36.219379,103.088173],[36.218639,103.089668],[36.217918,103.091179],[36.21722,103.092697],[36.21656,103.094208],[36.215981,103.095863],[36.2155,103.09758],[36.215191,103.099319],[36.214958,103.101059],[36.21476,103.102783],[36.214439,103.104477],[36.213909,103.106148],[36.21312,103.107712],[36.21209,103.1091],[36.211048,103.11039],[36.210018,103.111679],[36.20903,103.112991],[36.208172,103.114464],[36.207531,103.116043],[36.207211,103.117798],[36.207008,103.119583],[36.206829,103.121361],[36.206631,103.123161],[36.206459,103.124924],[36.20628,103.126694],[36.2061,103.128464],[36.205921,103.130234],[36.205811,103.132004],[36.20578,103.133774],[36.205841,103.135551],[36.205971,103.137329],[36.20612,103.139122],[36.206249,103.140907],[36.206322,103.142693],[36.206268,103.144447],[36.206039,103.146172],[36.205601,103.147781],[36.205009,103.1493],[36.204239,103.150772],[36.20332,103.152107],[36.202358,103.153252],[36.201359,103.154373],[36.200371,103.155518],[36.199459,103.156754],[36.198689,103.158157],[36.198021,103.159721],[36.19754,103.161339],[36.197262,103.163033],[36.197151,103.164787],[36.19722,103.166573],[36.197369,103.168312],[36.19754,103.170013],[36.197659,103.171692],[36.197681,103.173317],[36.19746,103.174927],[36.197029,103.176422],[36.196381,103.177856],[36.19553,103.179077],[36.194611,103.180206],[36.193699,103.18132],[36.192829,103.182426],[36.191952,103.183563],[36.191071,103.184753],[36.190231,103.185966],[36.189449,103.187233],[36.188648,103.188507],[36.187698,103.189781],[36.186691,103.190971],[36.18565,103.192047],[36.184521,103.193123],[36.18338,103.194138],[36.18224,103.195129],[36.18108,103.196098],[36.180031,103.197189],[36.17907,103.198433],[36.17823,103.199791],[36.177589,103.201393],[36.17709,103.203041],[36.176739,103.204681],[36.176399,103.206306],[36.17598,103.207893],[36.17548,103.209412],[36.174858,103.210854],[36.174191,103.212288],[36.173538,103.213852],[36.172989,103.2155],[36.172649,103.217247],[36.172531,103.219101],[36.172668,103.221329],[36.172939,103.22316],[36.173222,103.224876],[36.1735,103.226547],[36.173752,103.228127],[36.173939,103.229721],[36.174179,103.231247],[36.174438,103.232758],[36.174648,103.234306],[36.174759,103.235893],[36.17474,103.237457],[36.17469,103.239113],[36.174622,103.240784],[36.1745,103.242447],[36.174511,103.244179],[36.174648,103.245949],[36.17495,103.247719],[36.175381,103.249428],[36.175941,103.251106],[36.176579,103.252762],[36.177219,103.254372],[36.177799,103.255951],[36.178169,103.257561],[36.178371,103.259117],[36.178391,103.260643],[36.178268,103.262154],[36.178009,103.263657],[36.177662,103.26506],[36.177181,103.266342],[36.176559,103.267609],[36.175961,103.268806],[36.175381,103.269981],[36.17482,103.271133],[36.174301,103.27227],[36.17384,103.273376],[36.17345,103.274384],[36.173161,103.275284],[36.172939,103.27607],[36.172798,103.276749],[36.17268,103.277298],[36.172619,103.277718],[36.172619,103.278023],[36.17255,103.278267],[36.172482,103.278526],[36.172138,103.279694],[36.172081,103.279877],[36.171959,103.280159],[36.171791,103.280441],[36.17173,103.280579],[36.171711,103.280663],[36.171661,103.280769],[36.171638,103.280807],[36.1716,103.280853],[36.171551,103.280937],[36.171391,103.281303],[36.17112,103.282066],[36.170689,103.283333],[36.170292,103.284767],[36.170071,103.286293],[36.169991,103.287849],[36.170078,103.289436],[36.1702,103.291023],[36.170231,103.29258],[36.170151,103.293983],[36.169941,103.295372],[36.169571,103.296951],[36.16851,103.305054],[36.168419,103.306953],[36.16827,103.308723],[36.16785,103.310417],[36.167179,103.311996],[36.166271,103.313431],[36.16523,103.314774],[36.1642,103.316132],[36.163361,103.317711],[36.163029,103.31881],[36.162781,103.320084],[36.162498,103.325623],[36.162251,103.328667],[36.161888,103.330269],[36.161179,103.332024],[36.16016,103.333656],[36.157082,103.338173],[36.155689,103.340042],[36.154961,103.340767],[36.153721,103.341583],[36.148899,103.343163],[36.148109,103.343552],[36.1474,103.344063],[36.14653,103.344963],[36.142269,103.350891],[36.141861,103.351784],[36.141548,103.352837],[36.141392,103.353622],[36.141312,103.354942],[36.141312,103.356323],[36.141521,103.3582],[36.142639,103.366814],[36.14333,103.372566],[36.14349,103.37439],[36.143551,103.378151],[36.14362,103.380043],[36.143951,103.382278],[36.144451,103.38401],[36.145111,103.385612],[36.15411,103.398842],[36.155128,103.400093],[36.15612,103.401283],[36.157051,103.402473],[36.15781,103.403847],[36.158379,103.405357],[36.158821,103.406967],[36.159088,103.408684],[36.159321,103.410454],[36.159531,103.412643],[36.159882,103.414429],[36.16058,103.416023],[36.161499,103.417427],[36.16264,103.418617],[36.163952,103.419487],[36.165371,103.420067],[36.166809,103.420593],[36.168251,103.421089],[36.169708,103.421608],[36.17115,103.422272],[36.172501,103.423119],[36.173721,103.424263],[36.174858,103.425537],[36.175659,103.427223],[36.176361,103.429291],[36.176991,103.431534],[36.177189,103.432838],[36.177212,103.434021],[36.17717,103.434967],[36.17688,103.436829],[36.17598,103.441719],[36.175621,103.44455],[36.175591,103.446701],[36.176281,103.450691],[36.176701,103.452438],[36.177071,103.454086],[36.177361,103.455711],[36.17746,103.457237],[36.177158,103.456787],[36.176998,103.456589],[36.1768,103.456467],[36.176449,103.456459],[36.176331,103.456612],[36.17625,103.456818],[36.176201,103.457039],[36.176231,103.457268],[36.176331,103.457474],[36.176491,103.457603],[36.176689,103.457733],[36.17691,103.457787],[36.177349,103.458008],[36.177731,103.458298],[36.17804,103.458687],[36.178211,103.459213],[36.178299,103.459747],[36.178322,103.460243],[36.17831,103.460457],[36.178242,103.460709],[36.178249,103.46109],[36.177689,103.462067],[36.177311,103.462547],[36.1772,103.462738],[36.177109,103.462982],[36.17701,103.463928],[36.176899,103.464378],[36.1768,103.4645],[36.175251,103.465729],[36.174911,103.467194],[36.17487,103.467773],[36.174591,103.469757],[36.174309,103.470833],[36.174229,103.471077],[36.173988,103.471497],[36.173538,103.471733],[36.174229,103.471489],[36.17416,103.471832],[36.173969,103.472],[36.173069,103.475014],[36.171669,103.478172],[36.171021,103.480209],[36.170811,103.482384],[36.170441,103.482681],[36.169361,103.482674],[36.168732,103.482658],[36.167721,103.482674],[36.167332,103.482841],[36.16708,103.483437],[36.16634,103.486961],[36.165279,103.491341],[36.164589,103.493446],[36.163799,103.494377],[36.162411,103.495079],[36.155079,103.497543],[36.15213,103.498734],[36.151791,103.49884],[36.14447,103.500648],[36.14299,103.501266],[36.142841,103.501373],[36.141708,103.502586],[36.14072,103.503593],[36.14006,103.504601],[36.138741,103.508942],[36.138149,103.511543],[36.137932,103.513313],[36.138039,103.518738],[36.138,103.522591],[36.137661,103.524048],[36.136459,103.526466],[36.136051,103.526978],[36.13266,103.529221],[36.12867,103.530296],[36.123032,103.531723],[36.122059,103.532089],[36.11982,103.533241],[36.116169,103.535553],[36.115021,103.53627],[36.11412,103.537117],[36.11311,103.538673],[36.11042,103.545486],[36.109219,103.548241],[36.1087,103.550247],[36.108509,103.552002],[36.108749,103.556358],[36.108971,103.55764],[36.109459,103.559082],[36.1115,103.562927],[36.11195,103.564087],[36.111801,103.564117],[36.11142,103.564163],[36.11076,103.564323],[36.109909,103.56456],[36.109112,103.56485],[36.10836,103.565163],[36.10775,103.56543],[36.10733,103.565666],[36.10696,103.566017],[36.10664,103.566307],[36.10622,103.566803],[36.105869,103.566978],[36.105518,103.566887],[36.105099,103.56665],[36.104721,103.566406],[36.104382,103.566269],[36.104061,103.566223],[36.10379,103.566322],[36.1035,103.566559],[36.103199,103.566811],[36.10268,103.567261],[36.101822,103.567711],[36.100868,103.568237],[36.10009,103.569122],[36.09935,103.569992],[36.09861,103.57077],[36.098011,103.571213],[36.097469,103.571411],[36.096951,103.571587],[36.096409,103.571777],[36.095909,103.57196],[36.09539,103.572144],[36.09481,103.572159],[36.0942,103.572037],[36.09362,103.571877],[36.093029,103.571693],[36.092361,103.571571],[36.091492,103.57151],[36.09053,103.571442],[36.089512,103.571136],[36.088509,103.570709],[36.08754,103.570297],[36.086658,103.569923],[36.085831,103.569489],[36.085011,103.568947],[36.08429,103.568451],[36.08358,103.568001],[36.08279,103.567543],[36.081951,103.567322],[36.08112,103.567436],[36.080292,103.567734],[36.07943,103.567833],[36.078571,103.567574],[36.077759,103.567329],[36.077,103.567253],[36.076241,103.567482],[36.075581,103.568031],[36.074841,103.568703],[36.074081,103.569122],[36.07338,103.569473],[36.07267,103.569794],[36.071899,103.57016],[36.071281,103.570473],[36.07069,103.570763],[36.070011,103.570992],[36.069382,103.570869],[36.06881,103.570473],[36.06813,103.569923],[36.067268,103.569206],[36.06641,103.56852],[36.065659,103.56781],[36.065121,103.567162],[36.06464,103.566566],[36.064171,103.566093],[36.063671,103.565788],[36.06316,103.565529],[36.062641,103.565269],[36.062092,103.564987],[36.06168,103.564552],[36.061611,103.563751],[36.061699,103.562576],[36.061779,103.561279],[36.061821,103.56012],[36.06144,103.559196],[36.060928,103.558563],[36.060329,103.558067],[36.05983,103.557602],[36.059681,103.556778],[36.05991,103.555649],[36.060169,103.55442],[36.06041,103.553177],[36.060741,103.552063],[36.061352,103.55098],[36.061878,103.549911],[36.062229,103.54892],[36.062469,103.547882],[36.062538,103.546783],[36.062408,103.54567],[36.062168,103.544594],[36.061852,103.543556],[36.061321,103.54274],[36.060532,103.542427],[36.0597,103.542511],[36.058929,103.542641],[36.05827,103.542763],[36.057571,103.542877],[36.05674,103.54303],[36.055882,103.543091],[36.054989,103.543007],[36.054211,103.543007],[36.053532,103.54306],[36.05267,103.54364],[36.05183,103.544357],[36.051189,103.544891],[36.050709,103.545082],[36.050079,103.544983],[36.04929,103.544731],[36.048359,103.544601],[36.047379,103.544884],[36.04657,103.545647],[36.04586,103.546608],[36.045101,103.547447],[36.044239,103.547958],[36.043221,103.548027],[36.04221,103.547821],[36.041279,103.547829],[36.04044,103.548058],[36.039669,103.548241],[36.039051,103.548279],[36.03828,103.548019],[36.037239,103.548073],[36.036171,103.548233],[36.035,103.548187],[36.03418,103.548042],[36.033569,103.547798],[36.033138,103.547546],[36.03281,103.547379],[36.032139,103.547073],[36.0313,103.546738],[36.03046,103.546089],[36.029499,103.545258],[36.028412,103.544601],[36.027321,103.544006],[36.02631,103.543457],[36.02544,103.543007],[36.0247,103.543068],[36.024109,103.543259],[36.023312,103.542931],[36.0224,103.542397],[36.021481,103.541931],[36.02066,103.541771],[36.01923,103.541351],[36.01841,103.540916],[36.017712,103.540497],[36.01722,103.540237],[36.01685,103.53994],[36.016548,103.539543],[36.0163,103.538963],[36.01622,103.538322],[36.016319,103.537514],[36.016602,103.536491],[36.016899,103.535431],[36.017239,103.534363],[36.01749,103.533386],[36.01749,103.532539],[36.017208,103.531807],[36.0168,103.531281],[36.016399,103.530853],[36.016022,103.53038],[36.015701,103.529823],[36.015511,103.529167],[36.015419,103.528473],[36.015541,103.527573],[36.015862,103.526611],[36.01627,103.525742],[36.01672,103.524986],[36.0172,103.524429],[36.01767,103.52401],[36.01828,103.523903],[36.019169,103.524139],[36.020119,103.524406],[36.02108,103.524277],[36.0219,103.523712],[36.02269,103.523102],[36.023571,103.522758],[36.02457,103.522697],[36.025539,103.52256],[36.026371,103.522072],[36.027069,103.521233],[36.027729,103.520287],[36.028469,103.519417],[36.02932,103.518646],[36.03019,103.517883],[36.031052,103.517113],[36.031799,103.516441],[36.032398,103.515793],[36.032879,103.514977],[36.033272,103.514061],[36.033539,103.513077],[36.033741,103.512009],[36.034111,103.510986],[36.034561,103.509987],[36.03484,103.508858],[36.034859,103.507698],[36.034721,103.506607],[36.034519,103.505722],[36.03434,103.504883],[36.03421,103.503868],[36.034302,103.502808],[36.034489,103.501747],[36.034618,103.500687],[36.034512,103.499649],[36.034328,103.498642],[36.034161,103.49765],[36.03397,103.496681],[36.033791,103.495697],[36.033691,103.494698],[36.033852,103.493683],[36.0341,103.492653],[36.034271,103.491653],[36.034851,103.490936],[36.03537,103.490097],[36.0355,103.489067],[36.035511,103.488098],[36.035259,103.487198],[36.03503,103.486282],[36.035271,103.48539],[36.035851,103.48455],[36.03611,103.483437],[36.036289,103.482193],[36.036461,103.480927],[36.03656,103.479729],[36.036449,103.478622],[36.036308,103.477608],[36.036549,103.476707],[36.037239,103.476028],[36.03809,103.475502],[36.0438,103.472023],[36.044491,103.471581],[36.044979,103.47113],[36.04533,103.470642],[36.045639,103.469948],[36.045769,103.469147],[36.045811,103.468369],[36.04591,103.467506],[36.046101,103.466667],[36.046398,103.46582],[36.046768,103.464973],[36.047211,103.464149],[36.04768,103.463463],[36.048019,103.462967],[36.048401,103.462517],[36.048851,103.461937],[36.04937,103.461304],[36.04995,103.460564],[36.050499,103.459877],[36.051048,103.45919],[36.05164,103.458443],[36.052231,103.457718],[36.052872,103.456917],[36.053539,103.455994],[36.05407,103.454971],[36.054401,103.45388],[36.054588,103.452766],[36.054691,103.451637],[36.054779,103.450531],[36.054981,103.449379],[36.055248,103.44809],[36.055519,103.446823],[36.055759,103.445663],[36.055969,103.444656],[36.055969,103.443802],[36.05571,103.442848],[36.055401,103.441811],[36.05508,103.44072],[36.05476,103.439629],[36.05444,103.438599],[36.054131,103.437607],[36.053871,103.436653],[36.053699,103.435631],[36.0536,103.434662],[36.053501,103.4338],[36.053391,103.43293],[36.053249,103.431831],[36.053051,103.43071],[36.052872,103.429764],[36.052731,103.428963],[36.052608,103.428207],[36.052471,103.427383],[36.052349,103.426514],[36.052189,103.425667],[36.051991,103.424957],[36.0518,103.424332],[36.051609,103.42366],[36.051411,103.422951],[36.051151,103.422188],[36.05072,103.421577],[36.05019,103.42115],[36.049648,103.420738],[36.04911,103.420326],[36.048531,103.419884],[36.047852,103.419342],[36.047081,103.418777],[36.046211,103.418312],[36.04528,103.417999],[36.044319,103.417847],[36.043331,103.41774],[36.042358,103.417633],[36.041401,103.417557],[36.040531,103.417473],[36.039688,103.417389],[36.038879,103.417313],[36.038071,103.417229],[36.037331,103.417152],[36.036671,103.417038],[36.03606,103.416924],[36.03553,103.416801],[36.03513,103.416687],[36.034931,103.416634],[36.034752,103.416557],[36.033508,103.416237],[36.032879,103.416054],[36.032101,103.415817],[36.031219,103.415558],[36.030369,103.41526],[36.029572,103.414803],[36.028801,103.414139],[36.028091,103.413544],[36.02739,103.413071],[36.026649,103.412933],[36.02597,103.413177],[36.02533,103.41362],[36.0247,103.41407],[36.02409,103.414139],[36.02359,103.41378],[36.02317,103.413292],[36.02272,103.41275],[36.022209,103.412132],[36.02158,103.411392],[36.020859,103.410553],[36.020149,103.409683],[36.01939,103.40892],[36.01857,103.408272],[36.0177,103.407707],[36.016781,103.407303],[36.01585,103.406937],[36.014961,103.406616],[36.01416,103.406326],[36.013451,103.405968],[36.012798,103.40535],[36.012291,103.404457],[36.01181,103.40332],[36.011269,103.402077],[36.010719,103.400902],[36.010208,103.39978],[36.00972,103.398743],[36.009071,103.397873],[36.008339,103.397087],[36.007671,103.396378],[36.00716,103.395576],[36.006851,103.394493],[36.00663,103.393227],[36.006371,103.391907],[36.005951,103.390648],[36.005299,103.389511],[36.004532,103.388588],[36.003651,103.387939],[36.002659,103.387642],[36.00169,103.387741],[36.000679,103.387947],[35.99968,103.388184],[35.99876,103.388367],[35.99791,103.388344],[35.997021,103.387993],[35.996109,103.387543],[35.995152,103.387077],[35.994228,103.386673],[35.99342,103.386421],[35.99268,103.38665],[35.992088,103.38726],[35.99144,103.387802],[35.990589,103.388161],[35.989651,103.388153],[35.98872,103.387917],[35.98782,103.38755],[35.98695,103.387047],[35.986061,103.386543],[35.985241,103.386017],[35.984661,103.385193],[35.984119,103.384323],[35.983421,103.383781],[35.982712,103.383301],[35.982182,103.382423],[35.981739,103.38134],[35.981319,103.380302],[35.980881,103.379242],[35.98045,103.378166],[35.98003,103.377159],[35.979622,103.376213],[35.979359,103.375229],[35.979252,103.374123],[35.978951,103.373123],[35.97839,103.372238],[35.977871,103.371323],[35.977631,103.370201],[35.977291,103.369133],[35.9767,103.36837],[35.9762,103.367844],[35.975719,103.367332],[35.975201,103.366882],[35.974529,103.366463],[35.973789,103.365952],[35.97324,103.365128],[35.97274,103.364227],[35.97226,103.363327],[35.971748,103.362427],[35.970909,103.361908],[35.96991,103.361443],[35.968899,103.360977],[35.967949,103.360443],[35.96703,103.359848],[35.966141,103.359261],[35.96529,103.358704],[35.964481,103.358124],[35.963871,103.357224],[35.963322,103.35611],[35.962742,103.355072],[35.96204,103.354179],[35.96133,103.353317],[35.96072,103.352547],[35.960159,103.351891],[35.959671,103.351433],[35.959,103.350822],[35.958199,103.350197],[35.957401,103.349541],[35.9566,103.3489],[35.955761,103.34832],[35.954899,103.347893],[35.95401,103.347527],[35.953079,103.347183],[35.952209,103.346848],[35.951519,103.346367],[35.951019,103.345596],[35.95052,103.344849],[35.949871,103.344421],[35.94907,103.344223],[35.948292,103.344101],[35.947639,103.344002],[35.946999,103.343887],[35.946301,103.343773],[35.945591,103.343651],[35.944809,103.343529],[35.944,103.343323],[35.943291,103.342857],[35.942692,103.342148],[35.942131,103.341408],[35.94154,103.340843],[35.940899,103.340607],[35.94035,103.340424],[35.93993,103.34037],[35.939491,103.340332],[35.938862,103.340317],[35.938301,103.340363],[35.937832,103.340408],[35.937439,103.340424],[35.93705,103.340431],[35.936581,103.340317],[35.936211,103.339737],[35.93605,103.339012],[35.93589,103.338287],[35.935741,103.337608],[35.935551,103.336746],[35.93536,103.335999],[35.935181,103.33535],[35.93491,103.334801],[35.934639,103.334183],[35.934662,103.333519],[35.93483,103.332878],[35.934952,103.332329],[35.93502,103.331711],[35.934879,103.331123],[35.934502,103.330612],[35.934231,103.330093],[35.934292,103.329514],[35.934471,103.328979],[35.934689,103.328453],[35.934959,103.327942],[35.93523,103.327438],[35.935558,103.326881],[35.935928,103.326302],[35.936329,103.325996],[35.93676,103.325882],[35.937099,103.325798],[35.93716,103.325638],[35.93689,103.325508],[35.9366,103.325447],[35.936371,103.325523],[35.936001,103.325783],[35.935661,103.326157],[35.93544,103.326553],[35.93528,103.326714],[35.935001,103.326576],[35.934631,103.32637],[35.934261,103.326149],[35.934132,103.325859],[35.93417,103.32534],[35.93425,103.324707],[35.93433,103.324173],[35.934429,103.323708],[35.934502,103.323181],[35.93457,103.322563],[35.934631,103.321854],[35.934711,103.32106],[35.934811,103.320267],[35.934879,103.319504],[35.934971,103.318771],[35.934929,103.318176],[35.934952,103.317688],[35.934898,103.317123],[35.934818,103.316391],[35.934792,103.315918],[35.934799,103.315819],[35.93449,103.315529],[35.934021,103.3153],[35.933731,103.315079],[35.9333,103.314484],[35.932991,103.314209],[35.93206,103.31369],[35.931179,103.313438],[35.93055,103.31308],[35.93045,103.312927],[35.930561,103.31279],[35.931301,103.312927],[35.931931,103.312729],[35.932541,103.312851],[35.93264,103.312767],[35.932671,103.312683],[35.93259,103.312553],[35.932251,103.312363],[35.93095,103.312019],[35.93042,103.3116],[35.93021,103.311493],[35.93,103.311501],[35.929619,103.311707],[35.92934,103.311974],[35.929199,103.31218],[35.929001,103.312714],[35.92902,103.312897],[35.929161,103.313431],[35.929131,103.313599],[35.92905,103.31369],[35.92836,103.313927],[35.928131,103.313873],[35.92802,103.313766],[35.927731,103.313408],[35.92757,103.313408],[35.927471,103.313507],[35.927441,103.313728],[35.92749,103.313828],[35.92778,103.314056],[35.92786,103.31427],[35.927811,103.3144],[35.927441,103.314796],[35.927219,103.315201],[35.92659,103.316589],[35.92635,103.317291],[35.92606,103.31871],[35.925869,103.31913],[35.925659,103.319351],[35.921909,103.322456],[35.921421,103.322708],[35.921211,103.322723],[35.920971,103.322647],[35.9207,103.322456],[35.92025,103.321831],[35.91988,103.321548],[35.919651,103.321533],[35.9193,103.3218],[35.91909,103.3218],[35.918961,103.321693],[35.918789,103.321426],[35.91853,103.320938],[35.91827,103.320763],[35.918091,103.320763],[35.917961,103.320847],[35.917641,103.321823],[35.917561,103.321907],[35.917419,103.321968],[35.917191,103.321877],[35.91679,103.321487],[35.916691,103.321449],[35.916561,103.321487],[35.916161,103.3218],[35.915901,103.321831],[35.914989,103.321136],[35.914841,103.321091],[35.914459,103.321136],[35.913651,103.321487],[35.913311,103.321579],[35.912979,103.321579],[35.912811,103.321503],[35.912701,103.321327],[35.912571,103.320686],[35.912449,103.320587],[35.91235,103.320618],[35.912251,103.320877],[35.912121,103.321709],[35.91201,103.322006],[35.911621,103.322807],[35.911381,103.32312],[35.911091,103.323288],[35.910511,103.323349],[35.90971,103.323288],[35.909481,103.32338],[35.909069,103.323914],[35.90884,103.324318],[35.908539,103.325203],[35.908451,103.325363],[35.907921,103.325851],[35.907841,103.326057],[35.907871,103.326271],[35.908291,103.327103],[35.908451,103.327797],[35.90844,103.328041],[35.90834,103.328178],[35.90797,103.328407],[35.9076,103.328377],[35.90731,103.328247],[35.907181,103.32814],[35.906361,103.327087],[35.906281,103.326759],[35.90596,103.326157],[35.905769,103.326073],[35.904621,103.32605],[35.90448,103.325974],[35.90419,103.325638],[35.904121,103.32547],[35.903931,103.323669],[35.90382,103.323341],[35.9034,103.322639],[35.903271,103.322327],[35.903221,103.322166],[35.903141,103.321648],[35.903191,103.321518],[35.90332,103.321419],[35.903751,103.321373],[35.90398,103.32122],[35.90406,103.321098],[35.904079,103.320961],[35.904041,103.320587],[35.903931,103.320419],[35.903801,103.320358],[35.90366,103.320343],[35.90303,103.320427],[35.902809,103.320297],[35.90266,103.32],[35.90202,103.318047],[35.90184,103.317719],[35.9016,103.317497],[35.899841,103.318741],[35.89954,103.320923],[35.899841,103.321854],[35.899891,103.322159],[35.899761,103.32328],[35.899811,103.323608],[35.900421,103.324417],[35.900829,103.325241],[35.90099,103.325394],[35.901291,103.325539],[35.901581,103.325768],[35.902,103.326828],[35.902531,103.327347],[35.90313,103.328468],[35.903351,103.329033],[35.903721,103.329483],[35.90395,103.330208],[35.903961,103.330566],[35.903881,103.330856],[35.903931,103.331078],[35.90419,103.331284],[35.90443,103.33165],[35.904701,103.331947],[35.905319,103.332397],[35.905491,103.332619],[35.905651,103.333023],[35.90554,103.333847],[35.905609,103.334068],[35.90588,103.334503],[35.9062,103.334747],[35.907101,103.335007],[35.907181,103.335159],[35.907181,103.335693],[35.907219,103.335777],[35.907341,103.335876],[35.90757,103.335876],[35.90773,103.335777],[35.907879,103.335617],[35.908119,103.33519],[35.908291,103.335121],[35.90839,103.335159],[35.908779,103.33548],[35.909451,103.335854],[35.90955,103.335991],[35.90955,103.336067],[35.90942,103.336571],[35.90942,103.336723],[35.909931,103.337753],[35.90995,103.338097],[35.90974,103.338676],[35.909679,103.33876],[35.90918,103.339058],[35.908791,103.339523],[35.908291,103.339897],[35.9081,103.339897],[35.907909,103.339653],[35.90773,103.339607],[35.9076,103.339737],[35.907501,103.340157],[35.907391,103.340317],[35.906929,103.340553],[35.90678,103.3405],[35.90641,103.34005],[35.906231,103.340027],[35.905979,103.340157],[35.90591,103.340218],[35.90575,103.340828],[35.9053,103.341309],[35.905121,103.341347],[35.904881,103.341309],[35.904751,103.3414],[35.904411,103.342293],[35.9039,103.343323],[35.903801,103.343407],[35.903419,103.343559],[35.902191,103.343681],[35.90147,103.343674],[35.901081,103.343536],[35.90065,103.343536],[35.89859,103.343857],[35.89846,103.343979],[35.89817,103.344414],[35.897621,103.344704],[35.897129,103.345703],[35.896881,103.34639],[35.896431,103.34671],[35.895969,103.346939],[35.89587,103.347069],[35.895691,103.347488],[35.89558,103.347527],[35.89534,103.347504],[35.89521,103.347527],[35.89476,103.348007],[35.89463,103.348091],[35.89418,103.348106],[35.893681,103.348648],[35.893181,103.349037],[35.892849,103.34922],[35.89254,103.349564],[35.89238,103.349663],[35.891979,103.3498],[35.890751,103.349899],[35.890461,103.349991],[35.890411,103.350182],[35.89043,103.350258],[35.890511,103.350327],[35.89156,103.35038],[35.892181,103.350471],[35.893009,103.350128],[35.893799,103.349693],[35.89444,103.349716],[35.894539,103.349617],[35.894619,103.349274],[35.894699,103.349159],[35.89558,103.349037],[35.896191,103.348778],[35.896641,103.34893],[35.897041,103.34993],[35.89719,103.350098],[35.897339,103.350098],[35.89772,103.349899],[35.8978,103.349777],[35.8978,103.349579],[35.89764,103.349007],[35.8978,103.348557],[35.897709,103.348099],[35.8978,103.347931],[35.898121,103.347954],[35.89872,103.348198],[35.899151,103.348503],[35.89925,103.348503],[35.899361,103.34832],[35.89933,103.347771],[35.89941,103.34761],[35.89954,103.347588],[35.90036,103.347977],[35.900539,103.348007],[35.90073,103.347939],[35.90081,103.347816],[35.900829,103.347687],[35.90081,103.347557],[35.90065,103.347237],[35.900631,103.347099],[35.900749,103.346939],[35.900909,103.346909],[35.90134,103.347023],[35.901581,103.347237],[35.901871,103.347633],[35.902,103.347656],[35.90229,103.347557],[35.902451,103.347679],[35.902481,103.347763],[35.902481,103.347893],[35.90239,103.34819],[35.902279,103.348427],[35.902161,103.348557],[35.901821,103.34874],[35.901421,103.349083],[35.90097,103.349548],[35.900539,103.349586],[35.900391,103.34967],[35.8992,103.351128],[35.898899,103.35125],[35.89851,103.351738],[35.897949,103.352081],[35.897701,103.352127],[35.89711,103.351883],[35.89674,103.351799],[35.89637,103.351517],[35.896191,103.351509],[35.895741,103.352219],[35.895531,103.352287],[35.895241,103.35228],[35.895111,103.352341],[35.895081,103.352386],[35.89502,103.352798],[35.89492,103.353027],[35.89476,103.353088],[35.89397,103.353027],[35.893871,103.353111],[35.893799,103.353317],[35.893951,103.354019],[35.89389,103.354156],[35.8937,103.354309],[35.893311,103.354301],[35.89315,103.354233],[35.89241,103.353683],[35.892151,103.353607],[35.892021,103.353699],[35.892021,103.35376],[35.89212,103.353859],[35.892509,103.353973],[35.89323,103.354584],[35.893391,103.35466],[35.89381,103.354607],[35.893921,103.35466],[35.89402,103.35479],[35.89415,103.355057],[35.894161,103.35524],[35.89365,103.356293],[35.893379,103.357338],[35.89333,103.357857],[35.89352,103.358528],[35.893539,103.358757],[35.89328,103.359581],[35.893101,103.36042],[35.892891,103.36097],[35.892601,103.361397],[35.892479,103.361679],[35.892399,103.362267],[35.89225,103.362717],[35.891689,103.363441],[35.891701,103.363586],[35.89183,103.36393],[35.89188,103.364227],[35.891739,103.364799],[35.891239,103.365868],[35.89119,103.366417],[35.89098,103.366737],[35.89064,103.367073],[35.890411,103.367378],[35.890461,103.367554],[35.8909,103.367996],[35.890999,103.368294],[35.890999,103.368591],[35.890789,103.369034],[35.89082,103.36924],[35.891251,103.369507],[35.89138,103.369766],[35.89138,103.370003],[35.8913,103.370537],[35.89101,103.371597],[35.890831,103.371979],[35.89056,103.372147],[35.89024,103.372467],[35.890041,103.372566],[35.88974,103.372597],[35.88937,103.372917],[35.88903,103.373154],[35.88842,103.374519],[35.888161,103.374847],[35.886051,103.37606],[35.886009,103.37616],[35.88596,103.376633],[35.885849,103.376869],[35.88541,103.377274],[35.884781,103.377457],[35.884541,103.377586],[35.88446,103.377731],[35.884411,103.378151],[35.8843,103.378258],[35.883511,103.378441],[35.88298,103.378433],[35.882721,103.378593],[35.88261,103.378754],[35.882599,103.37886],[35.882771,103.379341],[35.882801,103.379578],[35.882759,103.379761],[35.882641,103.37989],[35.881191,103.380547],[35.880939,103.38073],[35.880829,103.380997],[35.880619,103.382156],[35.880322,103.382767],[35.880291,103.38385],[35.880409,103.384117],[35.880939,103.38459],[35.881069,103.384758],[35.88121,103.385139],[35.88121,103.385368],[35.881161,103.385468],[35.880951,103.385757],[35.88076,103.385887],[35.879971,103.386147],[35.879841,103.386299],[35.879841,103.386543],[35.88002,103.386917],[35.879921,103.387154],[35.879681,103.387321],[35.87952,103.387543],[35.879551,103.387688],[35.879791,103.388077],[35.879791,103.388206],[35.879631,103.38842],[35.879021,103.388748],[35.87709,103.389458],[35.876881,103.389587],[35.87672,103.389809],[35.87672,103.389977],[35.876801,103.39016],[35.878311,103.3909],[35.878521,103.391068],[35.878559,103.39119],[35.878521,103.391258],[35.878349,103.391243],[35.87804,103.390953],[35.877689,103.39077],[35.87616,103.39035],[35.876011,103.390266],[35.875931,103.390129],[35.87603,103.389709],[35.87619,103.389503],[35.87701,103.388939],[35.878201,103.388283],[35.87825,103.388153],[35.878231,103.388077],[35.87812,103.388031],[35.877522,103.388428],[35.875599,103.389351],[35.875351,103.389648],[35.87513,103.390297],[35.875111,103.390511],[35.87524,103.390678],[35.87656,103.391373],[35.87661,103.391434],[35.876629,103.391602],[35.876541,103.391769],[35.876339,103.39193],[35.875771,103.392357],[35.875191,103.392609],[35.874691,103.392929],[35.874081,103.393051],[35.87344,103.393417],[35.871861,103.39402],[35.87075,103.394524],[35.87011,103.394608],[35.869961,103.394691],[35.86961,103.395073],[35.868111,103.395668],[35.867321,103.396179],[35.867111,103.39637],[35.867069,103.396553],[35.867081,103.396683],[35.867199,103.396843],[35.86832,103.39743],[35.869591,103.398453],[35.87022,103.398804],[35.87038,103.399048],[35.870361,103.399178],[35.870201,103.399361],[35.869431,103.399841],[35.869091,103.399986],[35.86861,103.400093],[35.868141,103.400467],[35.86787,103.400551],[35.867661,103.400681],[35.867149,103.401268],[35.867119,103.401443],[35.867149,103.401558],[35.86763,103.402008],[35.867649,103.402283],[35.867481,103.402573],[35.867161,103.402901],[35.866291,103.403427],[35.86607,103.403679],[35.865761,103.404739],[35.865841,103.406013],[35.865971,103.40625],[35.86607,103.406303],[35.866211,103.406273],[35.867451,103.405586],[35.867729,103.40551],[35.867889,103.405602],[35.86832,103.406197],[35.868839,103.406593],[35.868931,103.406731],[35.86898,103.406891],[35.868931,103.407028],[35.868771,103.407204],[35.867191,103.407806],[35.866859,103.407967],[35.866791,103.408081],[35.866791,103.408257],[35.866909,103.408417],[35.867561,103.408813],[35.867691,103.408951],[35.86776,103.409119],[35.86768,103.409271],[35.867569,103.40934],[35.86515,103.410027],[35.864929,103.410172],[35.864769,103.410393],[35.864689,103.410759],[35.864761,103.411324],[35.864731,103.411621],[35.864109,103.412628],[35.86393,103.413116],[35.863892,103.414146],[35.86396,103.414627],[35.86388,103.414917],[35.863529,103.415466],[35.863441,103.415733],[35.863411,103.416649],[35.863491,103.416946],[35.863731,103.417427],[35.86372,103.417908],[35.863781,103.418327],[35.864071,103.418747],[35.864521,103.420151],[35.864891,103.42057],[35.86499,103.420769],[35.86499,103.421059],[35.864799,103.421509],[35.86478,103.421677],[35.865089,103.422218],[35.865089,103.422607],[35.86515,103.422897],[35.865471,103.423698],[35.865509,103.424347],[35.866211,103.425583],[35.866371,103.425957],[35.866501,103.426392],[35.866631,103.427513],[35.866611,103.427803],[35.866501,103.428108],[35.866081,103.428947],[35.866081,103.429131],[35.866161,103.429199],[35.866261,103.429161],[35.86668,103.428268],[35.86694,103.427948],[35.86705,103.427917],[35.867531,103.428108],[35.867661,103.428101],[35.86779,103.428017],[35.868309,103.427551],[35.86842,103.427544],[35.868481,103.427681],[35.868301,103.427917],[35.867771,103.428368],[35.867661,103.428436],[35.867161,103.42852],[35.867001,103.428658],[35.866699,103.429367],[35.866699,103.429558],[35.866791,103.429817],[35.866791,103.430061],[35.866631,103.430191],[35.866371,103.430267],[35.86623,103.430397],[35.866119,103.430641],[35.86594,103.431297],[35.86578,103.431534],[35.865601,103.431633],[35.86512,103.431763],[35.86441,103.432266],[35.864201,103.432281],[35.863701,103.432137],[35.86356,103.432137],[35.86343,103.432259],[35.86338,103.43248],[35.863491,103.433296],[35.864361,103.435059],[35.864361,103.435333],[35.864269,103.435577],[35.864109,103.435791],[35.863621,103.436157],[35.863491,103.436699],[35.863361,103.436943],[35.862949,103.437317],[35.86245,103.437477],[35.862171,103.437668],[35.861931,103.437866],[35.861752,103.438148],[35.86166,103.438637],[35.86132,103.439491],[35.861229,103.440849],[35.86158,103.441933],[35.861771,103.44236],[35.862122,103.442917],[35.862141,103.443161],[35.862011,103.443298],[35.86132,103.443497],[35.861111,103.443932],[35.861012,103.444],[35.86031,103.444054],[35.8601,103.444153],[35.860031,103.444237],[35.860031,103.444519],[35.86034,103.444893],[35.860371,103.445053],[35.860321,103.445221],[35.86005,103.445541],[35.859909,103.445587],[35.859699,103.445587],[35.858891,103.445396],[35.85844,103.445396],[35.856571,103.445953],[35.8563,103.446091],[35.855801,103.44648],[35.855221,103.446709],[35.85482,103.446999],[35.854191,103.447113],[35.85363,103.447479],[35.852451,103.447937],[35.851891,103.448051],[35.85046,103.447929],[35.850182,103.44796],[35.84903,103.448624],[35.847549,103.449226],[35.8456,103.450958],[35.8447,103.45121],[35.844551,103.451347],[35.844379,103.451988],[35.84417,103.452217],[35.841621,103.453018],[35.84103,103.4533],[35.840721,103.453308],[35.839741,103.453018],[35.839409,103.45269],[35.839081,103.452217],[35.838791,103.451988],[35.837379,103.45195],[35.836552,103.45182],[35.836411,103.451714],[35.836281,103.4515],[35.83577,103.44986],[35.835541,103.449448],[35.834641,103.449051],[35.8339,103.448349],[35.833389,103.448067],[35.831711,103.446968],[35.831539,103.446907],[35.831089,103.446907],[35.83028,103.446663],[35.829361,103.446587],[35.82859,103.446327],[35.828239,103.44632],[35.826759,103.446579],[35.825489,103.446587],[35.823792,103.446289],[35.822731,103.446251],[35.822109,103.445961],[35.82196,103.445953],[35.821239,103.446121],[35.82066,103.446564],[35.820499,103.446617],[35.819111,103.446938],[35.816921,103.447937],[35.816559,103.448021],[35.81599,103.447937],[35.814091,103.44809],[35.81358,103.448036],[35.812801,103.448151],[35.8125,103.448067],[35.81221,103.447906],[35.812111,103.447777],[35.81205,103.447578],[35.81213,103.446388],[35.812031,103.445686],[35.812229,103.444946],[35.812241,103.444763],[35.812191,103.44458],[35.811161,103.443619],[35.810452,103.442787],[35.809799,103.442299],[35.809681,103.442131],[35.808922,103.440361],[35.808731,103.440071],[35.80843,103.439758],[35.808281,103.439697],[35.807869,103.439728],[35.807449,103.439537],[35.806911,103.439407],[35.805611,103.438591],[35.804291,103.438309],[35.80405,103.438179],[35.803631,103.43782],[35.802731,103.437592],[35.802341,103.437393],[35.801941,103.437286],[35.80056,103.437141],[35.7995,103.437111],[35.798691,103.437286],[35.798481,103.43721],[35.798012,103.436867],[35.797791,103.436821],[35.795181,103.43663],[35.793781,103.436768],[35.792801,103.436974],[35.79229,103.43692],[35.79073,103.436157],[35.78941,103.435959],[35.788971,103.435799],[35.787891,103.434837],[35.787312,103.434486],[35.786201,103.434097],[35.785431,103.434029],[35.783321,103.432663],[35.78191,103.431961],[35.780861,103.431618],[35.780449,103.431396],[35.779381,103.431396],[35.77903,103.431473],[35.778332,103.431137],[35.777512,103.431],[35.77626,103.430901],[35.77512,103.430588],[35.774719,103.430557],[35.77388,103.430611],[35.77367,103.430557],[35.773472,103.430397],[35.773041,103.429649],[35.772831,103.429337],[35.771561,103.428581],[35.770069,103.427193],[35.769489,103.427048],[35.768162,103.42617],[35.767551,103.426033],[35.767231,103.425774],[35.76545,103.424019],[35.764339,103.423241],[35.763401,103.42289],[35.762741,103.422348],[35.762371,103.421913],[35.76136,103.420219],[35.761292,103.419991],[35.761238,103.419327],[35.76086,103.418114],[35.760712,103.417877],[35.76012,103.417557],[35.759979,103.417381],[35.759651,103.41674],[35.759491,103.41655],[35.758671,103.415916],[35.757431,103.415581],[35.757252,103.415482],[35.757038,103.415268],[35.756512,103.414574],[35.75589,103.414101],[35.755531,103.413559],[35.755131,103.413231],[35.75449,103.41291],[35.7537,103.412727],[35.753029,103.412468],[35.751961,103.4123],[35.751732,103.412338],[35.75153,103.412437],[35.750721,103.413139],[35.750191,103.413361],[35.748661,103.414337],[35.747501,103.415573],[35.747021,103.416161],[35.746319,103.416679],[35.74596,103.417007],[35.74577,103.417267],[35.745159,103.417717],[35.744869,103.418159],[35.74469,103.418793],[35.74456,103.418877],[35.744171,103.418907],[35.743889,103.419144],[35.74361,103.419609],[35.743511,103.41996],[35.743462,103.420349],[35.74345,103.420807],[35.743721,103.421707],[35.743698,103.42186],[35.743629,103.421928],[35.743401,103.421959],[35.742809,103.421829],[35.7416,103.421478],[35.741199,103.42128],[35.74094,103.421227],[35.74065,103.42131],[35.74012,103.421638],[35.739811,103.421738],[35.738621,103.421799],[35.737419,103.422371],[35.736851,103.422546],[35.736271,103.423141],[35.735371,103.423576],[35.734909,103.424309],[35.73457,103.42469],[35.733471,103.425323],[35.732941,103.425507],[35.732761,103.425659],[35.73243,103.426041],[35.731781,103.426521],[35.731392,103.426888],[35.73093,103.427017],[35.73019,103.427361],[35.729591,103.427727],[35.728901,103.427887],[35.727501,103.428978],[35.72707,103.429199],[35.726212,103.429367],[35.72541,103.430107],[35.725182,103.43026],[35.72477,103.430443],[35.723,103.431],[35.722721,103.430969],[35.72171,103.430527],[35.72142,103.430519],[35.720909,103.43058],[35.720711,103.430641],[35.719101,103.431473],[35.718399,103.43222],[35.718151,103.432373],[35.717541,103.432457],[35.717239,103.432411],[35.716431,103.432129],[35.716171,103.432137],[35.7155,103.432327],[35.714588,103.43293],[35.713051,103.43364],[35.71278,103.433823],[35.71246,103.434158],[35.712231,103.434334],[35.71172,103.434471],[35.711391,103.434441],[35.710972,103.434128],[35.710869,103.43399],[35.710831,103.433823],[35.71093,103.431198],[35.71101,103.430946],[35.7113,103.430458],[35.711399,103.430191],[35.711391,103.429947],[35.711239,103.429314],[35.711208,103.428047],[35.711151,103.427719],[35.710819,103.427368],[35.710091,103.426849],[35.70953,103.42601],[35.708981,103.425728],[35.708778,103.425507],[35.70842,103.424606],[35.708229,103.423592],[35.70797,103.42308],[35.707722,103.422737],[35.706871,103.422058],[35.706322,103.421387],[35.70499,103.419319],[35.7048,103.418739],[35.704361,103.416847],[35.703651,103.415848],[35.70327,103.41497],[35.703098,103.414879],[35.70266,103.414818],[35.702049,103.414467],[35.701721,103.414383],[35.701271,103.414291],[35.70076,103.414337],[35.700081,103.414261],[35.69939,103.413971],[35.69849,103.413681],[35.697868,103.413673],[35.697472,103.413559],[35.696949,103.413498],[35.696659,103.413551],[35.696331,103.413689],[35.696159,103.413696],[35.695,103.413429],[35.69334,103.41317],[35.692032,103.41304],[35.69128,103.41317],[35.690941,103.413109],[35.69067,103.412949],[35.690331,103.412468],[35.690182,103.412369],[35.687698,103.411743],[35.687191,103.411568],[35.68639,103.411217],[35.685081,103.41053],[35.684212,103.410477],[35.682892,103.410057],[35.68222,103.410103],[35.681419,103.41024],[35.680771,103.410057],[35.680248,103.410011],[35.67989,103.409798],[35.679691,103.409737],[35.679241,103.409889],[35.678841,103.41011],[35.678001,103.41021],[35.67762,103.410141],[35.676731,103.40963],[35.676571,103.409576],[35.6759,103.40979],[35.675289,103.410103],[35.675011,103.410103],[35.674641,103.410011],[35.674511,103.40992],[35.674179,103.409286],[35.67355,103.408478],[35.673241,103.407913],[35.672878,103.406868],[35.67276,103.406113],[35.672611,103.405769],[35.67205,103.40509],[35.671398,103.40477],[35.671242,103.40461],[35.67078,103.403748],[35.670349,103.403191],[35.669762,103.402283],[35.66938,103.401527],[35.667961,103.39978],[35.667419,103.399017],[35.666729,103.397881],[35.666481,103.397179],[35.666401,103.3964],[35.666401,103.396027],[35.6665,103.39534],[35.66684,103.394257],[35.666851,103.39389],[35.6661,103.392097],[35.665989,103.391739],[35.665932,103.391281],[35.66592,103.390427],[35.666031,103.389999],[35.66695,103.388039],[35.666988,103.387772],[35.666931,103.386757],[35.666962,103.386276],[35.667122,103.385788],[35.667679,103.38459],[35.667751,103.384331],[35.667721,103.384216],[35.667549,103.384087],[35.66613,103.383667],[35.665871,103.38353],[35.66489,103.382767],[35.664322,103.381897],[35.664261,103.381706],[35.664249,103.381287],[35.6642,103.381027],[35.664322,103.38092],[35.665871,103.378578],[35.666142,103.378319],[35.66671,103.378059],[35.666851,103.377937],[35.666889,103.377823],[35.66687,103.377693],[35.666512,103.37719],[35.666351,103.376846],[35.666328,103.376404],[35.666401,103.375977],[35.666561,103.375519],[35.66674,103.375221],[35.666988,103.374947],[35.66732,103.374748],[35.668049,103.374527],[35.668598,103.37394],[35.66864,103.373871],[35.66864,103.373657],[35.668331,103.373161],[35.668308,103.37291],[35.668442,103.372383],[35.668991,103.370827],[35.669281,103.370537],[35.669781,103.370399],[35.669899,103.370308],[35.67017,103.369781],[35.670681,103.369217],[35.670738,103.369003],[35.67075,103.368317],[35.671169,103.366959],[35.67131,103.366699],[35.67149,103.366508],[35.67197,103.366348],[35.672138,103.366158],[35.67226,103.365868],[35.672588,103.365303],[35.672779,103.364464],[35.673592,103.362717],[35.67384,103.362488],[35.674469,103.362373],[35.67466,103.362167],[35.674641,103.361969],[35.67429,103.361183],[35.674179,103.360779],[35.674141,103.360336],[35.674179,103.35997],[35.674278,103.35952],[35.6744,103.3592],[35.675159,103.357887],[35.675381,103.357407],[35.675671,103.356628],[35.67572,103.356117],[35.675522,103.354897],[35.675228,103.354187],[35.67519,103.353928],[35.67511,103.352631],[35.67495,103.351517],[35.674931,103.350708],[35.67498,103.349876],[35.675152,103.349289],[35.676109,103.348091],[35.676201,103.347801],[35.676189,103.347366],[35.67625,103.347],[35.67664,103.346359],[35.676708,103.346169],[35.676651,103.34594],[35.676479,103.345848],[35.67622,103.345863],[35.675591,103.346001],[35.675369,103.345947],[35.674358,103.34494],[35.674191,103.344566],[35.673908,103.343567],[35.673439,103.342529],[35.672691,103.341347],[35.672001,103.339569],[35.67157,103.338913],[35.67141,103.338219],[35.671101,103.337196],[35.671089,103.336029],[35.671391,103.335098],[35.67144,103.33448],[35.671391,103.334053],[35.671181,103.333214],[35.671169,103.332649],[35.671379,103.33062],[35.671589,103.32991],[35.671638,103.329498],[35.671589,103.329224],[35.670971,103.327377],[35.67094,103.326408],[35.671162,103.324913],[35.67104,103.323448],[35.670731,103.322311],[35.670158,103.321243],[35.670052,103.320953],[35.669651,103.319107],[35.669701,103.318359],[35.66983,103.317574],[35.670078,103.317001],[35.670559,103.316399],[35.671478,103.316109],[35.672039,103.315468],[35.672112,103.315041],[35.672001,103.314247],[35.672031,103.313904],[35.672371,103.312859],[35.672649,103.312218],[35.672852,103.31192],[35.673111,103.311699],[35.673901,103.31144],[35.674511,103.31105],[35.674591,103.310944],[35.674629,103.310707],[35.674511,103.310501],[35.674358,103.310379],[35.673752,103.310043],[35.673439,103.309769],[35.673,103.30909],[35.672859,103.308746],[35.672291,103.306664],[35.672249,103.30632],[35.672241,103.305237],[35.672031,103.30368],[35.67181,103.303261],[35.671211,103.302803],[35.671021,103.302429],[35.670952,103.302147],[35.670959,103.301697],[35.671268,103.30024],[35.671268,103.299927],[35.6712,103.299637],[35.67104,103.2994],[35.670189,103.298431],[35.669708,103.297737],[35.66906,103.29705],[35.668468,103.295937],[35.66814,103.295647],[35.667011,103.29483],[35.666752,103.294487],[35.66613,103.293007],[35.665619,103.291512],[35.665421,103.290428],[35.66547,103.289299],[35.66563,103.289001],[35.6661,103.288353],[35.666439,103.287956],[35.667191,103.287514],[35.667252,103.287369],[35.66721,103.287209],[35.666969,103.287086],[35.665951,103.287117],[35.66523,103.287567],[35.665001,103.287628],[35.664711,103.28759],[35.66431,103.287376],[35.664001,103.287308],[35.663181,103.287369],[35.662651,103.287308],[35.662441,103.287209],[35.662392,103.287086],[35.66243,103.286957],[35.662498,103.286911],[35.66312,103.287117],[35.663261,103.287079],[35.663288,103.286957],[35.663158,103.286827],[35.662258,103.286507],[35.661449,103.286011],[35.661442,103.285828],[35.661579,103.285767],[35.662231,103.286209],[35.662338,103.286217],[35.662361,103.286171],[35.662338,103.286049],[35.66177,103.285568],[35.661541,103.285301],[35.661201,103.284683],[35.66111,103.28434],[35.660938,103.282738],[35.6609,103.2826],[35.660751,103.282387],[35.660568,103.282318],[35.65966,103.282188],[35.659149,103.281898],[35.65765,103.281517],[35.65723,103.281487],[35.657101,103.281387],[35.65707,103.281288],[35.657101,103.281197],[35.65723,103.281128],[35.658131,103.281342],[35.658291,103.281258],[35.65831,103.281151],[35.658291,103.281067],[35.65818,103.281013],[35.65773,103.280991],[35.657372,103.280891],[35.656239,103.280273],[35.654949,103.279778],[35.654598,103.279572],[35.65456,103.279449],[35.654621,103.27935],[35.655392,103.279572],[35.65596,103.27951],[35.65641,103.279533],[35.65654,103.27948],[35.656582,103.279373],[35.656528,103.279259],[35.656471,103.279228],[35.655281,103.279137],[35.65514,103.279053],[35.65514,103.278923],[35.655182,103.278839],[35.655331,103.278748],[35.656681,103.278648],[35.656792,103.278557],[35.656761,103.278397],[35.656651,103.278313],[35.655998,103.278236],[35.655331,103.278297],[35.655258,103.278229],[35.655251,103.278137],[35.6553,103.278038],[35.65546,103.277946],[35.65675,103.27771],[35.65683,103.277557],[35.656811,103.277481],[35.6567,103.277397],[35.655861,103.277428],[35.65443,103.277191],[35.65427,103.277077],[35.654251,103.276917],[35.65448,103.276817],[35.65659,103.276543],[35.656731,103.276367],[35.656731,103.276268],[35.656681,103.276176],[35.656528,103.276077],[35.655151,103.27552],[35.65369,103.275146],[35.653419,103.275131],[35.653278,103.275177],[35.652969,103.275414],[35.652748,103.275414],[35.65258,103.275169],[35.652451,103.274719],[35.652321,103.27446],[35.651939,103.274063],[35.651451,103.273788],[35.651291,103.273598],[35.651299,103.27343],[35.65136,103.273361],[35.651501,103.273323],[35.651642,103.273369],[35.652271,103.273804],[35.65239,103.273811],[35.652481,103.273743],[35.6525,103.273628],[35.652458,103.273483],[35.65226,103.273148],[35.6521,103.272957],[35.651661,103.272659],[35.651211,103.272621],[35.65004,103.272881],[35.649658,103.273033],[35.649212,103.273361],[35.649109,103.273376],[35.648979,103.273323],[35.64819,103.272118],[35.646919,103.271004],[35.646561,103.270851],[35.64571,103.270798],[35.645481,103.270714],[35.64291,103.267601],[35.642479,103.267113],[35.641449,103.266518],[35.640148,103.265381],[35.639851,103.26535],[35.639332,103.26561],[35.638561,103.265511],[35.638519,103.265419],[35.638618,103.265297],[35.639278,103.265327],[35.639462,103.265289],[35.640018,103.264847],[35.64048,103.264709],[35.64053,103.264664],[35.640541,103.264526],[35.640461,103.264488],[35.640331,103.264511],[35.639488,103.264816],[35.639141,103.264877],[35.63884,103.264847],[35.637539,103.264397],[35.63736,103.26413],[35.636978,103.262703],[35.636829,103.262299],[35.63596,103.260696],[35.634201,103.25956],[35.633709,103.259323],[35.633259,103.259193],[35.633369,103.258347],[35.633419,103.257973],[35.63335,103.25753],[35.632938,103.256683],[35.631889,103.254807],[35.631321,103.253601],[35.630329,103.252037],[35.629211,103.251122],[35.627739,103.249153],[35.62553,103.245537],[35.62373,103.242867],[35.622391,103.240761],[35.620541,103.236931],[35.620201,103.236359],[35.618198,103.23378],[35.617821,103.233383],[35.616402,103.232117],[35.614368,103.230057],[35.612492,103.228554],[35.61097,103.227501],[35.61018,103.22702],[35.60989,103.226784],[35.60968,103.226479],[35.609032,103.225113],[35.608459,103.223633],[35.606361,103.217888],[35.60556,103.215599],[35.605331,103.214813],[35.605228,103.214073],[35.604889,103.211906],[35.604721,103.210388],[35.60458,103.209633],[35.604149,103.206146],[35.60376,103.203613],[35.6036,103.202927],[35.603359,103.202293],[35.603119,103.201691],[35.602638,103.200798],[35.601089,103.198578],[35.600658,103.198082],[35.599781,103.197357],[35.598999,103.196541],[35.597111,103.195717],[35.596088,103.194817],[35.59544,103.194504],[35.595081,103.19426],[35.59306,103.192612],[35.592621,103.192284],[35.59185,103.191849],[35.59042,103.190697],[35.590179,103.190697],[35.58989,103.19088],[35.588188,103.19265],[35.58741,103.193542],[35.584061,103.197113],[35.582069,103.199463],[35.58186,103.199707],[35.581558,103.199982],[35.575211,103.207153],[35.57468,103.207718],[35.57449,103.207787],[35.57439,103.207703],[35.5728,103.204857],[35.57233,103.203918],[35.571621,103.201767],[35.571049,103.200562],[35.567841,103.195183],[35.566792,103.19313],[35.56625,103.191948],[35.564529,103.187828],[35.56329,103.185181],[35.562019,103.182838],[35.56052,103.180397],[35.55962,103.179077],[35.556969,103.175499],[35.55489,103.17289],[35.550018,103.166527],[35.548321,103.164391],[35.5476,103.163391],[35.546902,103.162338],[35.545528,103.16008],[35.543041,103.15567],[35.54232,103.15464],[35.541561,103.153687],[35.54073,103.152809],[35.539799,103.152023],[35.538818,103.151321],[35.535782,103.149399],[35.534851,103.148666],[35.533989,103.147789],[35.533211,103.146782],[35.532539,103.145638],[35.53196,103.14431],[35.530941,103.141441],[35.530281,103.140083],[35.529461,103.138878],[35.526112,103.134903],[35.5242,103.13282],[35.523232,103.132057],[35.521309,103.13089],[35.520531,103.130219],[35.51989,103.129433],[35.519241,103.128273],[35.51741,103.124367],[35.516689,103.1231],[35.514229,103.119591],[35.5135,103.118378],[35.512829,103.117073],[35.511581,103.114212],[35.510941,103.1129],[35.510281,103.111717],[35.509041,103.109848],[35.505951,103.106201],[35.505112,103.104973],[35.50441,103.103653],[35.50386,103.102333],[35.50346,103.101013],[35.503189,103.099716],[35.502399,103.094597],[35.502201,103.093712],[35.501808,103.092293],[35.501389,103.090981],[35.50058,103.08902],[35.499882,103.087723],[35.495811,103.081123],[35.48962,103.071373],[35.488949,103.070259],[35.488369,103.069061],[35.487919,103.067871],[35.487572,103.066711],[35.48708,103.064552],[35.486481,103.062363],[35.486,103.060966],[35.485378,103.059608],[35.484631,103.058342],[35.483799,103.05722],[35.478809,103.051376],[35.47821,103.050323],[35.477829,103.049171],[35.47768,103.047943],[35.477772,103.045326],[35.47773,103.043961],[35.47747,103.042709],[35.477051,103.041588],[35.476521,103.040527],[35.47591,103.03965],[35.47348,103.036369],[35.473091,103.035751],[35.472778,103.035004],[35.472481,103.034416],[35.47213,103.033684],[35.471741,103.03286],[35.471352,103.031998],[35.470959,103.03112],[35.47057,103.030228],[35.4702,103.029404],[35.469872,103.028671],[35.469601,103.028069],[35.469429,103.02774],[35.469158,103.027458],[35.46896,103.027069],[35.468651,103.026581],[35.46825,103.025993],[35.467819,103.025383],[35.467369,103.024727],[35.4669,103.023933],[35.466431,103.022949],[35.465912,103.021828],[35.465328,103.020729],[35.46468,103.019623],[35.464008,103.018539],[35.463291,103.017517],[35.462559,103.016533],[35.461849,103.015556],[35.46114,103.014618],[35.46048,103.013733],[35.459919,103.012947],[35.45927,103.012123],[35.458549,103.011261],[35.457821,103.010536],[35.457119,103.009933],[35.456459,103.009354],[35.45591,103.008858],[35.455589,103.008537],[35.455299,103.008209],[35.45509,103.00795],[35.454781,103.007591],[35.454411,103.007004],[35.45396,103.00631],[35.45343,103.005493],[35.452881,103.004639],[35.45229,103.003723],[35.45166,103.002747],[35.450989,103.001732],[35.450352,103.000763],[35.449749,102.999847],[35.449181,102.99894],[35.448589,102.998016],[35.448009,102.997017],[35.44743,102.995979],[35.44685,102.994904],[35.446331,102.993752],[35.44582,102.992622],[35.44537,102.991463],[35.44492,102.990227],[35.444489,102.988983],[35.44408,102.987747],[35.44368,102.986572],[35.443291,102.985443],[35.442909,102.984306],[35.442478,102.983147],[35.442039,102.982018],[35.441681,102.981148],[35.44136,102.980476],[35.440971,102.97966],[35.440491,102.978683],[35.439949,102.977654],[35.439381,102.976646],[35.43877,102.975662],[35.438099,102.97467],[35.43742,102.97364],[35.436722,102.97261],[35.436008,102.971558],[35.435322,102.970543],[35.43462,102.969528],[35.433941,102.968452],[35.4333,102.967262],[35.43269,102.966011],[35.43211,102.964684],[35.43158,102.963417],[35.431,102.962303],[35.430302,102.961357],[35.429562,102.960564],[35.428768,102.959732],[35.427952,102.958832],[35.42709,102.957909],[35.426281,102.956879],[35.425621,102.955727],[35.425098,102.954536],[35.424549,102.953484],[35.423809,102.952728],[35.422932,102.952316],[35.422001,102.952164],[35.421009,102.951927],[35.420071,102.951408],[35.419189,102.950607],[35.418491,102.94957],[35.418018,102.94838],[35.417789,102.947189],[35.417782,102.946098],[35.41782,102.945053],[35.4179,102.944054],[35.417839,102.943031],[35.417629,102.941994],[35.417309,102.94101],[35.41695,102.940071],[35.416561,102.939163],[35.416069,102.938316],[35.415401,102.937714],[35.414631,102.937431],[35.41383,102.937317],[35.413139,102.937134],[35.412491,102.936829],[35.411789,102.936691],[35.4114,102.936707],[35.411301,102.936707],[35.411072,102.93676],[35.41066,102.936859],[35.409988,102.937027],[35.409199,102.937218],[35.408352,102.937424],[35.407452,102.937622],[35.406528,102.937851],[35.405682,102.938026],[35.404869,102.937973],[35.404079,102.937561],[35.403461,102.93679],[35.403118,102.935806],[35.403011,102.934837],[35.403049,102.933891],[35.40324,102.932953],[35.403542,102.932159],[35.40387,102.931419],[35.40424,102.930603],[35.40443,102.929657],[35.404491,102.928612],[35.404388,102.927582],[35.404121,102.926682],[35.403759,102.925926],[35.403309,102.925323],[35.402802,102.92482],[35.40226,102.924454],[35.401581,102.924118],[35.400791,102.923843],[35.399948,102.923599],[35.399151,102.9235],[35.39827,102.923492],[35.39735,102.923553],[35.396461,102.923607],[35.39558,102.923599],[35.394718,102.923477],[35.39389,102.923233],[35.39307,102.922943],[35.392231,102.922623],[35.39143,102.92234],[35.39061,102.921997],[35.389771,102.921677],[35.388908,102.921349],[35.388069,102.921028],[35.387199,102.9207],[35.386341,102.920349],[35.385529,102.919762],[35.38496,102.918961],[35.384529,102.918007],[35.384071,102.917122],[35.3834,102.916473],[35.382599,102.916077],[35.38166,102.915848],[35.380772,102.915627],[35.37994,102.915367],[35.379131,102.915009],[35.378422,102.914597],[35.377838,102.914192],[35.37468,102.90918],[35.374611,102.908829],[35.374439,102.908287],[35.374298,102.907402],[35.374321,102.906273],[35.374531,102.905228],[35.37495,102.904221],[35.375511,102.903107],[35.3759,102.90184],[35.375999,102.900543],[35.375912,102.899307],[35.375759,102.898193],[35.37561,102.897133],[35.375469,102.89608],[35.375301,102.894974],[35.374969,102.893929],[35.374378,102.89315],[35.37368,102.892708],[35.372768,102.892517],[35.371868,102.892357],[35.370911,102.892181],[35.36985,102.891998],[35.368778,102.891777],[35.367809,102.891579],[35.366951,102.891083],[35.366268,102.890213],[35.365891,102.889053],[35.365669,102.888008],[35.36544,102.887177],[35.36515,102.886414],[35.36488,102.885513],[35.36478,102.884354],[35.364731,102.883034],[35.364552,102.88176],[35.364288,102.880661],[35.364029,102.879623],[35.363899,102.878464],[35.364021,102.877327],[35.364441,102.876213],[35.364979,102.875038],[35.365551,102.873749],[35.366169,102.872398],[35.366798,102.870979],[35.36742,102.869614],[35.368019,102.868248],[35.368549,102.866814],[35.368858,102.865257],[35.368961,102.86364],[35.368801,102.862106],[35.368431,102.860733],[35.368,102.859467],[35.367599,102.858261],[35.36639,102.854156],[35.365791,102.853081],[35.364971,102.852219],[35.363811,102.851501],[35.363041,102.850388],[35.362431,102.84906],[35.362061,102.847656],[35.36227,102.846184],[35.362411,102.844818],[35.36026,102.837929],[35.359489,102.837067],[35.35873,102.836166],[35.35833,102.834877],[35.358231,102.833473],[35.35804,102.83223],[35.357498,102.831139],[35.35677,102.830231],[35.35622,102.829117],[35.355942,102.827766],[35.355701,102.826424],[35.35524,102.825127],[35.35461,102.823883],[35.35376,102.822739],[35.352798,102.821808],[35.35183,102.821068],[35.35104,102.820137],[35.350651,102.81884],[35.350788,102.81739],[35.35146,102.816071],[35.352291,102.814774],[35.352989,102.813347],[35.353378,102.811852],[35.353401,102.810509],[35.353149,102.809212],[35.35268,102.807991],[35.35199,102.806923],[35.351181,102.805923],[35.35033,102.804901],[35.349461,102.803833],[35.348579,102.802696],[35.347729,102.801422],[35.346909,102.800049],[35.346119,102.798599],[35.34531,102.797157],[35.344509,102.795769],[35.34375,102.794441],[35.342979,102.793121],[35.342239,102.791832],[35.341431,102.790657],[35.34045,102.789818],[35.339298,102.789383],[35.3381,102.789253],[35.336971,102.789108],[35.33593,102.788727],[35.334961,102.787979],[35.334099,102.786957],[35.333279,102.785858],[35.332409,102.784927],[35.331421,102.784317],[35.330471,102.784027],[35.329521,102.783981],[35.32848,102.783913],[35.3274,102.783783],[35.326351,102.783684],[35.325291,102.783577],[35.32428,102.783379],[35.32341,102.782951],[35.322651,102.782417],[35.321892,102.781883],[35.32111,102.781273],[35.320259,102.780647],[35.319302,102.779938],[35.318272,102.779167],[35.317268,102.778442],[35.316319,102.777733],[35.31538,102.777039],[35.314579,102.776443],[35.313789,102.775848],[35.313019,102.775261],[35.31218,102.774643],[35.311279,102.773972],[35.310329,102.773247],[35.309299,102.772476],[35.308281,102.771721],[35.30727,102.770973],[35.306221,102.770241],[35.305149,102.76963],[35.303982,102.769386],[35.302799,102.769669],[35.301762,102.770378],[35.300961,102.771469],[35.300449,102.772797],[35.300171,102.774277],[35.29998,102.775772],[35.29966,102.777222],[35.299042,102.778503],[35.298061,102.779442],[35.29686,102.779953],[35.29562,102.780006],[35.294418,102.77993],[35.293289,102.779846],[35.292091,102.779808],[35.290871,102.780098],[35.289761,102.780853],[35.288792,102.781937],[35.287811,102.783127],[35.286819,102.784317],[35.285671,102.785278],[35.284519,102.785851],[35.283691,102.786346],[35.282909,102.786987],[35.28215,102.787903],[35.281509,102.789078],[35.28088,102.790298],[35.27998,102.791092],[35.279041,102.791397],[35.278191,102.791832],[35.277489,102.792702],[35.276871,102.793739],[35.27599,102.794518],[35.275082,102.795197],[35.274281,102.796066],[35.273659,102.797142],[35.27285,102.797981],[35.271969,102.798538],[35.27113,102.799278],[35.270439,102.800369],[35.27002,102.801697],[35.269691,102.803078],[35.269009,102.804176],[35.26833,102.80526],[35.267719,102.806412],[35.267151,102.807663],[35.26646,102.808907],[35.265461,102.809837],[35.26432,102.810318],[35.263149,102.810349],[35.262001,102.810471],[35.260948,102.810944],[35.260021,102.811798],[35.259159,102.813004],[35.258171,102.814133],[35.256962,102.81472],[35.255711,102.814743],[35.254459,102.814583],[35.253288,102.814636],[35.252251,102.815086],[35.251461,102.81588],[35.250809,102.81662],[35.25013,102.817413],[35.24934,102.818222],[35.248451,102.819069],[35.247459,102.819939],[35.246399,102.820847],[35.2453,102.821823],[35.24419,102.822777],[35.243111,102.823723],[35.24213,102.824547],[35.241241,102.825233],[35.240318,102.825447],[35.23938,102.825203],[35.238338,102.824837],[35.237228,102.824516],[35.23616,102.824661],[35.235271,102.82534],[35.23457,102.826111],[35.23394,102.826828],[35.23325,102.827423],[35.232368,102.827667],[35.23151,102.827499],[35.230751,102.826981],[35.22998,102.826317],[35.229229,102.825653],[35.2285,102.825111],[35.227921,102.824867],[35.227428,102.824753],[35.226891,102.824638],[35.226311,102.824516],[35.225788,102.824364],[35.2253,102.824142],[35.224899,102.823929],[35.224579,102.823761],[35.224289,102.823593],[35.223721,102.823593],[35.223019,102.824867],[35.22028,102.823959],[35.219189,102.82222],[35.219341,102.820396],[35.217682,102.819847],[35.216991,102.819962],[35.216461,102.820084],[35.216099,102.820137],[35.21553,102.820168],[35.214588,102.82019],[35.212101,102.820183],[35.211349,102.820267],[35.210251,102.820648],[35.209091,102.821487],[35.20895,102.821457],[35.20776,102.822563],[35.207409,102.822762],[35.206841,102.82299],[35.20562,102.823189],[35.205009,102.823189],[35.203999,102.823151],[35.20266,102.82312],[35.20145,102.822144],[35.19294,102.825737],[35.191181,102.825211],[35.18959,102.824623],[35.18874,102.823799],[35.187778,102.822731],[35.187222,102.822189],[35.186218,102.821831],[35.18605,102.821823],[35.185322,102.821877],[35.184959,102.821877],[35.184441,102.821777],[35.18425,102.821716],[35.182701,102.820602],[35.182388,102.82045],[35.181721,102.820358],[35.180901,102.820633],[35.180462,102.820976],[35.180199,102.821297],[35.17981,102.822037],[35.179729,102.822243],[35.179531,102.822861],[35.17952,102.824043],[35.177551,102.824539],[35.176521,102.824928],[35.169189,102.832947],[35.168301,102.831947],[35.167881,102.832352],[35.16703,102.833344],[35.166321,102.834084],[35.165489,102.834763],[35.164631,102.835503],[35.16338,102.836906],[35.162361,102.838348],[35.16256,102.839882],[35.156368,102.845108],[35.15435,102.845139],[35.153439,102.845741],[35.152439,102.846649],[35.15229,102.846764],[35.151039,102.847153],[35.14999,102.847733],[35.148682,102.84922],[35.144951,102.850227],[35.143131,102.848869],[35.142151,102.848541],[35.140621,102.848083],[35.1395,102.847763],[35.138168,102.847656],[35.137821,102.847679],[35.136589,102.847939],[35.13625,102.848083],[35.134949,102.848778],[35.13311,102.849907],[35.130322,102.850929],[35.12952,102.851608],[35.128719,102.85257],[35.127361,102.853859],[35.126019,102.855324],[35.114201,102.858513],[35.114029,102.860222],[35.113811,102.860641],[35.11343,102.861794],[35.11274,102.863426],[35.111851,102.86483],[35.110458,102.866867],[35.110008,102.867348],[35.108829,102.868202],[35.106941,102.869392],[35.1059,102.870377],[35.105209,102.871582],[35.104801,102.872726],[35.10276,102.878822],[35.101971,102.881264],[35.101219,102.882874],[35.100349,102.884193],[35.09911,102.886208],[35.09874,102.887062],[35.098228,102.888268],[35.097759,102.889137],[35.09724,102.889877],[35.096531,102.890739],[35.09597,102.891609],[35.095181,102.893143],[35.094181,102.894974],[35.093029,102.896812],[35.09185,102.898552],[35.091179,102.899857],[35.09074,102.90136],[35.09066,102.902786],[35.090691,102.903732],[35.090698,102.904198],[35.090401,102.905327],[35.090199,102.905724],[35.089939,102.906036],[35.089359,102.906487],[35.088699,102.906723],[35.088348,102.906731],[35.08746,102.906471],[35.086861,102.906021],[35.085949,102.905281],[35.085789,102.905167],[35.084629,102.90464],[35.084122,102.904533],[35.083241,102.904503],[35.08252,102.904678],[35.082439,102.905113],[35.080551,102.905243],[35.080002,102.905342],[35.07943,102.905388],[35.078529,102.905533],[35.077862,102.905724],[35.07674,102.906197],[35.076092,102.906303],[35.075779,102.906281],[35.075321,102.906151],[35.074951,102.905998],[35.074261,102.905907],[35.073589,102.905968],[35.073021,102.906273],[35.0728,102.906464],[35.07222,102.907021],[35.07185,102.907333],[35.070881,102.907707],[35.07037,102.90773],[35.069679,102.907471],[35.069519,102.907372],[35.06921,102.907112],[35.06815,102.905968],[35.067699,102.905647],[35.066841,102.905418],[35.066139,102.905472],[35.065319,102.905853],[35.06353,102.906998],[35.060638,102.908791],[35.059471,102.909378],[35.05872,102.909523],[35.057129,102.909554],[35.05666,102.909569],[35.055828,102.909561],[35.055069,102.909683],[35.05476,102.909767],[35.054298,102.909988],[35.053692,102.910393],[35.053219,102.910629],[35.052132,102.911293],[35.05164,102.911552],[35.051029,102.911957],[35.050388,102.9123],[35.049751,102.912727],[35.049061,102.913116],[35.0485,102.913307],[35.047729,102.91349],[35.04673,102.913612],[35.045731,102.913612],[35.045341,102.913628],[35.04422,102.91391],[35.043549,102.914284],[35.043388,102.914413],[35.042709,102.915176],[35.042332,102.915733],[35.041721,102.916733],[35.04084,102.918243],[35.040649,102.918663],[35.04018,102.919487],[35.03981,102.920067],[35.039669,102.920258],[35.038979,102.920837],[35.034828,102.92321],[35.034069,102.923576],[35.033489,102.923683],[35.032349,102.923714],[35.031311,102.924141],[35.03067,102.924637],[35.030319,102.92485],[35.029362,102.925087],[35.028751,102.925011],[35.027981,102.924629],[35.02702,102.924057],[35.02623,102.923759],[35.025589,102.923683],[35.025311,102.923691],[35.02446,102.924072],[35.023602,102.924522],[35.023251,102.924591],[35.022881,102.924622],[35.022148,102.924583],[35.021389,102.924629],[35.020828,102.924843],[35.020691,102.924896],[35.020302,102.925171],[35.019508,102.925797],[35.018921,102.926018],[35.017399,102.926132],[35.017029,102.926201],[35.01582,102.92659],[35.015659,102.926613],[35.014999,102.926613],[35.0144,102.926361],[35.01395,102.926071],[35.013599,102.925758],[35.01334,102.925507],[35.01223,102.924316],[35.011372,102.923477],[35.010792,102.922783],[35.010441,102.922287],[35.01025,102.921921],[35.01001,102.921494],[35.00967,102.9207],[35.008801,102.918907],[35.008308,102.917824],[35.007332,102.915756],[35.005859,102.912498],[35.00528,102.91127],[35.004841,102.910263],[35.004608,102.909851],[35.00452,102.909607],[35.00441,102.909309],[35.004002,102.908371],[35.003311,102.906532],[35.002911,102.905418],[35.00272,102.904968],[35.002331,102.904541],[35.00214,102.904472],[35.001499,102.904503],[35.000359,102.904617],[34.999981,102.904694],[34.998661,102.905273],[34.99477,102.905273],[34.993271,102.904968],[34.993111,102.906036],[34.993172,102.906326],[34.993172,102.906883],[34.993061,102.907677],[34.992901,102.9077],[34.992901,102.907707],[34.99292,102.907784],[34.992962,102.908218],[34.993011,102.908371],[34.99297,102.908592],[34.992722,102.908707],[34.99202,102.90873],[34.990101,102.908607],[34.989811,102.908546],[34.98624,102.908333],[34.97057,102.907372],[34.970188,102.907257],[34.96883,102.907173],[34.968571,102.907097],[34.968449,102.906738],[34.968349,102.906082],[34.96822,102.905457],[34.967999,102.904533],[34.967899,102.904167],[34.967709,102.903862],[34.967522,102.903618],[34.967319,102.90345],[34.966942,102.903412],[34.96677,102.903374],[34.966469,102.903259],[34.966099,102.903061],[34.965698,102.902763],[34.96529,102.902351],[34.965,102.90197],[34.964722,102.90155],[34.96365,102.899529],[34.96339,102.899071],[34.96312,102.898552],[34.962379,102.897202],[34.961761,102.896187],[34.961559,102.895844],[34.961151,102.895271],[34.960979,102.894951],[34.96072,102.894524],[34.960529,102.894287],[34.960339,102.893967],[34.958981,102.892014],[34.958031,102.890839],[34.957039,102.889557],[34.956711,102.889183],[34.954849,102.886749],[34.954552,102.886398],[34.95417,102.885887],[34.953442,102.884987],[34.95295,102.884338],[34.95298,102.884361],[34.952621,102.883888],[34.95232,102.883553],[34.950809,102.881683],[34.949909,102.880409],[34.949902,102.880363],[34.949459,102.879562],[34.949249,102.879082],[34.948891,102.878151],[34.94838,102.876427],[34.94825,102.875931],[34.94809,102.875397],[34.947899,102.874863],[34.947491,102.873863],[34.94685,102.872551],[34.946629,102.872147],[34.945992,102.871132],[34.945702,102.870758],[34.945068,102.870163],[34.944729,102.869919],[34.944359,102.869698],[34.94392,102.869476],[34.943031,102.869164],[34.9426,102.86898],[34.94141,102.868584],[34.940441,102.868263],[34.940182,102.868202],[34.94017,102.868172],[34.93821,102.867638],[34.92548,102.864548],[34.924671,102.864166],[34.924419,102.864082],[34.924049,102.864014],[34.923771,102.863907],[34.921612,102.863007],[34.920521,102.862503],[34.919701,102.862137],[34.919361,102.862007],[34.919041,102.861908],[34.91869,102.861847],[34.917961,102.861893],[34.917591,102.861954],[34.91721,102.862061],[34.916382,102.862396],[34.915192,102.862839],[34.91394,102.863182],[34.90559,102.863182],[34.905281,102.86306],[34.90493,102.862877],[34.904579,102.86264],[34.904289,102.862381],[34.90379,102.861794],[34.903591,102.861473],[34.903091,102.860428],[34.902969,102.860107],[34.902748,102.859421],[34.90255,102.858582],[34.902401,102.857788],[34.90229,102.856934],[34.90226,102.855743],[34.902302,102.854851],[34.902699,102.843513],[34.902748,102.843033],[34.902802,102.842773],[34.902882,102.842484],[34.902969,102.842239],[34.903091,102.841988],[34.903259,102.841743],[34.90345,102.841476],[34.903641,102.841309],[34.903839,102.841148],[34.90427,102.840889],[34.90451,102.840767],[34.904919,102.840477],[34.90519,102.840347],[34.90554,102.840111],[34.905949,102.839867],[34.9062,102.839684],[34.906399,102.8395],[34.906651,102.839073],[34.90675,102.838837],[34.906841,102.838516],[34.906841,102.838203],[34.906799,102.837883],[34.906731,102.837639],[34.906609,102.837341],[34.906422,102.837128],[34.9062,102.836983],[34.905891,102.836929],[34.905659,102.837013],[34.905479,102.837128],[34.905289,102.837334],[34.904961,102.837769],[34.9048,102.837929],[34.90456,102.838112],[34.904369,102.838158],[34.90416,102.838158],[34.90387,102.838058],[34.903702,102.837914],[34.903561,102.8377],[34.90345,102.83744],[34.9034,102.837181],[34.903358,102.8367],[34.903389,102.834],[34.90337,102.833641],[34.903309,102.833313],[34.90316,102.833023],[34.902889,102.832733],[34.902481,102.832588],[34.902111,102.83255],[34.901699,102.832443],[34.90139,102.832268],[34.901291,102.832199],[34.90126,102.832207],[34.900959,102.832062],[34.90073,102.831909],[34.900188,102.831413],[34.899799,102.830994],[34.899551,102.830391],[34.89954,102.829742],[34.89975,102.828796],[34.900291,102.826729],[34.900459,102.826141],[34.900791,102.825249],[34.901192,102.824402],[34.901939,102.823067],[34.902519,102.821953],[34.902809,102.820869],[34.902828,102.820053],[34.90266,102.818581],[34.90242,102.817253],[34.902142,102.816521],[34.90155,102.816017],[34.901119,102.815987],[34.90094,102.816032],[34.900219,102.81646],[34.89735,102.818604],[34.89658,102.819038],[34.896309,102.81913],[34.895592,102.81926],[34.89455,102.81913],[34.894299,102.819038],[34.894279,102.819054],[34.893848,102.818817],[34.891331,102.817307],[34.890549,102.816818],[34.88974,102.816223],[34.889099,102.81562],[34.88662,102.813263],[34.885929,102.812698],[34.885239,102.812553],[34.883179,102.812737],[34.882179,102.812881],[34.881531,102.813217],[34.880081,102.814484],[34.879219,102.815117],[34.87833,102.815407],[34.876251,102.815826],[34.87524,102.816177],[34.87442,102.816704],[34.8736,102.817513],[34.871979,102.819473],[34.871269,102.820374],[34.87011,102.822029],[34.868389,102.825363],[34.8675,102.827492],[34.867031,102.82843],[34.866348,102.829491],[34.865631,102.830368],[34.86274,102.833412],[34.862671,102.833473],[34.862171,102.833946],[34.861832,102.834343],[34.86105,102.835129],[34.8605,102.835587],[34.859859,102.836037],[34.859131,102.836388],[34.85902,102.836411],[34.85841,102.836441],[34.856838,102.836319],[34.85606,102.836372],[34.855518,102.83654],[34.854542,102.836899],[34.85199,102.837784],[34.851212,102.838028],[34.850399,102.838058],[34.849541,102.837807],[34.847771,102.83709],[34.846642,102.836693],[34.845551,102.836502],[34.84444,102.836479],[34.84346,102.836617],[34.842529,102.836884],[34.838779,102.838303],[34.837971,102.838623],[34.836941,102.838989],[34.836239,102.839203],[34.835381,102.839401],[34.834461,102.839531],[34.83366,102.839577],[34.832821,102.839577],[34.83197,102.8395],[34.831059,102.839348],[34.830219,102.839012],[34.82938,102.838501],[34.8284,102.837921],[34.827801,102.837502],[34.828339,102.837227],[34.8283,102.836708],[34.827179,102.836128],[34.827049,102.835678],[34.826839,102.834747],[34.826328,102.83239],[34.82626,102.831909],[34.826221,102.831367],[34.825481,102.809509],[34.82452,102.804512],[34.824749,102.800652],[34.82336,102.796608],[34.823029,102.794762],[34.822659,102.792732],[34.82222,102.790337],[34.82225,102.789932],[34.82235,102.789238],[34.822399,102.788689],[34.822479,102.788254],[34.822819,102.78569],[34.82291,102.78476],[34.822922,102.784363],[34.822948,102.783829],[34.82283,102.782516],[34.822781,102.782173],[34.822762,102.781914],[34.822659,102.781242],[34.822479,102.78022],[34.822361,102.77935],[34.822289,102.778992],[34.822231,102.77858],[34.8218,102.77594],[34.82169,102.775124],[34.82148,102.773903],[34.821281,102.772614],[34.821251,102.772308],[34.821159,102.771797],[34.82077,102.769218],[34.820641,102.768478],[34.820499,102.767776],[34.82032,102.767067],[34.82,102.766113],[34.81992,102.765938],[34.81881,102.76329],[34.817699,102.760696],[34.817261,102.759697],[34.816891,102.758812],[34.816559,102.758057],[34.816399,102.757668],[34.816101,102.757004],[34.815361,102.755127],[34.81501,102.754242],[34.814602,102.753212],[34.814301,102.752411],[34.81414,102.752022],[34.814011,102.751694],[34.813309,102.749931],[34.812111,102.746841],[34.81181,102.746033],[34.811581,102.745331],[34.811359,102.744476],[34.811249,102.743782],[34.811211,102.743439],[34.811161,102.743103],[34.811131,102.742279],[34.81115,102.741661],[34.811211,102.740913],[34.81134,102.740082],[34.81142,102.739647],[34.811649,102.738876],[34.811939,102.738121],[34.812569,102.736847],[34.812939,102.736191],[34.813702,102.734894],[34.81395,102.734512],[34.814281,102.73394],[34.814442,102.733627],[34.814701,102.733047],[34.814831,102.732674],[34.814941,102.732277],[34.815048,102.731667],[34.815029,102.731659],[34.815189,102.730492],[34.81522,102.730164],[34.815319,102.729599],[34.815411,102.728943],[34.81546,102.72863],[34.815491,102.728317],[34.815609,102.727676],[34.815632,102.727371],[34.815681,102.727142],[34.815811,102.726151],[34.81591,102.725548],[34.815979,102.724693],[34.815971,102.723831],[34.815922,102.723358],[34.81583,102.722801],[34.815731,102.722366],[34.81546,102.72139],[34.813671,102.702057],[34.813679,102.701981],[34.813641,102.701767],[34.813622,102.701439],[34.81358,102.701263],[34.81353,102.700867],[34.81329,102.699417],[34.813221,102.699097],[34.813171,102.698761],[34.812931,102.697617],[34.812698,102.696899],[34.81258,102.696678],[34.81245,102.696259],[34.811798,102.69503],[34.810711,102.6931],[34.80978,102.691353],[34.80933,102.69059],[34.808609,102.689217],[34.807819,102.687881],[34.807301,102.687149],[34.806492,102.686287],[34.806389,102.68618],[34.805779,102.685753],[34.804722,102.685097],[34.80024,102.682579],[34.798962,102.681671],[34.798031,102.68074],[34.797771,102.68045],[34.796791,102.679237],[34.795681,102.677917],[34.794701,102.676682],[34.793739,102.675369],[34.792339,102.673683],[34.79084,102.672112],[34.790329,102.671608],[34.789688,102.671013],[34.78886,102.67012],[34.7882,102.669006],[34.787392,102.667397],[34.786709,102.666054],[34.786228,102.665031],[34.785648,102.663887],[34.785099,102.662712],[34.784191,102.660843],[34.783691,102.659462],[34.783642,102.659241],[34.783249,102.657211],[34.783051,102.656487],[34.782711,102.65522],[34.782429,102.653969],[34.781731,102.651283],[34.781391,102.649628],[34.78133,102.647057],[34.7812,102.644676],[34.781181,102.643707],[34.781181,102.641258],[34.78093,102.639847],[34.780602,102.638451],[34.78027,102.637558],[34.779869,102.636703],[34.77692,102.631866],[34.77594,102.630173],[34.775299,102.629143],[34.774818,102.628311],[34.774311,102.627243],[34.773731,102.625763],[34.773201,102.624527],[34.77282,102.623756],[34.77142,102.62188],[34.77108,102.621521],[34.770821,102.621147],[34.77055,102.620667],[34.770279,102.620064],[34.769798,102.619324],[34.769329,102.618683],[34.767971,102.617058],[34.767368,102.616386],[34.766109,102.615143],[34.765209,102.614143],[34.764912,102.613869],[34.764641,102.613586],[34.763229,102.611977],[34.762489,102.611],[34.76207,102.610291],[34.761742,102.609581],[34.76152,102.6092],[34.760941,102.608047],[34.759949,102.60598],[34.75972,102.605438],[34.75909,102.604111],[34.75845,102.603073],[34.75753,102.601501],[34.756649,102.600288],[34.75621,102.599533],[34.75499,102.597313],[34.75415,102.595909],[34.753601,102.594887],[34.753201,102.593872],[34.753159,102.593674],[34.75293,102.591904],[34.752861,102.590759],[34.752949,102.589401],[34.753078,102.588303],[34.75351,102.586922],[34.75565,102.579758],[34.75584,102.578217],[34.755981,102.576653],[34.756039,102.576088],[34.75629,102.574623],[34.7565,102.57196],[34.756531,102.571327],[34.75676,102.568359],[34.756779,102.567932],[34.75708,102.564949],[34.757191,102.564148],[34.757309,102.563568],[34.75753,102.56205],[34.757702,102.560501],[34.757729,102.559914],[34.75769,102.55909],[34.757641,102.558891],[34.75716,102.557549],[34.756889,102.557037],[34.75618,102.556236],[34.755322,102.55571],[34.754429,102.555428],[34.753979,102.555321],[34.752979,102.555206],[34.750229,102.554993],[34.749149,102.554863],[34.74852,102.554703],[34.747108,102.554283],[34.746811,102.554123],[34.746132,102.55365],[34.745998,102.553543],[34.745251,102.552658],[34.74506,102.55217],[34.744949,102.55172],[34.744862,102.551529],[34.74464,102.550888],[34.744049,102.549103],[34.743271,102.547394],[34.742561,102.546082],[34.74268,102.54583],[34.74239,102.545258],[34.742222,102.544983],[34.741859,102.544289],[34.741718,102.543991],[34.74144,102.54348],[34.740608,102.541634],[34.740349,102.540916],[34.739979,102.539757],[34.739399,102.537689],[34.73888,102.535637],[34.73838,102.533928],[34.738071,102.532784],[34.73782,102.531952],[34.737358,102.530571],[34.73682,102.529381],[34.73637,102.52861],[34.736069,102.528183],[34.73502,102.526894],[34.73431,102.526207],[34.733829,102.525833],[34.73296,102.525223],[34.732029,102.524673],[34.731319,102.524223],[34.726311,102.521217],[34.723518,102.519577],[34.722172,102.518883],[34.72105,102.518623],[34.719391,102.51841],[34.717651,102.518143],[34.717461,102.518097],[34.71558,102.517487],[34.71307,102.51667],[34.709629,102.515488],[34.708309,102.515083],[34.707741,102.514877],[34.70652,102.51416],[34.705318,102.513],[34.704071,102.511543],[34.703339,102.510597],[34.70274,102.509758],[34.702259,102.508583],[34.70203,102.507317],[34.70182,102.505287],[34.701599,102.502953],[34.70126,102.500847],[34.700729,102.498833],[34.700359,102.49704],[34.700291,102.49659],[34.700001,102.494347],[34.699799,102.493042],[34.69915,102.491188],[34.698078,102.490112],[34.696999,102.489166],[34.695801,102.488373],[34.69511,102.488029],[34.694759,102.4879],[34.69408,102.487679],[34.692692,102.487457],[34.690979,102.487511],[34.689369,102.487808],[34.68774,102.488319],[34.685471,102.489143],[34.683971,102.489433],[34.68269,102.489357],[34.682259,102.489273],[34.68082,102.488647],[34.679729,102.487808],[34.678478,102.486389],[34.67598,102.483437],[34.674229,102.4813],[34.67318,102.479584],[34.672508,102.4786],[34.67181,102.478119],[34.671429,102.477966],[34.671051,102.477898],[34.668739,102.477768],[34.667679,102.477547],[34.667271,102.477371],[34.665409,102.476357],[34.664761,102.476143],[34.662941,102.475693],[34.66077,102.475197],[34.659939,102.474907],[34.659328,102.474617],[34.65836,102.47403],[34.657051,102.473282],[34.65633,102.472839],[34.655609,102.472458],[34.654861,102.472214],[34.65448,102.472153],[34.654079,102.47213],[34.653461,102.472183],[34.651669,102.47242],[34.650768,102.472382],[34.6492,102.472054],[34.648781,102.471931],[34.647369,102.471687],[34.646561,102.471687],[34.64637,102.471703],[34.64497,102.472054],[34.64394,102.472504],[34.642288,102.473297],[34.640911,102.473801],[34.640308,102.473846],[34.63929,102.473633],[34.638321,102.473129],[34.636902,102.472618],[34.635311,102.472473],[34.633961,102.472221],[34.633759,102.472153],[34.63192,102.471359],[34.629452,102.470207],[34.628571,102.469833],[34.627731,102.469353],[34.626911,102.468842],[34.626579,102.468613],[34.624931,102.467598],[34.62447,102.467377],[34.623749,102.467003],[34.620998,102.465317],[34.619572,102.464363],[34.617699,102.462662],[34.617031,102.462303],[34.6161,102.461952],[34.61515,102.461853],[34.61438,102.461983],[34.61335,102.46241],[34.612289,102.463211],[34.611771,102.463799],[34.611141,102.464928],[34.610661,102.466003],[34.610538,102.466187],[34.610062,102.46682],[34.609459,102.467216],[34.608841,102.467323],[34.608318,102.467293],[34.607849,102.467133],[34.607441,102.466827],[34.606098,102.465607],[34.605228,102.464577],[34.60186,102.460617],[34.601051,102.459717],[34.59996,102.458519],[34.597759,102.456078],[34.597462,102.455803],[34.59639,102.455307],[34.595989,102.455292],[34.595409,102.455429],[34.594521,102.455887],[34.594219,102.456169],[34.593861,102.456657],[34.59367,102.45694],[34.593369,102.457336],[34.593029,102.45787],[34.591129,102.46077],[34.588699,102.464363],[34.58794,102.46537],[34.58733,102.46595],[34.586712,102.466316],[34.58577,102.46666],[34.584919,102.466667],[34.584469,102.466583],[34.583969,102.466507],[34.582829,102.466202],[34.582531,102.466187],[34.582298,102.466118],[34.58157,102.466019],[34.578449,102.46534],[34.577202,102.464851],[34.575939,102.464088],[34.574711,102.463013],[34.573879,102.461967],[34.573132,102.460823],[34.570789,102.456993],[34.56992,102.455521],[34.568779,102.454231],[34.567451,102.453133],[34.56498,102.451134],[34.563641,102.449997],[34.56292,102.44928],[34.56282,102.449142],[34.56234,102.448418],[34.560749,102.445572],[34.55888,102.442146],[34.558361,102.441238],[34.556309,102.437523],[34.555641,102.436447],[34.55505,102.435829],[34.554169,102.435059],[34.553329,102.434258],[34.552429,102.432999],[34.55085,102.430573],[34.549931,102.429123],[34.549271,102.428207],[34.548389,102.427467],[34.547298,102.426773],[34.546532,102.425888],[34.546001,102.424759],[34.54562,102.423302],[34.545071,102.421654],[34.544369,102.420593],[34.54319,102.419388],[34.542789,102.418854],[34.542461,102.418289],[34.542191,102.417671],[34.541901,102.41658],[34.54158,102.414993],[34.541168,102.413979],[34.540581,102.413132],[34.53854,102.410606],[34.537159,102.408981],[34.536518,102.408287],[34.53492,102.407066],[34.53458,102.406693],[34.53373,102.405434],[34.53315,102.404007],[34.532421,102.40184],[34.531719,102.400589],[34.53067,102.399391],[34.52882,102.397598],[34.52821,102.396782],[34.526871,102.394547],[34.525902,102.39312],[34.525051,102.392174],[34.523788,102.390823],[34.522869,102.389793],[34.521931,102.388527],[34.52145,102.38765],[34.520679,102.386192],[34.519939,102.384987],[34.519279,102.384018],[34.518421,102.382797],[34.517941,102.38208],[34.516659,102.380219],[34.515621,102.378754],[34.514771,102.376633],[34.50613,102.368523],[34.505322,102.366173],[34.5037,102.363876],[34.501049,102.359802],[34.500092,102.358276],[34.49889,102.3563],[34.497841,102.354683],[34.496971,102.353416],[34.495789,102.352112],[34.494671,102.351784],[34.48978,102.338341],[34.490662,102.336861],[34.490559,102.335258],[34.490429,102.333649],[34.490398,102.333054],[34.490261,102.331688],[34.490219,102.330711],[34.490131,102.329948],[34.489769,102.328743],[34.4893,102.32785],[34.488739,102.327042],[34.487259,102.325104],[34.48687,102.324623],[34.486191,102.323677],[34.485748,102.322968],[34.485409,102.32235],[34.485249,102.322037],[34.48457,102.320282],[34.483841,102.318626],[34.480789,102.313278],[34.479919,102.311729],[34.478199,102.308777],[34.477699,102.308037],[34.477131,102.307373],[34.47683,102.307083],[34.476021,102.306396],[34.472462,102.303352],[34.471939,102.302994],[34.47176,102.302872],[34.470989,102.302498],[34.470181,102.302277],[34.469139,102.302208],[34.468719,102.302254],[34.46809,102.302391],[34.467178,102.303284],[34.466572,102.302879],[34.465462,102.303436],[34.464691,102.303574],[34.46426,102.303612],[34.463089,102.303551],[34.462589,102.303452],[34.461342,102.302994],[34.460819,102.30275],[34.455811,102.300583],[34.45499,102.30027],[34.45414,102.300056],[34.453041,102.299957],[34.450451,102.300034],[34.44627,102.300171],[34.445278,102.300171],[34.44389,102.299896],[34.441971,102.299477],[34.439621,102.298927],[34.431759,102.297218],[34.429379,102.296806],[34.426949,102.296707],[34.426071,102.296623],[34.425629,102.296516],[34.424591,102.296173],[34.42358,102.295723],[34.42215,102.295219],[34.421108,102.295021],[34.419628,102.294083],[34.41708,102.29528],[34.413521,102.295677],[34.410141,102.296028],[34.40892,102.29612],[34.398399,102.297173],[34.394421,102.297592],[34.393822,102.297684],[34.392269,102.298111],[34.38921,102.299088],[34.38755,102.299583],[34.38662,102.299812],[34.382931,102.300613],[34.380459,102.301064],[34.379219,102.301178],[34.378189,102.301247],[34.37674,102.301529],[34.372559,102.302727],[34.370708,102.303192],[34.369881,102.303368],[34.364689,102.304161],[34.363022,102.304207],[34.359451,102.303726],[34.358231,102.303619],[34.357208,102.303612],[34.353741,102.303864],[34.352852,102.303909],[34.35051,102.304108],[34.350021,102.304199],[34.349758,102.304291],[34.348721,102.304733],[34.347759,102.305511],[34.346939,102.306488],[34.34655,102.307022],[34.346069,102.307747],[34.345402,102.308563],[34.344791,102.309082],[34.344631,102.309189],[34.34396,102.309593],[34.343269,102.309853],[34.34251,102.310028],[34.341579,102.310066],[34.338428,102.3097],[34.33593,102.309433],[34.33326,102.309067],[34.33086,102.308769],[34.32967,102.30835],[34.329151,102.307983],[34.328819,102.307709],[34.32795,102.306801],[34.327499,102.306381],[34.326248,102.305489],[34.325771,102.305237],[34.325089,102.304947],[34.32362,102.304588],[34.32235,102.30468],[34.321461,102.304947],[34.319901,102.305779],[34.318371,102.30661],[34.31649,102.307579],[34.31612,102.307793],[34.315159,102.308479],[34.313511,102.309837],[34.310379,102.312492],[34.308121,102.314293],[34.305241,102.316673],[34.303188,102.318352],[34.301781,102.319527],[34.297661,102.322906],[34.296581,102.323822],[34.29166,102.327873],[34.291111,102.328346],[34.289768,102.329712],[34.288582,102.331207],[34.280128,102.343491],[34.27388,102.352661],[34.27211,102.355057],[34.270851,102.356216],[34.268822,102.357643],[34.266102,102.359451],[34.262959,102.361519],[34.26181,102.362518],[34.260311,102.364166],[34.257961,102.366676],[34.248569,102.377083],[34.247108,102.378723],[34.24577,102.38015],[34.244541,102.381317],[34.24242,102.383034],[34.23119,102.391983],[34.222839,102.39859],[34.221378,102.399857],[34.220169,102.401161],[34.218891,102.402946],[34.215382,102.408546],[34.213509,102.411499],[34.20911,102.417763],[34.20789,102.418282],[34.207649,102.419868],[34.205429,102.422913],[34.204109,102.424973],[34.203629,102.426666],[34.203098,102.428757],[34.20248,102.432091],[34.20042,102.442657],[34.197849,102.456253],[34.1973,102.459023],[34.19706,102.460426],[34.196369,102.464111],[34.196129,102.466629],[34.195629,102.474739],[34.195271,102.477531],[34.193829,102.483788],[34.1926,102.486267],[34.19241,102.489609],[34.191132,102.493523],[34.189491,102.497711],[34.189571,102.501793],[34.188831,102.504898],[34.188229,102.508217],[34.18763,102.509987],[34.186218,102.515877],[34.185211,102.520317],[34.183899,102.525864],[34.183189,102.528763],[34.182529,102.531616],[34.181938,102.534042],[34.181278,102.536423],[34.180641,102.538559],[34.179699,102.541634],[34.17907,102.5439],[34.178169,102.546806],[34.177151,102.550217],[34.176739,102.55175],[34.176121,102.553719],[34.175461,102.555748],[34.17477,102.557159],[34.17395,102.558182],[34.17289,102.558884],[34.171749,102.559273],[34.170589,102.559387],[34.168159,102.559578],[34.16251,102.560081],[34.160141,102.560318],[34.15765,102.560509],[34.15731,102.560608],[34.157009,102.560783],[34.15667,102.561234],[34.155861,102.562752],[34.154591,102.564873],[34.154411,102.565613],[34.154419,102.565758],[34.154598,102.566277],[34.154881,102.566757],[34.155289,102.567383],[34.155651,102.567993],[34.155701,102.568123],[34.15572,102.568939],[34.155331,102.569717],[34.1549,102.570488],[34.154251,102.571564],[34.154091,102.571739],[34.15382,102.571907],[34.15242,102.572319],[34.151798,102.572937],[34.151661,102.573471],[34.151508,102.574753],[34.151279,102.577316],[34.150928,102.580673],[34.150951,102.581352],[34.151138,102.583923],[34.15094,102.584732],[34.150742,102.584976],[34.15062,102.585083],[34.15036,102.585197],[34.148972,102.585426],[34.146721,102.585762],[34.146019,102.585907],[34.145489,102.586121],[34.14447,102.586723],[34.14291,102.587181],[34.1423,102.58741],[34.141529,102.58786],[34.14101,102.588257],[34.140419,102.588898],[34.139992,102.589684],[34.137878,102.594872],[34.137569,102.595581],[34.137058,102.596458],[34.136478,102.597252],[34.136108,102.597794],[34.135769,102.598373],[34.135502,102.59919],[34.135269,102.599823],[34.134621,102.600739],[34.13414,102.601173],[34.133541,102.601761],[34.132969,102.602966],[34.13279,102.603416],[34.132259,102.604134],[34.131371,102.605133],[34.130749,102.605881],[34.130569,102.606178],[34.13039,102.606453],[34.129902,102.607567],[34.129478,102.608711],[34.129021,102.609818],[34.128429,102.610817],[34.128059,102.611389],[34.125,102.616364],[34.123699,102.618591],[34.12326,102.619942],[34.123058,102.621437],[34.123169,102.623863],[34.12286,102.62487],[34.122269,102.625343],[34.121922,102.625443],[34.120152,102.62561],[34.11916,102.629173],[34.117748,102.629852],[34.11734,102.630692],[34.11689,102.631721],[34.116718,102.632317],[34.11668,102.632736],[34.116741,102.633392],[34.117569,102.634941],[34.117119,102.636574],[34.117851,102.637733],[34.117489,102.639999],[34.11742,102.640556],[34.11742,102.640762],[34.117611,102.641777],[34.117809,102.642403],[34.118019,102.64315],[34.118118,102.64357],[34.118328,102.644272],[34.118549,102.645073],[34.118622,102.645287],[34.11869,102.6455],[34.118961,102.646332],[34.119091,102.646553],[34.119579,102.646988],[34.12048,102.647331],[34.120602,102.647346],[34.120838,102.647476],[34.121189,102.647629],[34.121571,102.647881],[34.12178,102.648064],[34.122101,102.648453],[34.122299,102.648804],[34.122421,102.649071],[34.12252,102.649559],[34.12254,102.650414],[34.12241,102.651123],[34.12159,102.654167],[34.12141,102.654877],[34.120789,102.657181],[34.120602,102.657951],[34.119202,102.663193],[34.11874,102.664993],[34.117939,102.667877],[34.117481,102.669327],[34.117271,102.669952],[34.116741,102.671371],[34.116451,102.672081],[34.11586,102.673431],[34.115139,102.674973],[34.114189,102.67688],[34.113899,102.67749],[34.113861,102.677513],[34.113602,102.678078],[34.11298,102.679298],[34.111851,102.681679],[34.11161,102.682251],[34.111301,102.683113],[34.110828,102.684723],[34.110661,102.68541],[34.11026,102.686928],[34.10931,102.690353],[34.108589,102.693024],[34.108318,102.694092],[34.107891,102.695663],[34.107639,102.696693],[34.10741,102.697479],[34.107201,102.698318],[34.106979,102.699112],[34.1068,102.699806],[34.106602,102.700508],[34.10611,102.702332],[34.105911,102.703239],[34.10569,102.704292],[34.105518,102.705276],[34.10527,102.70755],[34.105209,102.708504],[34.10516,102.709648],[34.105122,102.711617],[34.105061,102.712791],[34.104931,102.713821],[34.104752,102.714607],[34.104321,102.715973],[34.104279,102.716187],[34.104019,102.716766],[34.10371,102.71772],[34.103432,102.71846],[34.103142,102.71933],[34.102959,102.720306],[34.10294,102.720757],[34.103001,102.72171],[34.10358,102.725479],[34.10368,102.726471],[34.10368,102.727333],[34.103619,102.727814],[34.103371,102.728653],[34.102989,102.729439],[34.102558,102.730049],[34.102509,102.730164],[34.10207,102.730568],[34.10099,102.731247],[34.100201,102.731697],[34.098301,102.732727],[34.09761,102.733131],[34.09655,102.733688],[34.095421,102.734306],[34.094818,102.734612],[34.094059,102.734802],[34.093418,102.734848],[34.092781,102.734718],[34.092171,102.734459],[34.091621,102.734123],[34.090931,102.733582],[34.090691,102.733414],[34.087151,102.730698],[34.086498,102.730301],[34.086021,102.730087],[34.085419,102.729973],[34.084221,102.729912],[34.08215,102.729851],[34.081181,102.729134],[34.07951,102.730637],[34.07851,102.729851],[34.077999,102.729927],[34.078018,102.729927],[34.077862,102.72998],[34.077381,102.730087],[34.07605,102.730476],[34.0742,102.730957],[34.073021,102.731308],[34.072559,102.731361],[34.072121,102.731377],[34.071659,102.731323],[34.071259,102.731216],[34.069962,102.730743],[34.0695,102.730553],[34.067268,102.729713],[34.06567,102.729057],[34.064571,102.728554],[34.062561,102.727524],[34.062019,102.727226],[34.05949,102.725906],[34.059021,102.725723],[34.058472,102.725548],[34.05484,102.724602],[34.054459,102.724518],[34.05402,102.724388],[34.053341,102.724113],[34.052719,102.723793],[34.04837,102.721077],[34.048031,102.720886],[34.04689,102.720177],[34.04665,102.720039],[34.04604,102.719757],[34.045361,102.719566],[34.044289,102.719398],[34.0443,102.719414],[34.044189,102.719414],[34.043919,102.71936],[34.043369,102.719299],[34.042461,102.719162],[34.042141,102.719139],[34.04137,102.719017],[34.04052,102.718941],[34.040279,102.71888],[34.039242,102.718773],[34.038658,102.718681],[34.038349,102.718658],[34.037701,102.718559],[34.036789,102.718437],[34.036201,102.718437],[34.03595,102.718483],[34.035679,102.718536],[34.035469,102.71862],[34.035061,102.718903],[34.034851,102.719101],[34.034481,102.719582],[34.034019,102.720261],[34.032318,102.722923],[34.032169,102.723129],[34.031799,102.723518],[34.031601,102.723686],[34.03141,102.723824],[34.03117,102.723953],[34.03093,102.724037],[34.030689,102.724113],[34.03043,102.724152],[34.03019,102.724136],[34.029148,102.72406],[34.028519,102.723984],[34.028259,102.723991],[34.027969,102.723953],[34.02771,102.723953],[34.027409,102.723999],[34.027111,102.724083],[34.026871,102.724167],[34.026611,102.724319],[34.026119,102.724693],[34.025501,102.725212],[34.025318,102.725319],[34.02512,102.725502],[34.024391,102.726021],[34.023659,102.726501],[34.023232,102.726753],[34.023048,102.726883],[34.022831,102.726997],[34.021309,102.72789],[34.021019,102.728081],[34.020611,102.728416],[34.020409,102.72863],[34.019951,102.729271],[34.019691,102.729782],[34.018902,102.731781],[34.018452,102.732986],[34.018139,102.733757],[34.017879,102.734299],[34.01767,102.734619],[34.017479,102.734863],[34.01725,102.735107],[34.017052,102.735359],[34.016781,102.735641],[34.013119,102.738113],[34.008789,102.741043],[34.00354,102.74456],[34.002659,102.745171],[34.002548,102.745232],[34.001911,102.745667],[34.001431,102.745911],[34.000221,102.746902],[33.99966,102.747452],[33.999161,102.748161],[33.998959,102.74855],[33.998829,102.748894],[33.998611,102.749763],[33.99855,102.750549],[33.998581,102.751427],[33.998661,102.752113],[33.99894,102.753883],[33.998981,102.754433],[33.99905,102.754868],[33.999142,102.755241],[33.999321,102.756371],[33.999962,102.760437],[34.00042,102.763367],[34.00053,102.764191],[34.00061,102.765053],[34.00058,102.765778],[34.00045,102.766693],[34.000111,102.767281],[33.99979,102.767883],[33.997421,102.771591],[33.997379,102.77169],[33.997211,102.771896],[33.9944,102.77623],[33.991291,102.781052],[33.990311,102.782539],[33.988289,102.785713],[33.98724,102.787323],[33.985649,102.789726],[33.984509,102.791489],[33.983978,102.792351],[33.982471,102.794647],[33.980518,102.797699],[33.980141,102.798248],[33.979351,102.799507],[33.978889,102.800194],[33.97575,102.805038],[33.97533,102.805717],[33.974899,102.806343],[33.97456,102.806892],[33.97398,102.807747],[33.97361,102.808327],[33.973179,102.808983],[33.97274,102.809677],[33.97234,102.81028],[33.971889,102.810997],[33.967892,102.817139],[33.966999,102.818527],[33.966179,102.819763],[33.965462,102.820877],[33.96508,102.821442],[33.96019,102.828987],[33.95985,102.829529],[33.956089,102.83532],[33.955639,102.836037],[33.955219,102.836662],[33.954239,102.838188],[33.953659,102.83905],[33.953629,102.839073],[33.953621,102.839127],[33.953159,102.839882],[33.950729,102.843613],[33.950432,102.844116],[33.949982,102.844757],[33.943562,102.854668],[33.941631,102.857613],[33.937241,102.864418],[33.936729,102.865189],[33.936131,102.865997],[33.935501,102.866768],[33.93491,102.867416],[33.934181,102.868118],[33.930019,102.871872],[33.929482,102.872414],[33.928982,102.873016],[33.928581,102.873756],[33.928459,102.874039],[33.928261,102.874702],[33.927151,102.879211],[33.926868,102.880211],[33.92659,102.880882],[33.926262,102.881554],[33.92585,102.882187],[33.925751,102.882309],[33.92522,102.882874],[33.924709,102.883324],[33.92411,102.883743],[33.921749,102.8853],[33.912102,102.891747],[33.909801,102.893257],[33.908459,102.894173],[33.90493,102.896492],[33.90419,102.897003],[33.902908,102.897842],[33.900631,102.899384],[33.894958,102.903137],[33.894371,102.903549],[33.88932,102.906891],[33.88871,102.907333],[33.888161,102.907669],[33.885799,102.909233],[33.885151,102.909683],[33.88385,102.910522],[33.880421,102.912827],[33.872849,102.917847],[33.871632,102.918694],[33.871029,102.91906],[33.861191,102.925621],[33.84753,102.934692],[33.843861,102.937149],[33.8433,102.937508],[33.839359,102.94014],[33.838619,102.940613],[33.837799,102.94117],[33.83699,102.941803],[33.83633,102.942436],[33.835701,102.943169],[33.83033,102.950912],[33.830059,102.951248],[33.82962,102.951691],[33.829041,102.952103],[33.828609,102.952293],[33.828289,102.952393],[33.827839,102.952477],[33.825901,102.952759],[33.825291,102.952873],[33.824951,102.952972],[33.82473,102.953056],[33.82378,102.95359],[33.82267,102.954277],[33.822578,102.954353],[33.821991,102.954712],[33.821289,102.955017],[33.82061,102.9552],[33.817371,102.955978],[33.815041,102.95649],[33.814362,102.956612],[33.813492,102.95665],[33.812759,102.956581],[33.811111,102.95649],[33.809631,102.956383],[33.808189,102.956322],[33.80751,102.956383],[33.806839,102.956612],[33.806271,102.956963],[33.80566,102.957474],[33.803619,102.959358],[33.802921,102.959923],[33.802151,102.96032],[33.801472,102.960487],[33.800758,102.96051],[33.800201,102.960388],[33.799492,102.960083],[33.798309,102.959412],[33.797821,102.959167],[33.797161,102.958946],[33.796391,102.958923],[33.79549,102.959068],[33.795151,102.959137],[33.794991,102.959137],[33.79488,102.95919],[33.789989,102.960152],[33.788921,102.960342],[33.788219,102.960487],[33.787189,102.960617],[33.786499,102.960617],[33.78574,102.960587],[33.784649,102.96048],[33.783852,102.960327],[33.781792,102.96003],[33.781132,102.959969],[33.78038,102.959976],[33.779659,102.960052],[33.778271,102.960243],[33.777191,102.960342],[33.775761,102.960533],[33.77491,102.960587],[33.77422,102.960609],[33.773399,102.960564],[33.772469,102.960442],[33.771858,102.960327],[33.7701,102.959953],[33.767799,102.959488],[33.763859,102.958656],[33.76247,102.958344],[33.760979,102.957939],[33.759571,102.957527],[33.758968,102.957336],[33.75602,102.956253],[33.75528,102.955994],[33.74733,102.953102],[33.746521,102.952003],[33.739429,102.953453],[33.73904,102.95488],[33.738609,102.955276],[33.738121,102.955704],[33.737041,102.956688],[33.73307,102.960243],[33.732578,102.960716],[33.731289,102.961899],[33.730652,102.962433],[33.72995,102.962967],[33.729382,102.963333],[33.72916,102.963417],[33.728291,102.963753],[33.72757,102.963913],[33.726791,102.963966],[33.720871,102.964233],[33.71986,102.964287],[33.719379,102.964302],[33.717449,102.964409],[33.711418,102.964668],[33.706329,102.964928],[33.704552,102.964989],[33.703678,102.964943],[33.7029,102.96479],[33.700619,102.964142],[33.699989,102.963997],[33.699162,102.963982],[33.69836,102.964157],[33.696911,102.964821],[33.6945,102.966003],[33.68998,102.968147],[33.689308,102.968353],[33.68885,102.96843],[33.68819,102.968384],[33.687592,102.968231],[33.687099,102.967987],[33.686779,102.967796],[33.686111,102.967247],[33.685181,102.966362],[33.684639,102.965912],[33.684299,102.965668],[33.683739,102.965393],[33.683189,102.965149],[33.682461,102.964928],[33.681049,102.964546],[33.68066,102.96447],[33.67968,102.964203],[33.679169,102.964073],[33.678822,102.963959],[33.677391,102.9636],[33.677269,102.963593],[33.676781,102.963371],[33.676491,102.963211],[33.67598,102.962837],[33.675831,102.962708],[33.674549,102.961243],[33.674171,102.960907],[33.673759,102.960617],[33.673061,102.96032],[33.67297,102.960274],[33.672691,102.960243],[33.672081,102.96022],[33.672058,102.960243],[33.671799,102.960251],[33.67091,102.960327],[33.669979,102.960426],[33.668468,102.960564],[33.667591,102.960587],[33.666801,102.96048],[33.66629,102.960281],[33.66592,102.960052],[33.66552,102.959747],[33.66534,102.959587],[33.665039,102.959244],[33.66473,102.958801],[33.663448,102.956543],[33.662201,102.954262],[33.66201,102.953957],[33.66161,102.953217],[33.661018,102.952362],[33.66029,102.951698],[33.659512,102.951286],[33.659019,102.951157],[33.65802,102.950996],[33.653961,102.950623],[33.65266,102.95047],[33.651711,102.950119],[33.65136,102.949898],[33.650639,102.949242],[33.649712,102.94828],[33.648491,102.946968],[33.64846,102.946907],[33.647911,102.946327],[33.647621,102.946083],[33.6474,102.945847],[33.647099,102.945572],[33.646801,102.945328],[33.64645,102.945084],[33.646141,102.944893],[33.645821,102.944748],[33.64521,102.944527],[33.644489,102.944389],[33.643711,102.944397],[33.64344,102.944443],[33.64278,102.944603],[33.64246,102.94471],[33.641861,102.945023],[33.641541,102.945221],[33.641239,102.945457],[33.640751,102.945892],[33.640251,102.946373],[33.63728,102.9496],[33.63625,102.950737],[33.635609,102.951401],[33.635101,102.951851],[33.634411,102.95224],[33.634312,102.952278],[33.633221,102.95253],[33.631989,102.952599],[33.631111,102.952782],[33.630299,102.953247],[33.62973,102.953773],[33.628448,102.955116],[33.627991,102.955566],[33.627449,102.955917],[33.626678,102.956131],[33.625938,102.956017],[33.625351,102.955704],[33.624329,102.954811],[33.624031,102.954567],[33.623772,102.954407],[33.623371,102.954208],[33.623089,102.954109],[33.622799,102.954048],[33.622501,102.95401],[33.622181,102.954018],[33.620621,102.954269],[33.620171,102.954308],[33.619781,102.954308],[33.61916,102.954224],[33.618759,102.954086],[33.618351,102.953903],[33.618019,102.95369],[33.617241,102.95314],[33.616989,102.952904],[33.616562,102.95256],[33.615978,102.952049],[33.615711,102.951843],[33.615139,102.951447],[33.614639,102.951218],[33.614071,102.951111],[33.613449,102.951157],[33.61269,102.951347],[33.612331,102.951462],[33.611542,102.95166],[33.61105,102.951683],[33.610149,102.951462],[33.609959,102.951347],[33.609249,102.950798],[33.609169,102.950706],[33.60878,102.950104],[33.607841,102.947853],[33.607712,102.94751],[33.607029,102.945877],[33.60688,102.945473],[33.606258,102.944077],[33.605999,102.943443],[33.606239,102.942429],[33.605961,102.942207],[33.605289,102.941772],[33.603168,102.941093],[33.602612,102.939697],[33.598629,102.938179],[33.598061,102.937988],[33.597691,102.937843],[33.597599,102.937843],[33.596951,102.937767],[33.59639,102.937759],[33.595661,102.93869],[33.594891,102.938461],[33.59399,102.938477],[33.59269,102.940697],[33.592319,102.940483],[33.592289,102.940483],[33.59235,102.940598],[33.592289,102.940742],[33.59235,102.941292],[33.59026,102.944901],[33.588982,102.944992],[33.588531,102.945557],[33.588219,102.94593],[33.58786,102.946457],[33.586781,102.947868],[33.586369,102.948547],[33.58622,102.948624],[33.58601,102.948837],[33.585121,102.949966],[33.584629,102.950562],[33.584221,102.950989],[33.583839,102.951408],[33.582951,102.952339],[33.582539,102.952797],[33.580509,102.954964],[33.579029,102.956596],[33.57869,102.95694],[33.577942,102.957771],[33.577641,102.958038],[33.57756,102.958092],[33.577511,102.958138],[33.577469,102.958168],[33.57653,102.961349],[33.576649,102.961388],[33.576839,102.9618],[33.577148,102.962677],[33.577599,102.964157],[33.577709,102.964577],[33.578209,102.965652],[33.577011,102.967728],[33.562309,102.992767],[33.56229,102.995613],[33.56152,102.997063],[33.560551,102.998123],[33.558681,102.998947],[33.55827,103.000237],[33.558331,103.003082],[33.55722,103.005333],[33.556961,103.007217],[33.556789,103.008347],[33.55669,103.00946],[33.55669,103.016533],[33.556629,103.018227],[33.556561,103.018593],[33.556301,103.019386],[33.556061,103.019974],[33.55497,103.022774],[33.554691,103.023613],[33.554531,103.024307],[33.554489,103.024986],[33.554611,103.025681],[33.554852,103.026299],[33.555038,103.026611],[33.55547,103.027077],[33.556049,103.027412],[33.556301,103.027473],[33.558159,103.027588],[33.558571,103.027443],[33.560741,103.027687],[33.562149,103.02787],[33.564812,103.028107],[33.56588,103.028259],[33.566101,103.028313],[33.566521,103.02845],[33.567268,103.028893],[33.568119,103.029701],[33.568401,103.03009],[33.568619,103.030518],[33.569099,103.031937],[33.56929,103.032692],[33.570278,103.03598],[33.570869,103.037613],[33.571529,103.038567],[33.571819,103.038918],[33.572639,103.039703],[33.57436,103.041023],[33.576141,103.042473],[33.577438,103.043503],[33.578541,103.044456],[33.57946,103.045403],[33.58009,103.046387],[33.580711,103.047668],[33.581051,103.048508],[33.581772,103.050163],[33.582081,103.050926],[33.582359,103.051498],[33.583759,103.054657],[33.584389,103.05619],[33.5853,103.058311],[33.585911,103.059708],[33.58717,103.062637],[33.587841,103.064102],[33.588612,103.066017],[33.589489,103.067993],[33.590069,103.069412],[33.59116,103.072006],[33.592331,103.0737],[33.592239,103.076012],[33.591888,103.077469],[33.588421,103.091187],[33.58823,103.093384],[33.587769,103.099693],[33.586311,103.101318],[33.58577,103.102692],[33.58519,103.103661],[33.584728,103.104362],[33.584541,103.104553],[33.583931,103.10508],[33.583511,103.105438],[33.582981,103.105759],[33.581848,103.106354],[33.576511,103.108421],[33.56625,103.112213],[33.562092,103.113823],[33.560051,103.114532],[33.557999,103.115288],[33.556381,103.115921],[33.554642,103.116798],[33.55278,103.118057],[33.540932,103.12635],[33.540051,103.126831],[33.53867,103.127197],[33.536831,103.127403],[33.534981,103.127831],[33.533508,103.128571],[33.532131,103.129562],[33.530449,103.130882],[33.528648,103.132103],[33.52784,103.132584],[33.526031,103.13372],[33.525089,103.134483],[33.523491,103.136093],[33.52187,103.137619],[33.520359,103.138779],[33.518581,103.139954],[33.51659,103.141243],[33.51403,103.142937],[33.512081,103.144287],[33.510559,103.145508],[33.5093,103.146713],[33.508282,103.147774],[33.506821,103.149513],[33.505219,103.151497],[33.503681,103.153297],[33.502419,103.154572],[33.501141,103.155182],[33.498909,103.156174],[33.49741,103.157066],[33.496059,103.158203],[33.494041,103.160233],[33.490829,103.163582],[33.4893,103.164886],[33.488022,103.165588],[33.48666,103.165993],[33.482281,103.167053],[33.48,103.167587],[33.47776,103.167923],[33.47578,103.167976],[33.47366,103.167992],[33.473042,103.168053],[33.472118,103.168411],[33.471451,103.168877],[33.46891,103.171303],[33.46743,103.172752],[33.466019,103.173973],[33.465092,103.174339],[33.464039,103.174347],[33.463402,103.17424],[33.460442,103.17347],[33.459129,103.173553],[33.458099,103.17395],[33.456661,103.174797],[33.452709,103.177162],[33.451981,103.177551],[33.450802,103.177933],[33.448799,103.178253],[33.4459,103.178673],[33.444172,103.178818],[33.442329,103.178841],[33.440689,103.178886],[33.43597,103.178757],[33.43486,103.178963],[33.434509,103.179077],[33.43354,103.179619],[33.432861,103.180191],[33.432621,103.180367],[33.428909,103.183418],[33.427761,103.184303],[33.426731,103.185028],[33.426079,103.185371],[33.424889,103.185768],[33.423561,103.186249],[33.42234,103.186783],[33.42144,103.187538],[33.420849,103.188568],[33.41993,103.190323],[33.419071,103.191368],[33.41795,103.1922],[33.416611,103.192886],[33.41518,103.193527],[33.414162,103.193932],[33.412579,103.19426],[33.411289,103.194458],[33.409969,103.194748],[33.409081,103.195297],[33.408409,103.195999],[33.407421,103.197197],[33.40657,103.198158],[33.40559,103.198967],[33.40443,103.199654],[33.403301,103.200119],[33.402142,103.200333],[33.400848,103.200493],[33.3992,103.20047],[33.39814,103.200737],[33.397228,103.201271],[33.395699,103.202797],[33.39473,103.20369],[33.393841,103.204552],[33.393452,103.204903],[33.39249,103.205544],[33.391548,103.20594],[33.39053,103.205963],[33.38789,103.205322],[33.3843,103.204483],[33.38155,103.203796],[33.380268,103.203644],[33.380119,103.203667],[33.37936,103.20401],[33.378689,103.204781],[33.377628,103.206673],[33.377392,103.20694],[33.376301,103.207603],[33.37542,103.207771],[33.375221,103.207787],[33.373589,103.207779],[33.371601,103.207703],[33.369869,103.20768],[33.368271,103.207527],[33.364609,103.206711],[33.363331,103.206749],[33.362511,103.206848],[33.35915,103.207161],[33.35651,103.207298],[33.354771,103.207253],[33.352612,103.206963],[33.350712,103.206741],[33.350052,103.206711],[33.348801,103.20694],[33.34761,103.207336],[33.346218,103.207764],[33.344971,103.207817],[33.34351,103.207718],[33.340851,103.207443],[33.339149,103.207283],[33.337589,103.207191],[33.33651,103.207367],[33.335629,103.207718],[33.335289,103.207893],[33.33448,103.208481],[33.33342,103.209343],[33.332958,103.209671],[33.331921,103.210167],[33.33073,103.210426],[33.328442,103.210587],[33.326839,103.21067],[33.32542,103.210709],[33.324169,103.210793],[33.322571,103.210983],[33.32114,103.211067],[33.31963,103.21125],[33.318501,103.211456],[33.318321,103.211517],[33.317341,103.212067],[33.317051,103.212341],[33.31641,103.213173],[33.315929,103.214523],[33.315769,103.215584],[33.315392,103.217644],[33.315022,103.218781],[33.31493,103.218964],[33.314308,103.219673],[33.31403,103.219887],[33.31282,103.220322],[33.310768,103.220886],[33.309471,103.221313],[33.308739,103.221474],[33.307789,103.221581],[33.307049,103.221519],[33.304871,103.221161],[33.30373,103.221107],[33.30304,103.221283],[33.301949,103.221893],[33.30154,103.222267],[33.3009,103.223007],[33.300018,103.223831],[33.29895,103.224327],[33.297581,103.224564],[33.296982,103.22464],[33.295471,103.22496],[33.294319,103.225349],[33.292728,103.226143],[33.291061,103.226891],[33.288261,103.227432],[33.286781,103.227943],[33.282139,103.229927],[33.280621,103.230652],[33.276501,103.233047],[33.274921,103.234009],[33.273731,103.234467],[33.27227,103.234741],[33.271271,103.23468],[33.270931,103.234619],[33.27002,103.234413],[33.26836,103.233803],[33.26722,103.233566],[33.266048,103.233704],[33.264832,103.233948],[33.261791,103.23468],[33.26038,103.234917],[33.25914,103.235062],[33.257462,103.235161],[33.253731,103.235443],[33.25238,103.235397],[33.25106,103.235001],[33.249592,103.234207],[33.245819,103.232117],[33.244678,103.231339],[33.24382,103.230408],[33.240059,103.225594],[33.238972,103.224113],[33.23819,103.223106],[33.23785,103.22274],[33.23695,103.222267],[33.236149,103.22216],[33.235329,103.222282],[33.233398,103.222618],[33.231781,103.22258],[33.231091,103.222488],[33.22718,103.221893],[33.225471,103.221657],[33.224178,103.221687],[33.223011,103.22187],[33.221619,103.222328],[33.219818,103.223061],[33.218491,103.223648],[33.21571,103.2248],[33.214199,103.225372],[33.212749,103.225952],[33.20895,103.227547],[33.202869,103.230019],[33.201542,103.230637],[33.199081,103.23204],[33.197811,103.23259],[33.19664,103.232933],[33.19558,103.233063],[33.194279,103.233063],[33.192841,103.23288],[33.191399,103.232643],[33.18642,103.231979],[33.185291,103.231842],[33.183811,103.231827],[33.18346,103.231873],[33.182259,103.232147],[33.180988,103.232643],[33.179909,103.233147],[33.178261,103.233887],[33.176609,103.234703],[33.1754,103.23526],[33.17424,103.235748],[33.173161,103.236099],[33.171631,103.236526],[33.168621,103.23732],[33.167042,103.237823],[33.16547,103.238548],[33.164291,103.239281],[33.160252,103.242126],[33.15736,103.244202],[33.155819,103.245247],[33.15461,103.245842],[33.15316,103.246277],[33.15181,103.246437],[33.14666,103.246887],[33.145031,103.24704],[33.1436,103.247307],[33.142368,103.247726],[33.14098,103.248497],[33.139992,103.249237],[33.134682,103.253471],[33.13332,103.254578],[33.132111,103.255623],[33.13126,103.256447],[33.130001,103.257912],[33.128738,103.259537],[33.127579,103.261253],[33.126831,103.262512],[33.12627,103.263611],[33.124859,103.266617],[33.124149,103.268204],[33.123569,103.269531],[33.12236,103.272102],[33.12175,103.273468],[33.121052,103.274872],[33.1194,103.278381],[33.118641,103.280159],[33.118469,103.281509],[33.118641,103.284523],[33.118599,103.285828],[33.118481,103.286583],[33.11805,103.287819],[33.116661,103.290291],[33.11607,103.291298],[33.114521,103.294037],[33.113831,103.295357],[33.110771,103.300713],[33.108799,103.30423],[33.10693,103.307663],[33.10585,103.309563],[33.10474,103.311562],[33.10376,103.313301],[33.10342,103.313927],[33.10157,103.317261],[33.100632,103.318848],[33.099758,103.320091],[33.096821,103.323883],[33.096001,103.324966],[33.095161,103.326042],[33.094471,103.327003],[33.093639,103.328377],[33.092258,103.331177],[33.091648,103.332573],[33.091042,103.333832],[33.090149,103.335831],[33.089481,103.337082],[33.088829,103.338371],[33.08831,103.339577],[33.087849,103.340714],[33.087318,103.342339],[33.087101,103.343529],[33.086899,103.345703],[33.086929,103.347954],[33.08675,103.349571],[33.0863,103.350693],[33.08556,103.351624],[33.084641,103.352303],[33.078941,103.355186],[33.078522,103.35537],[33.077671,103.355667],[33.076359,103.355904],[33.075459,103.355949],[33.0746,103.355873],[33.07333,103.355553],[33.07206,103.355103],[33.071529,103.354889],[33.069302,103.35408],[33.06802,103.353828],[33.066929,103.353844],[33.06506,103.35424],[33.063622,103.354446],[33.062641,103.354362],[33.061691,103.354103],[33.060921,103.353767],[33.060162,103.353394],[33.05899,103.352783],[33.056351,103.351448],[33.055248,103.350853],[33.05402,103.350143],[33.052711,103.349342],[33.051449,103.348427],[33.050282,103.347649],[33.049179,103.347076],[33.048111,103.346832],[33.046661,103.346809],[33.04493,103.347054],[33.043259,103.347359],[33.04216,103.347313],[33.040951,103.347214],[33.039921,103.347031],[33.038059,103.346832],[33.037102,103.347107],[33.029449,103.349022],[33.028889,103.349289],[33.02813,103.349907],[33.027081,103.351288],[33.026409,103.352318],[33.025848,103.353027],[33.024971,103.353699],[33.023991,103.354027],[33.021801,103.354317],[33.020592,103.354553],[33.019341,103.354713],[33.017941,103.354828],[33.016911,103.35479],[33.016479,103.354752],[33.01535,103.354446],[33.01424,103.354088],[33.013458,103.353592],[33.01091,103.352257],[33.0103,103.351982],[33.008732,103.351624],[33.005501,103.351112],[33.004581,103.3507],[33.003799,103.350021],[33.003651,103.349854],[33.003201,103.349083],[33.002541,103.347862],[33.001862,103.346657],[33.001579,103.346313],[33.00087,103.345573],[32.999931,103.345062],[32.998878,103.344803],[32.992008,103.343224],[32.990391,103.343048],[32.989071,103.34304],[32.987709,103.343117],[32.986309,103.343323],[32.984741,103.343651],[32.979359,103.344963],[32.977219,103.345512],[32.974861,103.346077],[32.970989,103.347076],[32.96925,103.347572],[32.967682,103.348213],[32.966331,103.348824],[32.965172,103.349152],[32.964169,103.349197],[32.963829,103.349136],[32.962742,103.348732],[32.960621,103.347633],[32.959702,103.347198],[32.95908,103.347054],[32.95863,103.347038],[32.958031,103.347107],[32.957119,103.347351],[32.955151,103.347977],[32.952831,103.348663],[32.952141,103.3489],[32.951641,103.349167],[32.95116,103.349442],[32.949409,103.350571],[32.94825,103.351273],[32.94762,103.351593],[32.947079,103.351791],[32.945309,103.35257],[32.944351,103.3526],[32.943501,103.352821],[32.943272,103.352859],[32.941738,103.353241],[32.940842,103.353378],[32.940022,103.353416],[32.93951,103.353409],[32.938541,103.353279],[32.937328,103.352989],[32.936821,103.352829],[32.935581,103.352386],[32.93502,103.352127],[32.93438,103.35173],[32.92968,103.348557],[32.928959,103.348389],[32.92881,103.348389],[32.927872,103.348579],[32.927238,103.348923],[32.926979,103.349167],[32.926231,103.350121],[32.92588,103.350883],[32.92561,103.351929],[32.925621,103.353188],[32.926079,103.354408],[32.92646,103.355003],[32.926689,103.355247],[32.926819,103.35537],[32.927231,103.355652],[32.92894,103.356537],[32.92939,103.356903],[32.92963,103.357208],[32.929829,103.357567],[32.929981,103.358223],[32.930019,103.358673],[32.93,103.359138],[32.929909,103.3601],[32.930092,103.361542],[32.93021,103.362022],[32.93042,103.36274],[32.930618,103.364227],[32.930641,103.364723],[32.930511,103.366203],[32.93037,103.366928],[32.929901,103.370033],[32.929829,103.370567],[32.92918,103.373558],[32.928799,103.375076],[32.928452,103.376228],[32.928242,103.377434],[32.928139,103.378677],[32.928169,103.3797],[32.928249,103.38044],[32.928341,103.380913],[32.928692,103.382339],[32.928909,103.382988],[32.929192,103.383743],[32.929409,103.384277],[32.929859,103.385559],[32.930119,103.386688],[32.93008,103.38781],[32.929829,103.388687],[32.92976,103.388863],[32.929501,103.389328],[32.929329,103.389587],[32.928612,103.390182],[32.927959,103.390533],[32.92667,103.391029],[32.9259,103.391296],[32.924332,103.391922],[32.924019,103.392059],[32.921459,103.393173],[32.92033,103.393883],[32.918991,103.394997],[32.91835,103.397507],[32.918289,103.399567],[32.918541,103.402367],[32.918579,103.403191],[32.918869,103.404228],[32.91993,103.406593],[32.920429,103.408546],[32.9212,103.410851],[32.921989,103.412651],[32.922771,103.414688],[32.92392,103.417473],[32.9244,103.418663],[32.92532,103.420891],[32.92561,103.421631],[32.925999,103.422462],[32.926659,103.423683],[32.927441,103.424919],[32.928329,103.426208],[32.928848,103.427254],[32.928989,103.427818],[32.92905,103.429153],[32.928909,103.430054],[32.928532,103.431862],[32.928421,103.432999],[32.928551,103.434288],[32.928719,103.435532],[32.928741,103.436203],[32.92852,103.437347],[32.92844,103.437569],[32.927872,103.438599],[32.926811,103.440201],[32.92614,103.441238],[32.925838,103.441612],[32.92487,103.442177],[32.924221,103.442284],[32.923759,103.442238],[32.92308,103.442139],[32.92284,103.442032],[32.922298,103.441994],[32.921169,103.441811],[32.919289,103.441727],[32.917931,103.441872],[32.917221,103.442162],[32.916569,103.442596],[32.914398,103.444443],[32.913891,103.444946],[32.912571,103.446381],[32.911499,103.447723],[32.91016,103.449493],[32.90984,103.449928],[32.909279,103.450684],[32.90884,103.451134],[32.907711,103.452148],[32.90715,103.452873],[32.906818,103.453522],[32.90646,103.454453],[32.906151,103.455406],[32.905731,103.456581],[32.905121,103.457428],[32.904419,103.458252],[32.90411,103.458588],[32.903252,103.459747],[32.903019,103.460037],[32.90263,103.460426],[32.90176,103.461113],[32.901588,103.461182],[32.901039,103.461357],[32.900089,103.461479],[32.89872,103.461533],[32.897171,103.46167],[32.896172,103.461678],[32.894901,103.461601],[32.89386,103.461304],[32.893242,103.461021],[32.892818,103.460808],[32.88744,103.45845],[32.885921,103.458076],[32.884232,103.45826],[32.88364,103.458801],[32.88335,103.459244],[32.883228,103.460114],[32.883331,103.461067],[32.883701,103.462151],[32.884941,103.464317],[32.885361,103.465477],[32.88559,103.466217],[32.885941,103.46756],[32.886768,103.471481],[32.88702,103.472878],[32.88702,103.473999],[32.886959,103.474541],[32.8867,103.475273],[32.886589,103.475487],[32.886299,103.475929],[32.885639,103.476753],[32.885151,103.477409],[32.884171,103.4786],[32.883739,103.479172],[32.883289,103.480072],[32.883289,103.481178],[32.88422,103.483498],[32.884609,103.484032],[32.885479,103.484833],[32.885681,103.485199],[32.885921,103.486977],[32.886101,103.48748],[32.88789,103.488998],[32.88847,103.489853],[32.889359,103.490211],[32.88966,103.490784],[32.89048,103.491524],[32.890678,103.491867],[32.890888,103.492531],[32.89201,103.494492],[32.89254,103.495956],[32.8932,103.496986],[32.893539,103.497864],[32.894569,103.499237],[32.894711,103.499672],[32.894741,103.500282],[32.895451,103.501518],[32.89576,103.503227],[32.895981,103.503563],[32.896961,103.504143],[32.898571,103.505417],[32.898788,103.505783],[32.89922,103.506897],[32.89954,103.508629],[32.899872,103.509567],[32.901138,103.512047],[32.9021,103.513329],[32.90271,103.514191],[32.90337,103.515282],[32.903599,103.5159],[32.90369,103.51725],[32.903641,103.5177],[32.903542,103.51815],[32.9034,103.51857],[32.903118,103.51918],[32.90287,103.519539],[32.901981,103.52021],[32.89875,103.521294],[32.897659,103.521713],[32.896591,103.52224],[32.895561,103.522926],[32.89481,103.523613],[32.89386,103.524544],[32.892632,103.525681],[32.89151,103.526657],[32.889999,103.528061],[32.88969,103.528328],[32.887032,103.530907],[32.88538,103.532829],[32.88414,103.534088],[32.883041,103.535133],[32.88232,103.535957],[32.88184,103.536827],[32.881329,103.538147],[32.880569,103.539284],[32.880119,103.539719],[32.87899,103.540367],[32.878181,103.540756],[32.876961,103.541527],[32.87677,103.541687],[32.875542,103.542923],[32.87439,103.544113],[32.87344,103.544777],[32.87281,103.54496],[32.872379,103.544991],[32.871529,103.544769],[32.869991,103.543968],[32.868919,103.543694],[32.86871,103.543694],[32.86792,103.543907],[32.865631,103.545013],[32.864841,103.545326],[32.863529,103.546043],[32.863209,103.546341],[32.862499,103.547562],[32.862141,103.548943],[32.861809,103.550858],[32.86142,103.552467],[32.86134,103.552696],[32.860748,103.55394],[32.860229,103.554649],[32.859379,103.555748],[32.858181,103.55687],[32.857422,103.557388],[32.855759,103.558571],[32.854111,103.559631],[32.852581,103.560661],[32.85178,103.56115],[32.850929,103.561546],[32.84938,103.560806],[32.847279,103.562027],[32.846119,103.561127],[32.844318,103.560806],[32.842979,103.560966],[32.83886,103.561691],[32.836922,103.561974],[32.835239,103.562263],[32.835041,103.562317],[32.833969,103.562889],[32.832489,103.56398],[32.832199,103.56424],[32.830921,103.565247],[32.829681,103.565933],[32.828079,103.566483],[32.826851,103.566849],[32.826199,103.566994],[32.825119,103.566849],[32.82309,103.565964],[32.82196,103.56604],[32.821091,103.566437],[32.819809,103.567093],[32.81958,103.567169],[32.818661,103.567421],[32.816849,103.567734],[32.81509,103.567963],[32.813641,103.568352],[32.81329,103.568604],[32.81266,103.569221],[32.81216,103.570007],[32.811611,103.570801],[32.810741,103.571503],[32.80975,103.571831],[32.80854,103.571991],[32.806389,103.572197],[32.80484,103.572342],[32.801029,103.572723],[32.800159,103.572884],[32.79948,103.573219],[32.79895,103.573669],[32.79842,103.574249],[32.79784,103.575233],[32.79734,103.576553],[32.79668,103.578011],[32.796631,103.578827],[32.796841,103.581757],[32.796799,103.582779],[32.796261,103.583809],[32.795582,103.584511],[32.793018,103.585953],[32.792259,103.586868],[32.79192,103.587959],[32.79147,103.592941],[32.79113,103.595108],[32.79044,103.596313],[32.789612,103.596863],[32.78825,103.597397],[32.788052,103.597458],[32.787029,103.597878],[32.786579,103.598267],[32.786301,103.598579],[32.78574,103.599663],[32.78553,103.60096],[32.78524,103.603996],[32.785069,103.605637],[32.785721,103.607887],[32.785721,103.608856],[32.785389,103.609711],[32.784641,103.610893],[32.78352,103.612663],[32.782211,103.614609],[32.78183,103.615097],[32.780869,103.616226],[32.78072,103.616257],[32.780609,103.61631],[32.780491,103.616371],[32.780258,103.616623],[32.779961,103.616898],[32.778049,103.618217],[32.776642,103.619171],[32.775639,103.619743],[32.774971,103.619812],[32.774311,103.619583],[32.773739,103.619347],[32.773289,103.619118],[32.772671,103.618927],[32.771999,103.618568],[32.771679,103.618523],[32.771259,103.618523],[32.770809,103.618294],[32.770481,103.618217],[32.770248,103.61824],[32.7701,103.618294],[32.769852,103.618462],[32.769402,103.618912],[32.769089,103.619797],[32.768589,103.620064],[32.76759,103.620682],[32.767712,103.618896],[32.767509,103.618248],[32.767559,103.617279],[32.767399,103.616951],[32.767208,103.616699],[32.766899,103.61644],[32.766251,103.616249],[32.76609,103.616226],[32.765862,103.616249],[32.765579,103.616241],[32.765041,103.616058],[32.76498,103.616013],[32.764648,103.615883],[32.76403,103.615891],[32.763828,103.615959],[32.763561,103.616081],[32.762581,103.616364],[32.76236,103.616409],[32.76173,103.616272],[32.76059,103.615753],[32.756771,103.614197],[32.755939,103.613922],[32.754959,103.613441],[32.754341,103.613152],[32.754169,103.613091],[32.753738,103.61306],[32.753349,103.613052],[32.75243,103.612778],[32.751999,103.612778],[32.751919,103.612762],[32.751499,103.612793],[32.750641,103.612663],[32.750401,103.61261],[32.749691,103.612511],[32.748161,103.612556],[32.747429,103.612289],[32.746552,103.611816],[32.745739,103.611656],[32.74556,103.611679],[32.745361,103.611656],[32.744301,103.611977],[32.74408,103.612099],[32.7439,103.612099],[32.743488,103.611992],[32.743408,103.611992],[32.743271,103.612053],[32.742981,103.61232],[32.742882,103.612396],[32.74255,103.61274],[32.742531,103.61274],[32.742401,103.612938],[32.74218,103.613113],[32.741951,103.613312],[32.74173,103.613472],[32.741379,103.613831],[32.741161,103.613983],[32.74057,103.614433],[32.740231,103.614548],[32.740028,103.614571],[32.739491,103.614548],[32.738289,103.614304],[32.737469,103.614227],[32.736851,103.614113],[32.736641,103.614113],[32.736401,103.614021],[32.736271,103.614014],[32.73555,103.613983],[32.734982,103.613892],[32.73439,103.614037],[32.73407,103.614166],[32.73391,103.614182],[32.73341,103.614281],[32.733051,103.614441],[32.73288,103.614662],[32.731121,103.615913],[32.733009,103.614578],[32.731171,103.616257],[32.728809,103.614731],[32.72821,103.614487],[32.72781,103.61451],[32.7276,103.614601],[32.727131,103.615219],[32.7267,103.615868],[32.726521,103.616058],[32.726341,103.616112],[32.725739,103.616089],[32.724991,103.615448],[32.723011,103.613426],[32.722759,103.613197],[32.722198,103.612961],[32.72105,103.612663],[32.720032,103.612297],[32.71991,103.612244],[32.719711,103.612053],[32.719181,103.611343],[32.718578,103.610367],[32.718201,103.60994],[32.717861,103.609596],[32.7174,103.609222],[32.716751,103.608887],[32.71611,103.608681],[32.714588,103.608047],[32.71349,103.607727],[32.712181,103.607422],[32.711411,103.607193],[32.71056,103.607246],[32.710251,103.607239],[32.709042,103.606903],[32.70776,103.606293],[32.707481,103.606216],[32.707062,103.606163],[32.706421,103.606087],[32.70546,103.605927],[32.704552,103.605583],[32.703732,103.605598],[32.70332,103.605667],[32.703072,103.605698],[32.702839,103.605667],[32.70211,103.605438],[32.701931,103.605408],[32.701771,103.605408],[32.701271,103.605263],[32.700932,103.605141],[32.700531,103.604874],[32.699711,103.604362],[32.699169,103.604118],[32.698891,103.604088],[32.698589,103.604118],[32.698139,103.604012],[32.6973,103.603699],[32.69627,103.6036],[32.695469,103.603432],[32.695122,103.60334],[32.694538,103.603218],[32.693939,103.603157],[32.69331,103.602837],[32.69286,103.602531],[32.692181,103.602127],[32.69138,103.602203],[32.690689,103.60231],[32.68866,103.601852],[32.687641,103.601738],[32.68716,103.601822],[32.686211,103.602089],[32.686081,103.602112],[32.684361,103.601738],[32.682961,103.601402],[32.682331,103.601341],[32.681709,103.601334],[32.680939,103.601372],[32.68008,103.601387],[32.679352,103.601357],[32.67865,103.60128],[32.67775,103.60128],[32.67635,103.601967],[32.67564,103.60199],[32.6745,103.601768],[32.673389,103.60173],[32.671902,103.601349],[32.671082,103.601578],[32.670502,103.601852],[32.669762,103.602242],[32.66906,103.602257],[32.667542,103.602127],[32.666489,103.602188],[32.665051,103.602013],[32.663712,103.601898],[32.661572,103.601799],[32.660351,103.601608],[32.659389,103.601212],[32.658588,103.60099],[32.657459,103.600868],[32.657021,103.600853],[32.655869,103.600868],[32.654869,103.600761],[32.652618,103.600151],[32.65189,103.599792],[32.651279,103.599457],[32.650551,103.598969],[32.650131,103.598763],[32.64856,103.59819],[32.64624,103.597343],[32.64613,103.597282],[32.646099,103.597252],[32.644691,103.596863],[32.64436,103.596947],[32.644329,103.59697],[32.64418,103.597214],[32.643421,103.598312],[32.643139,103.598549],[32.64296,103.598618],[32.64146,103.598503],[32.640888,103.598488],[32.638309,103.598106],[32.637669,103.597969],[32.637081,103.597794],[32.63623,103.597557],[32.635571,103.597229],[32.634159,103.59642],[32.633621,103.595932],[32.633099,103.595192],[32.63298,103.595062],[32.630989,103.593307],[32.630871,103.593224],[32.63018,103.593033],[32.62859,103.592728],[32.627861,103.592484],[32.627331,103.592087],[32.626701,103.591553],[32.626431,103.591339],[32.625969,103.591042],[32.625401,103.590927],[32.624741,103.590843],[32.623569,103.590637],[32.62336,103.590607],[32.620441,103.590843],[32.61964,103.590919],[32.618912,103.591141],[32.618301,103.591522],[32.617229,103.592491],[32.61618,103.593407],[32.613911,103.59549],[32.612141,103.597343],[32.60939,103.600151],[32.60881,103.600609],[32.60812,103.600983],[32.607559,103.601189],[32.60487,103.602074],[32.60397,103.601501],[32.599178,103.605614],[32.598019,103.605003],[32.597408,103.605362],[32.597099,103.605637],[32.596779,103.605873],[32.5961,103.606407],[32.59581,103.607697],[32.58968,103.610817],[32.588779,103.609818],[32.587219,103.609459],[32.58707,103.609444],[32.586552,103.60965],[32.58593,103.61013],[32.585361,103.610619],[32.585091,103.61097],[32.584961,103.611092],[32.58469,103.611214],[32.584171,103.611511],[32.58358,103.612038],[32.583382,103.613289],[32.573071,103.617027],[32.572479,103.61599],[32.572121,103.61599],[32.57011,103.616623],[32.56966,103.616882],[32.569519,103.617027],[32.569351,103.617126],[32.56926,103.617233],[32.568729,103.617599],[32.56815,103.617767],[32.567829,103.61776],[32.567451,103.617661],[32.566639,103.617523],[32.566261,103.61763],[32.565498,103.618553],[32.565231,103.618668],[32.561069,103.620064],[32.560051,103.620728],[32.560001,103.62178],[32.54961,103.625549],[32.546169,103.626801],[32.544022,103.627579],[32.5396,103.629181],[32.539082,103.628212],[32.530869,103.630623],[32.528111,103.630257],[32.527721,103.630333],[32.526001,103.631042],[32.52544,103.631203],[32.52467,103.631088],[32.523991,103.630859],[32.523708,103.630859],[32.522869,103.631157],[32.52224,103.631233],[32.521599,103.631126],[32.520771,103.631111],[32.520168,103.631279],[32.519741,103.6315],[32.519482,103.631683],[32.519119,103.632027],[32.518742,103.632233],[32.51857,103.632362],[32.518261,103.632889],[32.518059,103.633118],[32.517811,103.633324],[32.517342,103.633774],[32.516441,103.634323],[32.5159,103.634613],[32.515598,103.634857],[32.515469,103.635094],[32.515301,103.636017],[32.515099,103.636948],[32.514881,103.637337],[32.514751,103.63868],[32.510632,103.641068],[32.509769,103.639954],[32.509331,103.639832],[32.508751,103.63958],[32.508579,103.639526],[32.508289,103.639519],[32.507221,103.639709],[32.506599,103.639847],[32.505138,103.64035],[32.504871,103.640373],[32.504539,103.640282],[32.504421,103.640213],[32.504131,103.639923],[32.504051,103.639793],[32.502449,103.639282],[32.502102,103.639664],[32.501961,103.639877],[32.501869,103.640083],[32.50156,103.641472],[32.501389,103.642082],[32.500481,103.644814],[32.4991,103.645393],[32.498219,103.645126],[32.49791,103.645111],[32.49778,103.645119],[32.49712,103.645409],[32.496429,103.645859],[32.493111,103.648804],[32.492649,103.648972],[32.49192,103.649017],[32.49152,103.648979],[32.491261,103.648872],[32.491058,103.648666],[32.49078,103.648216],[32.490429,103.647552],[32.490261,103.647293],[32.48975,103.646797],[32.489422,103.646507],[32.488869,103.646133],[32.488708,103.646088],[32.488609,103.646103],[32.488419,103.646156],[32.488251,103.646294],[32.487968,103.646683],[32.487228,103.647362],[32.4869,103.647827],[32.486591,103.648651],[32.486309,103.649246],[32.485149,103.651466],[32.484699,103.652138],[32.484268,103.652397],[32.483719,103.652641],[32.482811,103.652809],[32.481812,103.653061],[32.481209,103.653191],[32.480999,103.653259],[32.48045,103.653709],[32.480061,103.654411],[32.479839,103.655159],[32.479599,103.656219],[32.479561,103.656441],[32.479481,103.657791],[32.47961,103.659042],[32.475731,103.661293],[32.474949,103.660133],[32.474339,103.660072],[32.47393,103.660149],[32.472481,103.660339],[32.47221,103.660408],[32.469349,103.661484],[32.468899,103.662041],[32.46833,103.662727],[32.467201,103.664032],[32.466019,103.66507],[32.464512,103.666359],[32.464039,103.666801],[32.463879,103.66703],[32.463669,103.667793],[32.463581,103.668404],[32.463928,103.669243],[32.455311,103.675484],[32.44862,103.680344],[32.443989,103.683693],[32.438961,103.687317],[32.43782,103.686546],[32.43652,103.686813],[32.436062,103.686958],[32.435749,103.687141],[32.43425,103.688454],[32.433849,103.688766],[32.43364,103.688881],[32.43288,103.689041],[32.432201,103.689087],[32.431709,103.689262],[32.43148,103.689537],[32.431221,103.689781],[32.430901,103.690392],[32.430779,103.690521],[32.430569,103.690689],[32.430302,103.691002],[32.43005,103.691017],[32.429619,103.691109],[32.429199,103.691223],[32.428699,103.691429],[32.4282,103.691597],[32.427891,103.691879],[32.427719,103.692093],[32.427269,103.692978],[32.42688,103.693932],[32.426559,103.694733],[32.426208,103.695396],[32.425591,103.695999],[32.42511,103.6968],[32.424549,103.697533],[32.423981,103.698036],[32.42355,103.69838],[32.42337,103.698738],[32.423248,103.699593],[32.42337,103.700943],[32.42247,103.701736],[32.42268,103.703369],[32.422531,103.703758],[32.421791,103.704437],[32.42112,103.705002],[32.420502,103.705597],[32.419819,103.70636],[32.41909,103.707314],[32.41893,103.707489],[32.4179,103.709068],[32.41293,103.713463],[32.411888,103.713661],[32.410511,103.71376],[32.409721,103.713173],[32.4021,103.720001],[32.401299,103.720428],[32.387909,103.726318],[32.387878,103.727661],[32.387779,103.727737],[32.387428,103.728081],[32.387211,103.728348],[32.386478,103.728844],[32.38607,103.728958],[32.385349,103.728912],[32.384682,103.728897],[32.383949,103.728867],[32.38303,103.727943],[32.37851,103.728539],[32.378052,103.729881],[32.377319,103.730423],[32.377121,103.730499],[32.37574,103.730873],[32.374809,103.731003],[32.374081,103.731056],[32.373859,103.73111],[32.373112,103.73143],[32.37228,103.731667],[32.371811,103.73175],[32.371632,103.731697],[32.37093,103.731216],[32.369781,103.730347],[32.369221,103.729057],[32.365871,103.728638],[32.36549,103.726868],[32.365139,103.726471],[32.364941,103.726196],[32.364769,103.726021],[32.3647,103.725861],[32.36459,103.725563],[32.364441,103.724899],[32.364208,103.724403],[32.363659,103.723984],[32.36335,103.723862],[32.36224,103.723877],[32.361752,103.723869],[32.361462,103.723907],[32.3605,103.724121],[32.360321,103.724121],[32.35928,103.723869],[32.358891,103.724007],[32.358719,103.724167],[32.358139,103.725037],[32.35788,103.725449],[32.357471,103.726189],[32.35717,103.72718],[32.357121,103.727638],[32.357059,103.727814],[32.356861,103.727661],[32.35606,103.728683],[32.356659,103.730026],[32.356579,103.730827],[32.356449,103.731697],[32.356121,103.733276],[32.355782,103.735153],[32.355492,103.735832],[32.35524,103.736168],[32.35519,103.736282],[32.35503,103.736519],[32.35458,103.736748],[32.353859,103.736992],[32.3536,103.73703],[32.35339,103.73703],[32.352219,103.736847],[32.350929,103.736702],[32.350719,103.736748],[32.350319,103.736893],[32.350101,103.736282],[32.34993,103.737289],[32.34943,103.737503],[32.348598,103.737381],[32.348,103.737122],[32.347729,103.736923],[32.347641,103.735962],[32.34623,103.735779],[32.345821,103.734337],[32.34568,103.7342],[32.345551,103.734009],[32.345379,103.733856],[32.340771,103.727203],[32.34053,103.726822],[32.340481,103.726677],[32.340439,103.726479],[32.34045,103.726242],[32.3405,103.726082],[32.34066,103.72567],[32.340672,103.725456],[32.340439,103.724876],[32.340099,103.724167],[32.340019,103.723389],[32.340031,103.72316],[32.340111,103.7229],[32.340462,103.722481],[32.340611,103.722221],[32.340599,103.721718],[32.340519,103.721527],[32.340092,103.720932],[32.339809,103.720772],[32.33762,103.72052],[32.33683,103.72049],[32.336369,103.720421],[32.335609,103.720207],[32.33519,103.720032],[32.334728,103.719711],[32.334259,103.71933],[32.333832,103.719162],[32.333599,103.719109],[32.332722,103.718712],[32.33234,103.718613],[32.331558,103.71875],[32.330231,103.719467],[32.329472,103.719803],[32.329041,103.719841],[32.328621,103.719849],[32.32827,103.71981],[32.327869,103.719887],[32.327389,103.719841],[32.327122,103.719658],[32.327019,103.719437],[32.32682,103.718987],[32.32658,103.718788],[32.32629,103.718719],[32.326061,103.718613],[32.325771,103.718536],[32.325531,103.71859],[32.325089,103.718727],[32.324959,103.718803],[32.32428,103.719032],[32.32365,103.719139],[32.323429,103.719193],[32.3232,103.719276],[32.323051,103.71936],[32.322319,103.719917],[32.321701,103.720268],[32.320808,103.72068],[32.320461,103.720589],[32.32016,103.720291],[32.319981,103.7202],[32.31926,103.720177],[32.319061,103.7202],[32.318741,103.720169],[32.318642,103.720329],[32.318451,103.720284],[32.31786,103.720062],[32.317741,103.720062],[32.317532,103.720154],[32.317039,103.720467],[32.316441,103.721413],[32.316071,103.721367],[32.315369,103.72123],[32.314651,103.720978],[32.313961,103.720818],[32.313251,103.720802],[32.312721,103.720818],[32.312141,103.720993],[32.31142,103.721336],[32.31131,103.721367],[32.310471,103.721367],[32.310162,103.721313],[32.30938,103.720802],[32.30904,103.72068],[32.308788,103.720657],[32.30843,103.720863],[32.308201,103.7211],[32.307041,103.721878],[32.30603,103.722488],[32.30579,103.722588],[32.305161,103.723068],[32.304489,103.723373],[32.30444,103.723373],[32.303829,103.723457],[32.303188,103.72361],[32.302551,103.723793],[32.301521,103.723824],[32.300659,103.723892],[32.300339,103.723938],[32.29982,103.724121],[32.299648,103.724281],[32.299541,103.724426],[32.29929,103.725037],[32.299129,103.725609],[32.299,103.726334],[32.29895,103.726807],[32.29908,103.72802],[32.28278,103.735847],[32.282139,103.734863],[32.281811,103.734901],[32.281319,103.734909],[32.280991,103.734932],[32.280048,103.735046],[32.279228,103.734962],[32.27861,103.735107],[32.278561,103.73513],[32.2784,103.735298],[32.277771,103.736427],[32.277031,103.737267],[32.276718,103.737709],[32.27663,103.7388],[32.27467,103.739754],[32.274441,103.741219],[32.273811,103.741577],[32.27319,103.741737],[32.272499,103.741997],[32.271721,103.742462],[32.27121,103.742844],[32.270771,103.743271],[32.27013,103.743736],[32.269711,103.743942],[32.26902,103.744179],[32.26878,103.744217],[32.268242,103.7444],[32.267399,103.744713],[32.266949,103.745033],[32.266449,103.745407],[32.266289,103.745499],[32.26561,103.745697],[32.264511,103.745117],[32.26244,103.74675],[32.26263,103.748032],[32.262428,103.748466],[32.26202,103.748802],[32.261749,103.748993],[32.26149,103.749092],[32.261181,103.749313],[32.260849,103.749634],[32.260441,103.749863],[32.259892,103.749931],[32.259129,103.749352],[32.255508,103.75219],[32.255661,103.75383],[32.25523,103.755402],[32.2547,103.756187],[32.254581,103.756477],[32.25425,103.756783],[32.25404,103.757088],[32.253658,103.757812],[32.253181,103.758797],[32.252628,103.759499],[32.252041,103.759956],[32.251362,103.76017],[32.250881,103.760178],[32.250431,103.760246],[32.250271,103.760193],[32.250019,103.760139],[32.24942,103.760101],[32.24892,103.760193],[32.24855,103.760353],[32.248371,103.760628],[32.24818,103.760788],[32.247921,103.76078],[32.247719,103.760857],[32.247601,103.760986],[32.24733,103.761414],[32.24699,103.761803],[32.24659,103.762108],[32.246311,103.762253],[32.24559,103.762543],[32.24535,103.762657],[32.24522,103.762688],[32.244541,103.762772],[32.24379,103.762787],[32.243359,103.762917],[32.243111,103.763077],[32.242298,103.764],[32.24152,103.764717],[32.240849,103.765167],[32.2402,103.76545],[32.239552,103.765663],[32.238811,103.765701],[32.23835,103.765701],[32.23772,103.765602],[32.237068,103.765427],[32.236561,103.76516],[32.236031,103.764816],[32.23555,103.764458],[32.234901,103.763496],[32.233509,103.764069],[32.23288,103.764282],[32.224331,103.765762],[32.220219,103.766548],[32.219711,103.765091],[32.219559,103.764893],[32.219341,103.764732],[32.219231,103.764687],[32.21899,103.764641],[32.218861,103.764603],[32.217991,103.764503],[32.216721,103.764427],[32.21656,103.764503],[32.21627,103.76458],[32.215931,103.764526],[32.215691,103.764557],[32.215611,103.764603],[32.215092,103.7649],[32.21487,103.765068],[32.214329,103.765556],[32.213848,103.765984],[32.21368,103.766083],[32.213299,103.766129],[32.21262,103.765923],[32.212448,103.765938],[32.212139,103.765953],[32.21146,103.766144],[32.211151,103.766167],[32.210129,103.766037],[32.20974,103.765907],[32.208851,103.765282],[32.20853,103.765259],[32.20784,103.765244],[32.207291,103.765198],[32.206909,103.765213],[32.205502,103.765457],[32.20406,103.765137],[32.20266,103.764061],[32.202389,103.763924],[32.202091,103.763809],[32.201061,103.763603],[32.200821,103.763321],[32.200741,103.762932],[32.200588,103.762619],[32.200359,103.762421],[32.200008,103.762177],[32.199879,103.762032],[32.199371,103.762123],[32.19912,103.762032],[32.197449,103.761223],[32.19677,103.760948],[32.19651,103.760857],[32.19553,103.760399],[32.195431,103.760384],[32.194851,103.760391],[32.19352,103.760483],[32.193169,103.76049],[32.192711,103.760437],[32.19249,103.760361],[32.192451,103.760384],[32.19223,103.760292],[32.191719,103.760223],[32.19112,103.760071],[32.190578,103.759804],[32.190128,103.759468],[32.189541,103.758987],[32.189251,103.758774],[32.189072,103.758713],[32.1884,103.758659],[32.18734,103.75856],[32.186588,103.758537],[32.18642,103.758507],[32.185841,103.758492],[32.185539,103.758423],[32.18528,103.758179],[32.185169,103.757729],[32.184952,103.757149],[32.184818,103.756958],[32.184601,103.756721],[32.183971,103.756264],[32.182529,103.755493],[32.18235,103.755463],[32.180672,103.755501],[32.18037,103.755623],[32.180271,103.755722],[32.179218,103.756973],[32.17902,103.757111],[32.178589,103.757187],[32.178162,103.757187],[32.17794,103.757133],[32.1782,103.757179],[32.177479,103.756889],[32.176491,103.756157],[32.175869,103.755608],[32.17561,103.755188],[32.175282,103.754471],[32.17485,103.753616],[32.174622,103.752991],[32.174191,103.751953],[32.174129,103.751694],[32.173981,103.75135],[32.173321,103.750267],[32.172981,103.749519],[32.172749,103.748756],[32.17263,103.748497],[32.17244,103.748177],[32.171909,103.747513],[32.171791,103.747299],[32.171471,103.746872],[32.171249,103.746223],[32.171101,103.745667],[32.171001,103.745117],[32.171021,103.744598],[32.171059,103.744263],[32.17112,103.743896],[32.171131,103.743523],[32.171082,103.743179],[32.170929,103.742683],[32.1707,103.742149],[32.17046,103.741623],[32.170261,103.741432],[32.170029,103.74147],[32.169788,103.741653],[32.169571,103.741737],[32.16925,103.741951],[32.168861,103.742126],[32.168369,103.742264],[32.167759,103.742081],[32.167648,103.741997],[32.16708,103.741257],[32.166809,103.741043],[32.16544,103.740593],[32.164761,103.740387],[32.164242,103.740181],[32.163879,103.739899],[32.163651,103.739647],[32.163429,103.739227],[32.16325,103.738724],[32.163109,103.738358],[32.162701,103.737907],[32.162079,103.737297],[32.16188,103.737061],[32.161549,103.736763],[32.161449,103.736633],[32.161121,103.73629],[32.16048,103.735924],[32.159801,103.735672],[32.158619,103.735321],[32.158321,103.735168],[32.157829,103.734978],[32.157619,103.734871],[32.157261,103.734863],[32.15641,103.734749],[32.156132,103.734734],[32.155869,103.734741],[32.15556,103.734787],[32.15498,103.734978],[32.154881,103.734993],[32.15456,103.734863],[32.154018,103.734497],[32.153561,103.734306],[32.153309,103.734123],[32.153069,103.733887],[32.15284,103.73362],[32.152649,103.733353],[32.152611,103.7332],[32.152512,103.733101],[32.152302,103.732964],[32.152199,103.732933],[32.151611,103.732811],[32.150921,103.732643],[32.150028,103.73246],[32.149891,103.732407],[32.14967,103.732384],[32.149471,103.732323],[32.149132,103.732269],[32.148769,103.732162],[32.148399,103.732109],[32.148102,103.732147],[32.147652,103.732246],[32.147018,103.732269],[32.146889,103.732231],[32.146309,103.731903],[32.146118,103.731773],[32.145882,103.731682],[32.145241,103.731667],[32.14481,103.731697],[32.144581,103.731773],[32.143681,103.732109],[32.14352,103.732193],[32.14336,103.732239],[32.143082,103.732399],[32.142429,103.732674],[32.142059,103.732903],[32.14172,103.7332],[32.141521,103.733467],[32.14122,103.733803],[32.140888,103.733917],[32.14045,103.733757],[32.140251,103.733597],[32.139679,103.733017],[32.13945,103.732826],[32.138981,103.732613],[32.138741,103.732536],[32.138519,103.732513],[32.138199,103.732567],[32.137489,103.732903],[32.13707,103.733231],[32.136742,103.733437],[32.136459,103.733528],[32.136021,103.73365],[32.135731,103.733757],[32.13538,103.733849],[32.135151,103.733849],[32.134472,103.733772],[32.134109,103.733658],[32.1339,103.733612],[32.133678,103.733719],[32.13327,103.734016],[32.132912,103.734138],[32.132721,103.734177],[32.132309,103.734451],[32.13208,103.734528],[32.131302,103.734627],[32.130322,103.734642],[32.129959,103.734703],[32.129459,103.734818],[32.128342,103.734962],[32.12801,103.734932],[32.12796,103.734947],[32.127811,103.734932],[32.127411,103.734818],[32.127129,103.734779],[32.126709,103.734642],[32.126419,103.734444],[32.12624,103.734329],[32.12587,103.733849],[32.125641,103.733711],[32.125179,103.733582],[32.124821,103.733543],[32.123871,103.733559],[32.12331,103.733521],[32.122761,103.733383],[32.12159,103.732971],[32.12088,103.732597],[32.120209,103.732147],[32.119419,103.731651],[32.118851,103.731148],[32.118061,103.73037],[32.11755,103.729736],[32.117001,103.728928],[32.11657,103.728508],[32.116482,103.728447],[32.11618,103.728317],[32.115959,103.728271],[32.115841,103.728233],[32.11515,103.728073],[32.114681,103.727882],[32.114521,103.727791],[32.11412,103.727226],[32.11396,103.727127],[32.1138,103.726967],[32.113609,103.726753],[32.11338,103.726562],[32.112801,103.726143],[32.11261,103.726112],[32.112209,103.726151],[32.112041,103.726128],[32.111629,103.725693],[32.111462,103.725578],[32.111382,103.725487],[32.11079,103.725159],[32.110691,103.725189],[32.110519,103.725319],[32.110249,103.725563],[32.11005,103.725731],[32.109749,103.725662],[32.109631,103.725563],[32.109341,103.725449],[32.108501,103.725731],[32.108212,103.725983],[32.107979,103.726227],[32.107899,103.726288],[32.107689,103.726372],[32.107262,103.726448],[32.107059,103.726433],[32.106621,103.726227],[32.1064,103.725937],[32.106468,103.725822],[32.10664,103.725662],[32.106419,103.725403],[32.106838,103.724632],[32.106541,103.724342],[32.106781,103.723579],[32.10656,103.723412],[32.106461,103.723213],[32.105831,103.723534],[32.10561,103.723511],[32.105389,103.723541],[32.103531,103.725349],[32.103321,103.725487],[32.103142,103.725563],[32.102829,103.725723],[32.102638,103.725754],[32.102261,103.725891],[32.102081,103.725922],[32.1017,103.725937],[32.100639,103.725937],[32.100368,103.725883],[32.100151,103.725639],[32.099911,103.725288],[32.099491,103.724838],[32.0994,103.724709],[32.09919,103.724068],[32.09903,103.723351],[32.09874,103.722366],[32.09869,103.722183],[32.098431,103.721733],[32.098091,103.721329],[32.098011,103.721268],[32.097778,103.72123],[32.09734,103.721336],[32.096729,103.721321],[32.096039,103.721069],[32.095852,103.72084],[32.095718,103.720329],[32.095692,103.720032],[32.095558,103.719658],[32.095242,103.71949],[32.094551,103.719528],[32.093971,103.719597],[32.093029,103.719841],[32.092461,103.720016],[32.092072,103.719994],[32.09169,103.720093],[32.09132,103.720222],[32.090988,103.720383],[32.090691,103.720467],[32.09034,103.720451],[32.090019,103.72039],[32.08976,103.720177],[32.089458,103.719994],[32.089298,103.719978],[32.08894,103.719887],[32.088661,103.71965],[32.088459,103.719582],[32.08799,103.719368],[32.0877,103.71917],[32.087158,103.718628],[32.086891,103.718407],[32.08662,103.718384],[32.08622,103.718437],[32.085991,103.718513],[32.085491,103.718719],[32.085121,103.718826],[32.08485,103.718964],[32.08456,103.719177],[32.084278,103.719513],[32.083988,103.719597],[32.083691,103.719414],[32.08334,103.719078],[32.083149,103.71891],[32.082939,103.718788],[32.082661,103.718811],[32.082359,103.718948],[32.081539,103.719131],[32.081551,103.719147],[32.08149,103.719147],[32.081402,103.719177],[32.081322,103.719177],[32.081108,103.719292],[32.0807,103.719437],[32.080441,103.719467],[32.079571,103.719292],[32.079418,103.7192],[32.079071,103.718903],[32.078289,103.718468],[32.077709,103.71804],[32.07732,103.717697],[32.077068,103.717644],[32.076691,103.717667],[32.07597,103.71785],[32.075291,103.717949],[32.074791,103.717903],[32.07415,103.717781],[32.073978,103.71769],[32.073811,103.717697],[32.073521,103.71759],[32.073269,103.71756],[32.073101,103.717461],[32.072868,103.717392],[32.072659,103.7173],[32.072201,103.717331],[32.071869,103.717308],[32.071651,103.717239],[32.071442,103.717163],[32.071369,103.717056],[32.071178,103.716927],[32.070919,103.716942],[32.070351,103.717209],[32.069969,103.717339],[32.069939,103.717133],[32.069771,103.716927],[32.071201,103.716042],[32.07135,103.715736],[32.07127,103.715477],[32.070969,103.715363],[32.070621,103.715279],[32.070332,103.715103],[32.070061,103.714867],[32.06992,103.714828],[32.06934,103.714539],[32.06897,103.714447],[32.068741,103.714417],[32.068489,103.714371],[32.068489,103.714256],[32.068359,103.714127],[32.068241,103.71376],[32.068069,103.71347],[32.067909,103.713387],[32.067501,103.713242],[32.06707,103.713173],[32.066971,103.713188],[32.06673,103.713463],[32.066639,103.713783],[32.06649,103.71405],[32.065781,103.714432],[32.065659,103.714233],[32.065651,103.713913],[32.06575,103.71283],[32.065701,103.712608],[32.065639,103.712532],[32.065121,103.71212],[32.065071,103.711838],[32.065239,103.711227],[32.065262,103.710899],[32.06509,103.710602],[32.064751,103.710327],[32.064442,103.710121],[32.064159,103.710213],[32.063801,103.71051],[32.063591,103.710823],[32.06345,103.711143],[32.063278,103.711411],[32.063019,103.711502],[32.06271,103.711517],[32.062469,103.71138],[32.062168,103.711082],[32.06192,103.710777],[32.06189,103.710609],[32.061798,103.710243],[32.061611,103.709633],[32.06134,103.709129],[32.0611,103.708908],[32.06097,103.70874],[32.06094,103.708641],[32.060879,103.708618],[32.060692,103.708397],[32.060551,103.708183],[32.06041,103.707863],[32.06041,103.707817],[32.060459,103.707581],[32.060478,103.707321],[32.06041,103.707062],[32.060181,103.706543],[32.06015,103.70636],[32.060181,103.705681],[32.05999,103.705177],[32.059761,103.704674],[32.05954,103.704399],[32.059391,103.704086],[32.05901,103.703987],[32.058632,103.703957],[32.05806,103.703819],[32.057991,103.703613],[32.05806,103.703194],[32.057499,103.703552],[32.057331,103.703819],[32.05698,103.704231],[32.05648,103.704903],[32.05624,103.705261],[32.056068,103.705452],[32.055962,103.705627],[32.055691,103.705872],[32.0555,103.705994],[32.05529,103.70607],[32.055061,103.7062],[32.054859,103.706284],[32.0546,103.706306],[32.054409,103.705971],[32.0541,103.705528],[32.05405,103.705307],[32.053959,103.705109],[32.053959,103.704964],[32.054081,103.704842],[32.054539,103.704552],[32.054741,103.704468],[32.054859,103.704231],[32.05481,103.703911],[32.054722,103.703659],[32.0546,103.703461],[32.054501,103.703247],[32.054451,103.703056],[32.054619,103.702797],[32.05455,103.702911],[32.056252,103.701553],[32.056499,103.701393],[32.056709,103.70118],[32.056801,103.701027],[32.057209,103.700912],[32.057961,103.700989],[32.058311,103.700768],[32.058529,103.700684],[32.058811,103.700706],[32.059181,103.700844],[32.0592,103.700867],[32.059509,103.701019],[32.059669,103.701073],[32.060009,103.700996],[32.060581,103.700813],[32.06073,103.700661],[32.06078,103.700417],[32.06076,103.700233],[32.06057,103.699951],[32.060429,103.699837],[32.060169,103.699677],[32.058109,103.698669],[32.057529,103.698318],[32.057381,103.698257],[32.057308,103.69825],[32.057011,103.698143],[32.056919,103.69809],[32.05685,103.698013],[32.056671,103.697723],[32.056561,103.697388],[32.056461,103.696854],[32.0564,103.696701],[32.055801,103.695648],[32.055531,103.695229],[32.055012,103.694649],[32.054909,103.69442],[32.05484,103.693748],[32.054829,103.693298],[32.054821,103.693039],[32.05484,103.69265],[32.054699,103.692177],[32.05471,103.692101],[32.054562,103.691803],[32.053829,103.690521],[32.053612,103.690224],[32.053162,103.689713],[32.052589,103.688713],[32.052509,103.688606],[32.05228,103.688454],[32.051979,103.688316],[32.051769,103.688171],[32.05154,103.687897],[32.05138,103.687752],[32.051041,103.687187],[32.05088,103.687027],[32.050549,103.687027],[32.04998,103.687103],[32.049671,103.686989],[32.04921,103.686707],[32.04884,103.68615],[32.048988,103.685677],[32.048859,103.684868],[32.048698,103.684334],[32.04834,103.6828],[32.048092,103.681953],[32.048038,103.681664],[32.048149,103.68132],[32.04829,103.681358],[32.048149,103.681213],[32.047981,103.680946],[32.047791,103.680733],[32.04731,103.680023],[32.046822,103.679764],[32.046478,103.679703],[32.046249,103.679611],[32.046211,103.679604],[32.0462,103.679619],[32.045959,103.679878],[32.045879,103.680122],[32.045681,103.680962],[32.045631,103.681129],[32.045521,103.681473],[32.045311,103.682533],[32.045219,103.682877],[32.04509,103.683601],[32.044991,103.683937],[32.044788,103.684158],[32.044609,103.684196],[32.043598,103.68428],[32.042339,103.684319],[32.04211,103.684349],[32.04179,103.684509],[32.041679,103.684669],[32.0415,103.684883],[32.04113,103.684967],[32.041069,103.684937],[32.040691,103.684624],[32.04034,103.68454],[32.03973,103.684624],[32.039589,103.684593],[32.039341,103.684464],[32.038689,103.683983],[32.038311,103.68383],[32.0382,103.683769],[32.038101,103.683678],[32.037682,103.683083],[32.037521,103.682961],[32.037281,103.682922],[32.037289,103.682953],[32.037029,103.683006],[32.03677,103.68309],[32.036461,103.683273],[32.036072,103.683601],[32.036011,103.683693],[32.035789,103.684303],[32.035461,103.684898],[32.035381,103.686089],[32.033588,103.686653],[32.03339,103.687881],[32.033291,103.688087],[32.033081,103.688461],[32.032982,103.68856],[32.032951,103.688622],[32.03281,103.688744],[32.032391,103.689171],[32.032379,103.689217],[32.03233,103.689247],[32.031929,103.689728],[32.031879,103.689758],[32.0317,103.689934],[32.031361,103.69017],[32.031109,103.690269],[32.030891,103.690323],[32.030621,103.690323],[32.030411,103.690247],[32.029942,103.690117],[32.029812,103.690063],[32.029789,103.690041],[32.029701,103.69001],[32.02953,103.689987],[32.02906,103.689789],[32.02874,103.689713],[32.028679,103.689682],[32.02832,103.689552],[32.027969,103.689598],[32.02779,103.689713],[32.02774,103.689789],[32.027599,103.689911],[32.02747,103.690048],[32.02689,103.690582],[32.026562,103.690826],[32.025902,103.691238],[32.025791,103.691353],[32.02533,103.691628],[32.025211,103.691757],[32.025082,103.691963],[32.02504,103.692108],[32.025021,103.692329],[32.025021,103.692688],[32.02504,103.69278],[32.025021,103.693359],[32.024921,103.693649],[32.024811,103.69381],[32.024632,103.693947],[32.02438,103.694],[32.024231,103.693916],[32.023949,103.693527],[32.02346,103.693108],[32.023392,103.693024],[32.023048,103.692467],[32.0228,103.692017],[32.022049,103.690773],[32.02161,103.68985],[32.02132,103.68856],[32.021198,103.68856],[32.018799,103.687172],[32.018398,103.687973],[32.017841,103.688713],[32.017681,103.688873],[32.01749,103.688988],[32.017269,103.689072],[32.016529,103.689171],[32.01627,103.689232],[32.016109,103.68924],[32.015911,103.689194],[32.015789,103.689087],[32.015659,103.688873],[32.015282,103.688042],[32.01524,103.687988],[32.015141,103.687767],[32.01498,103.6875],[32.014832,103.687309],[32.014671,103.687241],[32.014599,103.687248],[32.014469,103.687302],[32.014351,103.687393],[32.01403,103.687553],[32.013962,103.68763],[32.013512,103.687889],[32.013248,103.687958],[32.013031,103.687897],[32.012581,103.687714],[32.012291,103.687553],[32.01202,103.687332],[32.01173,103.686836],[32.01165,103.686684],[32.011608,103.686623],[32.01152,103.686417],[32.0112,103.685883],[32.01107,103.685593],[32.010941,103.68515],[32.010891,103.684738],[32.010761,103.683968],[32.010681,103.683746],[32.01062,103.683708],[32.010551,103.683678],[32.01012,103.683777],[32.00996,103.683853],[32.009838,103.683937],[32.00935,103.684143],[32.0093,103.684174],[32.009121,103.684242],[32.00806,103.684708],[32.00771,103.684776],[32.006889,103.684822],[32.005989,103.684822],[32.005859,103.684799],[32.00555,103.684593],[32.005421,103.684341],[32.005329,103.684013],[32.00515,103.683601],[32.005001,103.683434],[32.004749,103.683296],[32.004169,103.683273],[32.003941,103.68338],[32.00388,103.68364],[32.00391,103.684212],[32.004059,103.68502],[32.004089,103.685089],[32.004139,103.685707],[32.004219,103.686089],[32.00441,103.686531],[32.004959,103.687462],[32.005562,103.688522],[32.005859,103.689491],[32.005871,103.69001],[32.00568,103.690758],[32.00552,103.691643],[32.004871,103.693199],[32.004799,103.693359],[32.0047,103.693489],[32.00449,103.693489],[32.004379,103.69326],[32.00444,103.692886],[32.004509,103.692108],[32.00449,103.691849],[32.00444,103.691673],[32.004009,103.690979],[32.00378,103.690742],[32.003441,103.690742],[32.003101,103.690804],[32.00272,103.690826],[32.002499,103.690697],[32.002419,103.690392],[32.0023,103.689796],[32.002209,103.689667],[32.00145,103.688766],[32.00124,103.688393],[32.00082,103.687828],[32.000992,103.687607],[32.000961,103.687553],[32.00106,103.687531],[32.001209,103.687347],[32.00016,103.685837],[31.99964,103.685143],[31.99942,103.684769],[31.999229,103.684349],[31.99905,103.683792],[31.998989,103.683434],[31.998949,103.683281],[31.998859,103.683098],[31.998819,103.68306],[31.998409,103.682907],[31.998079,103.682671],[31.997959,103.682503],[31.997829,103.682228],[31.997499,103.682091],[31.997,103.682266],[31.996469,103.682426],[31.99605,103.682426],[31.99486,103.682411],[31.994129,103.681923],[31.99395,103.681549],[31.99382,103.680733],[31.99361,103.680489],[31.993389,103.680641],[31.992479,103.681931],[31.992331,103.682098],[31.99192,103.682259],[31.991211,103.682198],[31.990641,103.682121],[31.989719,103.681847],[31.98885,103.681557],[31.98814,103.681267],[31.98777,103.681091],[31.98768,103.680992],[31.987761,103.680817],[31.987921,103.680878],[31.988609,103.681297],[31.990959,103.681488],[31.991449,103.681488],[31.991989,103.68116],[31.9921,103.680992],[31.99231,103.680511],[31.99242,103.680313],[31.99271,103.680031],[31.992861,103.679916],[31.99299,103.679764],[31.993219,103.67907],[31.9935,103.678726],[31.993641,103.67865],[31.993731,103.678436],[31.99354,103.678329],[31.993441,103.678413],[31.99317,103.678703],[31.99308,103.678848],[31.992929,103.67939],[31.992689,103.67968],[31.992359,103.679787],[31.99194,103.680229],[31.99155,103.680397],[31.99077,103.680252],[31.990499,103.680153],[31.99,103.679901],[31.989771,103.679802],[31.98945,103.679733],[31.98896,103.679604],[31.988859,103.679558],[31.98881,103.679497],[31.988251,103.679222],[31.987749,103.679077],[31.98703,103.679077],[31.98654,103.679153],[31.98535,103.679413],[31.98514,103.67942],[31.984949,103.67939],[31.98477,103.679337],[31.98423,103.678902],[31.98399,103.678673],[31.98382,103.678413],[31.98365,103.677872],[31.983561,103.67691],[31.983561,103.676697],[31.983521,103.676399],[31.983509,103.676422],[31.983419,103.6763],[31.98321,103.676147],[31.983049,103.676079],[31.982861,103.676041],[31.9825,103.676003],[31.982321,103.676003],[31.98192,103.675957],[31.98172,103.675972],[31.981541,103.676003],[31.981211,103.676132],[31.98065,103.67646],[31.98004,103.676773],[31.979469,103.677017],[31.978901,103.677094],[31.97864,103.677101],[31.978121,103.677193],[31.97716,103.677322],[31.97678,103.677353],[31.97662,103.677361],[31.976391,103.677406],[31.975889,103.677467],[31.97518,103.677452],[31.97434,103.677452],[31.972851,103.677422],[31.972481,103.677498],[31.972269,103.677597],[31.972019,103.677711],[31.97098,103.678223],[31.970699,103.678268],[31.97035,103.67823],[31.970209,103.678169],[31.9692,103.677452],[31.969009,103.677406],[31.968861,103.677422],[31.968651,103.677467],[31.968149,103.677643],[31.96809,103.677628],[31.96797,103.677681],[31.96767,103.677963],[31.96734,103.678337],[31.96706,103.678772],[31.96677,103.679108],[31.96656,103.679268],[31.96627,103.679611],[31.96604,103.680023],[31.965691,103.680557],[31.9653,103.680649],[31.964319,103.680389],[31.963421,103.680183],[31.96328,103.679947],[31.96348,103.679878],[31.963539,103.679893],[31.96409,103.680153],[31.96434,103.680191],[31.96452,103.680191],[31.964701,103.680153],[31.96505,103.679962],[31.96534,103.679703],[31.96578,103.679398],[31.966209,103.678726],[31.966619,103.67791],[31.966999,103.677277],[31.96771,103.676239],[31.967979,103.675949],[31.96834,103.675743],[31.96888,103.675522],[31.96911,103.675323],[31.969009,103.675201],[31.96888,103.675278],[31.968691,103.675461],[31.968349,103.675697],[31.96773,103.67601],[31.96744,103.676178],[31.967239,103.676422],[31.96682,103.67717],[31.96637,103.677567],[31.965931,103.677887],[31.965731,103.677994],[31.96524,103.678032],[31.964569,103.677971],[31.96418,103.678108],[31.96356,103.678459],[31.963341,103.678352],[31.963449,103.678131],[31.964211,103.677711],[31.96497,103.677437],[31.96604,103.677391],[31.966471,103.677063],[31.96681,103.676117],[31.967119,103.675697],[31.96789,103.675049],[31.968349,103.674713],[31.968861,103.674477],[31.968941,103.674232],[31.968691,103.674118],[31.968611,103.674133],[31.968361,103.674217],[31.96801,103.674431],[31.96714,103.675072],[31.96664,103.67527],[31.966471,103.675247],[31.966181,103.675323],[31.96574,103.675484],[31.965521,103.675537],[31.96493,103.675636],[31.963949,103.675972],[31.96307,103.676208],[31.96254,103.67617],[31.96192,103.675827],[31.960951,103.675194],[31.960871,103.675133],[31.960739,103.674927],[31.96084,103.67482],[31.961069,103.674911],[31.96154,103.675346],[31.962179,103.675468],[31.962669,103.675468],[31.962879,103.67543],[31.96319,103.675293],[31.96376,103.674843],[31.96398,103.674622],[31.964001,103.674301],[31.963751,103.674339],[31.963039,103.674927],[31.962721,103.675018],[31.962061,103.674911],[31.96166,103.674683],[31.96077,103.673447],[31.96077,103.673424],[31.95982,103.672707],[31.95936,103.672493],[31.95837,103.672241],[31.95751,103.672234],[31.9566,103.672363],[31.95599,103.67218],[31.95553,103.671944],[31.95491,103.671677],[31.953979,103.671417],[31.953461,103.671089],[31.95289,103.67086],[31.95249,103.670731],[31.95084,103.670067],[31.950411,103.670029],[31.950081,103.670082],[31.94912,103.670319],[31.94894,103.670326],[31.948771,103.670303],[31.948521,103.670303],[31.94829,103.670341],[31.948021,103.670441],[31.94791,103.670509],[31.947599,103.670509],[31.94602,103.67038],[31.945841,103.670433],[31.94503,103.670418],[31.94383,103.670372],[31.943661,103.670387],[31.943171,103.670403],[31.942419,103.670448],[31.941509,103.67067],[31.941351,103.670692],[31.941111,103.670776],[31.940821,103.670929],[31.94002,103.671257],[31.93902,103.671547],[31.93849,103.671623],[31.93815,103.671692],[31.937639,103.671738],[31.937469,103.671783],[31.93697,103.671852],[31.93646,103.672043],[31.93585,103.672333],[31.934759,103.672752],[31.93413,103.672867],[31.933599,103.673019],[31.93354,103.673058],[31.932859,103.673279],[31.93256,103.67334],[31.931919,103.673264],[31.931589,103.673149],[31.931379,103.673042],[31.93117,103.672859],[31.930771,103.67276],[31.930531,103.67276],[31.93025,103.672691],[31.929951,103.672691],[31.92959,103.672623],[31.929331,103.672401],[31.929041,103.672379],[31.92865,103.672188],[31.92831,103.672058],[31.92807,103.672012],[31.927919,103.671783],[31.92782,103.671547],[31.92782,103.671547],[31.927719,103.671501],[31.92771,103.671417],[31.92749,103.671432],[31.926901,103.671623],[31.92679,103.671707],[31.926661,103.671753],[31.926371,103.671883],[31.92581,103.672043],[31.925119,103.672096],[31.9249,103.67215],[31.92481,103.672127],[31.92453,103.671997],[31.92415,103.671989],[31.923849,103.672096],[31.92359,103.67215],[31.922529,103.672409],[31.922079,103.672539],[31.921459,103.672783],[31.92091,103.673141],[31.920349,103.673569],[31.919979,103.67379],[31.919319,103.674133],[31.918659,103.674423],[31.91729,103.675049],[31.91678,103.675262],[31.91613,103.675682],[31.91539,103.676239],[31.915359,103.676582],[31.914511,103.677742],[31.914009,103.678291],[31.913601,103.678833],[31.91308,103.678993],[31.912729,103.679131],[31.9121,103.679466],[31.911579,103.679718],[31.91099,103.679832],[31.910271,103.679893],[31.90967,103.679993],[31.9091,103.68026],[31.907619,103.681168],[31.907049,103.681503],[31.906269,103.681839],[31.90589,103.681938],[31.904499,103.682213],[31.904249,103.682297],[31.90403,103.682281],[31.904119,103.682426],[31.903959,103.68248],[31.903431,103.682518],[31.90321,103.682602],[31.901991,103.683411],[31.90144,103.683746],[31.90024,103.684357],[31.899611,103.684769],[31.898359,103.685959],[31.897631,103.686348],[31.89703,103.686691],[31.896799,103.68679],[31.896139,103.686897],[31.89554,103.68692],[31.89493,103.686859],[31.894199,103.68663],[31.89382,103.686569],[31.893709,103.686577],[31.89315,103.686852],[31.89258,103.687492],[31.892191,103.68811],[31.891279,103.689301],[31.890841,103.689812],[31.89011,103.690804],[31.889391,103.691223],[31.889191,103.691292],[31.888929,103.691277],[31.888611,103.691231],[31.88792,103.690979],[31.887289,103.690666],[31.88656,103.690437],[31.886129,103.690376],[31.88599,103.690407],[31.885361,103.690712],[31.885,103.690567],[31.884661,103.690491],[31.884489,103.690613],[31.88435,103.690804],[31.884199,103.691093],[31.88397,103.691597],[31.883671,103.692062],[31.88357,103.692192],[31.88382,103.692307],[31.88278,103.69278],[31.882139,103.69313],[31.88139,103.693382],[31.87995,103.693489],[31.879089,103.693687],[31.87871,103.693871],[31.87858,103.693947],[31.878481,103.693916],[31.878059,103.694077],[31.87727,103.694649],[31.8771,103.694809],[31.876459,103.695236],[31.876011,103.69548],[31.87565,103.695534],[31.875521,103.695457],[31.874981,103.695259],[31.874701,103.695236],[31.874319,103.695343],[31.873831,103.695557],[31.87311,103.695923],[31.872299,103.696114],[31.871611,103.696136],[31.87063,103.696083],[31.87023,103.696098],[31.86994,103.696152],[31.869049,103.696487],[31.86899,103.696548],[31.86886,103.696854],[31.868799,103.697189],[31.86879,103.697708],[31.86862,103.698029],[31.868509,103.698059],[31.86772,103.698013],[31.867599,103.69796],[31.86746,103.69796],[31.867069,103.697998],[31.866871,103.697891],[31.86672,103.69767],[31.866501,103.697449],[31.866051,103.697197],[31.865761,103.696892],[31.865219,103.696541],[31.864599,103.696083],[31.864519,103.695999],[31.86438,103.695717],[31.863899,103.69545],[31.86322,103.695358],[31.862711,103.695427],[31.86134,103.695557],[31.861099,103.695442],[31.86097,103.695412],[31.860649,103.695374],[31.860359,103.695358],[31.860029,103.695427],[31.859529,103.695686],[31.85914,103.695938],[31.858879,103.695969],[31.85874,103.69603],[31.85832,103.696037],[31.858009,103.696136],[31.85664,103.696747],[31.856409,103.696793],[31.856199,103.696777],[31.8557,103.696693],[31.855379,103.696671],[31.85475,103.696823],[31.853951,103.69706],[31.853689,103.69709],[31.853081,103.697052],[31.852369,103.696953],[31.85146,103.696747],[31.850861,103.696648],[31.849831,103.696602],[31.849291,103.696671],[31.848949,103.696671],[31.8487,103.696831],[31.848021,103.696877],[31.847349,103.696777],[31.84696,103.696739],[31.8466,103.696617],[31.8458,103.695999],[31.845579,103.695717],[31.845369,103.695389],[31.845169,103.694893],[31.844761,103.694054],[31.844509,103.693748],[31.84387,103.693314],[31.8437,103.693169],[31.843361,103.693047],[31.84314,103.693153],[31.843069,103.693283],[31.843031,103.693367],[31.842939,103.693893],[31.842859,103.694023],[31.84277,103.694077],[31.841921,103.694344],[31.841619,103.694389],[31.841511,103.694489],[31.841459,103.694504],[31.84137,103.694862],[31.841339,103.695251],[31.84124,103.695763],[31.841061,103.696518],[31.84091,103.696716],[31.8407,103.696854],[31.840509,103.697037],[31.84016,103.697861],[31.839609,103.698853],[31.839121,103.699532],[31.83886,103.70108],[31.838499,103.701141],[31.838421,103.701653],[31.838369,103.702339],[31.838329,103.702591],[31.838249,103.702843],[31.83782,103.703659],[31.836781,103.704193],[31.836821,103.705048],[31.83672,103.705704],[31.83482,103.710823],[31.835489,103.71196],[31.83531,103.712517],[31.835011,103.713013],[31.83404,103.712936],[31.832781,103.716331],[31.83177,103.715919],[31.831129,103.716087],[31.830839,103.716331],[31.83029,103.716728],[31.83008,103.716957],[31.829781,103.717499],[31.829479,103.71814],[31.829161,103.718758],[31.82902,103.718933],[31.828711,103.719254],[31.82844,103.719498],[31.82836,103.719704],[31.828369,103.71981],[31.82831,103.719887],[31.828291,103.719978],[31.82782,103.720734],[31.826111,103.721161],[31.823009,103.724838],[31.822451,103.725182],[31.821369,103.725723],[31.820841,103.726112],[31.82028,103.72644],[31.820021,103.726547],[31.81946,103.726852],[31.819099,103.727173],[31.81893,103.727631],[31.818899,103.727852],[31.818899,103.727951],[31.81883,103.728271],[31.8188,103.728691],[31.81778,103.728409],[31.81743,103.7286],[31.81723,103.728737],[31.81683,103.728958],[31.81637,103.729111],[31.81601,103.729378],[31.815741,103.729462],[31.815371,103.729492],[31.81517,103.729584],[31.814989,103.729752],[31.814989,103.729897],[31.815599,103.730919],[31.81551,103.731392],[31.81539,103.731552],[31.81481,103.731583],[31.813641,103.731087],[31.813419,103.73127],[31.813231,103.731483],[31.81304,103.731712],[31.81291,103.73201],[31.812599,103.732117],[31.81226,103.732399],[31.81201,103.732559],[31.81159,103.732712],[31.81119,103.732674],[31.811069,103.732788],[31.81065,103.732727],[31.81044,103.732819],[31.81044,103.732948],[31.8099,103.732964],[31.809681,103.732986],[31.809259,103.733231],[31.809,103.73333],[31.808741,103.733383],[31.808281,103.733231],[31.8078,103.733177],[31.80777,103.733208],[31.80809,103.734016],[31.80801,103.734131],[31.80776,103.734138],[31.80702,103.733963],[31.806049,103.73391],[31.80595,103.734001],[31.80534,103.734131],[31.805201,103.734467],[31.805201,103.735077],[31.805111,103.735077],[31.805019,103.735962],[31.804911,103.736061],[31.80488,103.736153],[31.804291,103.735771],[31.803391,103.735138],[31.802799,103.734863],[31.802441,103.734749],[31.80213,103.73468],[31.801661,103.734596],[31.801189,103.734482],[31.80093,103.734444],[31.80147,103.733681],[31.80092,103.733597],[31.800369,103.733429],[31.79858,103.732971],[31.7983,103.732933],[31.797649,103.732811],[31.79673,103.732826],[31.796431,103.732918],[31.79594,103.733017],[31.79587,103.73307],[31.795811,103.73317],[31.79587,103.733437],[31.796009,103.733582],[31.795839,103.733742],[31.79594,103.73407],[31.79627,103.734894],[31.795931,103.735298],[31.79587,103.735443],[31.79578,103.735764],[31.795811,103.735786],[31.795839,103.735947],[31.795971,103.73629],[31.796049,103.736839],[31.796089,103.737083],[31.796089,103.737518],[31.79598,103.738052],[31.795971,103.738373],[31.795919,103.738823],[31.795839,103.739319],[31.79579,103.739769],[31.79587,103.740547],[31.796141,103.742592],[31.79608,103.742622],[31.79587,103.742081],[31.79582,103.742561],[31.79558,103.742851],[31.79524,103.743011],[31.79487,103.743393],[31.791531,103.753731],[31.790319,103.753754],[31.78965,103.754066],[31.789061,103.754578],[31.7887,103.755051],[31.78842,103.7556],[31.78825,103.755981],[31.787979,103.756798],[31.787901,103.756958],[31.787571,103.757446],[31.787069,103.758057],[31.78665,103.758438],[31.78623,103.758682],[31.786051,103.758743],[31.784121,103.759537],[31.783621,103.759697],[31.78343,103.759697],[31.783079,103.759857],[31.78252,103.760017],[31.78229,103.760429],[31.781969,103.760643],[31.781691,103.760643],[31.781321,103.760651],[31.78089,103.760803],[31.780479,103.760918],[31.78023,103.761017],[31.780081,103.761139],[31.77957,103.761681],[31.77924,103.762138],[31.7792,103.762253],[31.779119,103.762688],[31.77916,103.763138],[31.77915,103.763344],[31.77903,103.763603],[31.778959,103.763962],[31.77894,103.764267],[31.77887,103.764503],[31.77846,103.765358],[31.778111,103.765938],[31.777809,103.766518],[31.777611,103.766853],[31.777361,103.767357],[31.777241,103.767723],[31.77718,103.768112],[31.777109,103.76886],[31.7771,103.769501],[31.777121,103.769859],[31.77721,103.770309],[31.777361,103.771294],[31.77734,103.771584],[31.777189,103.77227],[31.7771,103.773232],[31.77759,103.774353],[31.776859,103.776382],[31.77779,103.777153],[31.777719,103.777412],[31.777571,103.777603],[31.77737,103.777733],[31.776951,103.777908],[31.77623,103.778259],[31.776159,103.778313],[31.77593,103.778969],[31.774679,103.778999],[31.774561,103.779083],[31.774309,103.779404],[31.77387,103.780411],[31.77351,103.781342],[31.773149,103.782097],[31.773479,103.78299],[31.76511,103.789299],[31.76424,103.788803],[31.764059,103.788918],[31.76396,103.789017],[31.76359,103.78933],[31.763201,103.789612],[31.76284,103.790092],[31.76256,103.790787],[31.76247,103.791367],[31.762871,103.792313],[31.7623,103.793083],[31.763201,103.794403],[31.76347,103.794762],[31.764099,103.795464],[31.764521,103.796158],[31.765039,103.797447],[31.765289,103.798141],[31.765409,103.798553],[31.765511,103.799088],[31.76552,103.799751],[31.765471,103.800423],[31.76553,103.801903],[31.765551,103.802116],[31.76556,103.802422],[31.76553,103.80323],[31.765539,103.805206],[31.76553,103.805862],[31.765511,103.805923],[31.765459,103.807419],[31.765499,103.807999],[31.76549,103.808167],[31.765591,103.808479],[31.765671,103.808777],[31.765909,103.809509],[31.766029,103.809807],[31.7661,103.810127],[31.76622,103.810516],[31.766491,103.81205],[31.76668,103.812691],[31.767071,103.813316],[31.76815,103.814392],[31.768391,103.814743],[31.76856,103.815079],[31.76861,103.815353],[31.76865,103.815804],[31.768539,103.816299],[31.76837,103.816772],[31.76803,103.817413],[31.767691,103.817787],[31.76757,103.817833],[31.76709,103.818169],[31.766491,103.818489],[31.765921,103.818359],[31.765209,103.818123],[31.76478,103.818001],[31.76436,103.817917],[31.764151,103.81794],[31.76396,103.818024],[31.7638,103.818176],[31.762899,103.818771],[31.762751,103.818893],[31.762119,103.819878],[31.761869,103.820221],[31.761511,103.820778],[31.761311,103.821159],[31.760889,103.821877],[31.760509,103.822403],[31.760389,103.822533],[31.76022,103.822693],[31.76004,103.822823],[31.75967,103.822952],[31.759541,103.822952],[31.75906,103.822998],[31.758619,103.823097],[31.75794,103.823311],[31.757521,103.823471],[31.75667,103.823486],[31.751591,103.831108],[31.75139,103.831291],[31.75066,103.831802],[31.75094,103.833023],[31.750351,103.833847],[31.750219,103.833977],[31.750019,103.834091],[31.749229,103.834328],[31.74898,103.834503],[31.748501,103.835091],[31.748199,103.835854],[31.748199,103.835838],[31.747869,103.836678],[31.747589,103.837143],[31.747339,103.83744],[31.74721,103.837669],[31.74711,103.837692],[31.74708,103.837738],[31.746849,103.837769],[31.7467,103.837723],[31.746651,103.837738],[31.74621,103.837601],[31.745951,103.837608],[31.74544,103.837784],[31.74523,103.83783],[31.744459,103.83783],[31.74403,103.837967],[31.74374,103.838074],[31.743549,103.838203],[31.74305,103.838676],[31.74268,103.839233],[31.74264,103.839241],[31.74234,103.839577],[31.74229,103.839592],[31.74169,103.840752],[31.741409,103.841141],[31.741159,103.841011],[31.74094,103.841164],[31.740669,103.841454],[31.738171,103.843643],[31.737659,103.844048],[31.737391,103.844177],[31.737169,103.844238],[31.7369,103.844383],[31.73649,103.84449],[31.73601,103.844513],[31.734369,103.844421],[31.734011,103.844353],[31.73353,103.843582],[31.73074,103.845497],[31.722481,103.851181],[31.721781,103.850327],[31.72146,103.850388],[31.721239,103.850449],[31.7208,103.850632],[31.720289,103.850891],[31.719749,103.851257],[31.71924,103.851646],[31.718679,103.852013],[31.71838,103.852097],[31.71792,103.852119],[31.717039,103.852493],[31.7167,103.8526],[31.716,103.853142],[31.71582,103.853348],[31.7155,103.852966],[31.71513,103.853149],[31.714649,103.853256],[31.714319,103.853317],[31.713989,103.853409],[31.713329,103.853523],[31.712799,103.853447],[31.71246,103.853416],[31.71192,103.853363],[31.711491,103.853279],[31.711149,103.853256],[31.710831,103.853287],[31.710279,103.853523],[31.710039,103.853561],[31.709749,103.853569],[31.709419,103.8535],[31.70919,103.853378],[31.709021,103.853363],[31.70867,103.853432],[31.70829,103.853592],[31.707581,103.85379],[31.707319,103.853844],[31.706829,103.853851],[31.70647,103.853882],[31.706051,103.853889],[31.705891,103.853859],[31.704599,103.853119],[31.704229,103.852859],[31.703501,103.851593],[31.70344,103.851463],[31.70225,103.850548],[31.701151,103.84977],[31.7006,103.849579],[31.700199,103.850067],[31.699499,103.850227],[31.69916,103.850357],[31.697941,103.850883],[31.697689,103.850838],[31.697639,103.850853],[31.698191,103.850487],[31.697781,103.850502],[31.697229,103.850662],[31.696899,103.850662],[31.69673,103.850693],[31.696581,103.850632],[31.696159,103.850243],[31.695869,103.849747],[31.69516,103.848351],[31.69486,103.847588],[31.69433,103.846321],[31.69418,103.845993],[31.69404,103.845657],[31.693939,103.845467],[31.69384,103.845367],[31.69348,103.845093],[31.69335,103.844971],[31.69327,103.844948],[31.69294,103.844727],[31.69268,103.844513],[31.69241,103.844414],[31.692181,103.844368],[31.69173,103.844383],[31.691389,103.844437],[31.69006,103.844933],[31.68998,103.844948],[31.689449,103.844887],[31.68928,103.844833],[31.68854,103.844673],[31.686399,103.844727],[31.685869,103.844772],[31.68545,103.844772],[31.68499,103.84481],[31.6845,103.844833],[31.684099,103.844887],[31.68379,103.84491],[31.68375,103.844948],[31.683599,103.844994],[31.68347,103.844978],[31.683081,103.844879],[31.682541,103.844589],[31.682091,103.844261],[31.681471,103.843887],[31.68079,103.84359],[31.67959,103.84343],[31.6793,103.843353],[31.67861,103.842819],[31.677931,103.842216],[31.677271,103.841614],[31.676781,103.841202],[31.67572,103.84024],[31.67477,103.83934],[31.67441,103.83905],[31.67417,103.838814],[31.673901,103.838577],[31.673281,103.83799],[31.67313,103.837891],[31.672689,103.837433],[31.67164,103.836563],[31.6712,103.836143],[31.669941,103.834976],[31.669479,103.834534],[31.66906,103.834213],[31.66855,103.833969],[31.6682,103.833893],[31.66783,103.833763],[31.667379,103.833633],[31.66733,103.833656],[31.666821,103.833366],[31.66638,103.833031],[31.66555,103.832458],[31.664881,103.831863],[31.663839,103.830544],[31.663401,103.829941],[31.662809,103.829079],[31.662411,103.8284],[31.662041,103.827629],[31.66198,103.827469],[31.661921,103.827377],[31.661631,103.826813],[31.66135,103.826134],[31.66128,103.825989],[31.66123,103.825844],[31.661119,103.82563],[31.66086,103.824982],[31.66082,103.824669],[31.660879,103.824387],[31.661119,103.824112],[31.6614,103.8237],[31.66165,103.823158],[31.66206,103.822563],[31.66206,103.822166],[31.66115,103.82093],[31.6605,103.819977],[31.66037,103.819511],[31.6604,103.819298],[31.66054,103.819008],[31.661131,103.818253],[31.662029,103.817177],[31.66238,103.816566],[31.66254,103.816109],[31.66251,103.816078],[31.662821,103.815193],[31.662979,103.814796],[31.663099,103.814362],[31.66312,103.813957],[31.663,103.813606],[31.662861,103.813271],[31.662609,103.812897],[31.662161,103.812553],[31.661501,103.812119],[31.661381,103.812057],[31.66119,103.811897],[31.66066,103.811737],[31.657261,103.811653],[31.656969,103.811607],[31.656799,103.811607],[31.65591,103.811508],[31.65435,103.811256],[31.65407,103.81115],[31.65349,103.810959],[31.65291,103.810699],[31.65218,103.810318],[31.65169,103.810028],[31.651421,103.809837],[31.65086,103.809486],[31.650181,103.809013],[31.64917,103.80835],[31.64901,103.808273],[31.648069,103.80764],[31.64772,103.807457],[31.64661,103.806664],[31.646,103.806282],[31.645321,103.805817],[31.64521,103.805771],[31.644779,103.805473],[31.64201,103.803658],[31.64163,103.803429],[31.641411,103.803261],[31.640711,103.802788],[31.640459,103.80265],[31.640051,103.802353],[31.63879,103.801537],[31.638399,103.801224],[31.63818,103.800911],[31.637899,103.800056],[31.637699,103.799606],[31.63752,103.79937],[31.637421,103.799309],[31.637091,103.799179],[31.636299,103.798683],[31.63612,103.798439],[31.636049,103.79818],[31.63599,103.797836],[31.63596,103.797417],[31.63578,103.796913],[31.63439,103.795692],[31.633631,103.79509],[31.633011,103.794724],[31.63138,103.793823],[31.630911,103.793266],[31.63064,103.792877],[31.630251,103.792221],[31.628441,103.789413],[31.627769,103.788399],[31.62665,103.786667],[31.626141,103.786324],[31.625351,103.786057],[31.624701,103.785873],[31.62455,103.785858],[31.623051,103.786079],[31.62244,103.785873],[31.622271,103.78569],[31.621571,103.784348],[31.620819,103.782867],[31.62027,103.781723],[31.620211,103.781509],[31.62023,103.780823],[31.620359,103.779968],[31.620359,103.779022],[31.62023,103.776962],[31.62007,103.77623],[31.619789,103.775642],[31.61961,103.775467],[31.619471,103.775192],[31.619471,103.775131],[31.61939,103.775017],[31.61923,103.774712],[31.618891,103.77417],[31.618549,103.773529],[31.6182,103.772949],[31.617941,103.772743],[31.6178,103.772667],[31.617611,103.772621],[31.615549,103.772438],[31.615431,103.772453],[31.61515,103.772438],[31.61446,103.772339],[31.6124,103.772141],[31.611521,103.771957],[31.611401,103.771889],[31.61091,103.771347],[31.610479,103.770729],[31.609631,103.769333],[31.609159,103.768631],[31.608749,103.767776],[31.60873,103.767029],[31.60874,103.766586],[31.60874,103.766281],[31.608841,103.765717],[31.60885,103.765213],[31.608801,103.764809],[31.60874,103.764587],[31.6085,103.763832],[31.608351,103.763412],[31.608299,103.763184],[31.60766,103.7612],[31.607519,103.760681],[31.60745,103.760246],[31.60742,103.759247],[31.60746,103.758263],[31.607491,103.758011],[31.607479,103.757538],[31.60751,103.755051],[31.60742,103.754303],[31.60717,103.753563],[31.6071,103.753403],[31.606939,103.753181],[31.606911,103.753014],[31.606859,103.752869],[31.60623,103.751663],[31.606039,103.751427],[31.605419,103.750862],[31.60511,103.750618],[31.604509,103.750183],[31.603661,103.749817],[31.60322,103.749542],[31.602449,103.749207],[31.60186,103.749046],[31.60113,103.748894],[31.600531,103.748779],[31.600149,103.748749],[31.599739,103.74881],[31.599489,103.748947],[31.599791,103.750053],[31.59976,103.750511],[31.59939,103.750511],[31.598949,103.750381],[31.598301,103.749687],[31.597931,103.749947],[31.59779,103.750061],[31.59738,103.750267],[31.597139,103.750298],[31.596889,103.750267],[31.59667,103.750229],[31.595501,103.750107],[31.595249,103.750107],[31.594379,103.750031],[31.593941,103.749969],[31.593651,103.749893],[31.59326,103.749657],[31.59285,103.749336],[31.591949,103.748558],[31.59079,103.74762],[31.589581,103.74659],[31.58902,103.746071],[31.58843,103.745483],[31.587721,103.744789],[31.586809,103.743843],[31.585581,103.742828],[31.585119,103.742523],[31.58432,103.741852],[31.584089,103.741547],[31.583691,103.740662],[31.5835,103.740356],[31.58338,103.74012],[31.583389,103.739594],[31.58337,103.739517],[31.583269,103.73941],[31.58316,103.739052],[31.58317,103.738792],[31.583099,103.738708],[31.582979,103.738319],[31.582911,103.738052],[31.58285,103.737244],[31.583099,103.735764],[31.58333,103.734688],[31.583441,103.733932],[31.583599,103.73304],[31.58354,103.732521],[31.583509,103.732407],[31.583321,103.732109],[31.583139,103.731934],[31.582781,103.731773],[31.58251,103.731468],[31.582439,103.731194],[31.582399,103.730988],[31.58235,103.730873],[31.582319,103.730713],[31.58205,103.730408],[31.581869,103.730232],[31.58148,103.729797],[31.581249,103.729568],[31.57992,103.728477],[31.579309,103.728127],[31.578699,103.727837],[31.57826,103.727676],[31.577909,103.727654],[31.57765,103.727661],[31.577391,103.727859],[31.57725,103.728027],[31.577181,103.728218],[31.577049,103.728989],[31.57687,103.729736],[31.57692,103.729759],[31.576811,103.730118],[31.576521,103.73053],[31.57486,103.731537],[31.574511,103.731621],[31.57411,103.731613],[31.572451,103.731178],[31.572081,103.731049],[31.57181,103.730904],[31.571581,103.730659],[31.57115,103.730003],[31.57091,103.729698],[31.570841,103.729446],[31.570551,103.728958],[31.570419,103.728668],[31.570259,103.727829],[31.570221,103.727303],[31.570259,103.726196],[31.570601,103.725067],[31.571039,103.723846],[31.571091,103.723778],[31.571409,103.723427],[31.571951,103.723061],[31.572781,103.72226],[31.572981,103.721764],[31.573111,103.720444],[31.57321,103.719803],[31.57345,103.717644],[31.57349,103.717079],[31.57333,103.716583],[31.572769,103.715477],[31.57268,103.715317],[31.57251,103.714951],[31.572399,103.714767],[31.572121,103.714607],[31.570459,103.714119],[31.57028,103.714073],[31.56971,103.714188],[31.569071,103.714523],[31.56881,103.71463],[31.56859,103.714638],[31.56839,103.714592],[31.56753,103.714233],[31.567221,103.71405],[31.566891,103.713669],[31.56612,103.712608],[31.56591,103.712273],[31.56567,103.711967],[31.565531,103.7117],[31.565269,103.710907],[31.565241,103.710709],[31.56505,103.708588],[31.564871,103.707779],[31.56448,103.70652],[31.56403,103.7052],[31.563551,103.704109],[31.56237,103.701767],[31.56175,103.70079],[31.561319,103.700592],[31.56106,103.700706],[31.560499,103.701073],[31.560169,103.700996],[31.559509,103.700127],[31.55743,103.697662],[31.557249,103.697479],[31.55703,103.697067],[31.556971,103.696693],[31.556971,103.696404],[31.55706,103.695908],[31.5571,103.695534],[31.55711,103.695259],[31.557211,103.694489],[31.557289,103.693314],[31.55723,103.692993],[31.55699,103.692467],[31.556499,103.691849],[31.555901,103.691437],[31.555229,103.691093],[31.554729,103.690727],[31.553869,103.690033],[31.55308,103.689453],[31.55245,103.689293],[31.55179,103.689331],[31.5515,103.689194],[31.551279,103.688927],[31.551201,103.68882],[31.551069,103.68856],[31.550911,103.688332],[31.55088,103.688263],[31.550791,103.688141],[31.55068,103.687943],[31.550501,103.687691],[31.55039,103.687492],[31.550249,103.687332],[31.550039,103.686989],[31.549721,103.686569],[31.549561,103.686401],[31.54932,103.686073],[31.549061,103.685806],[31.548849,103.685654],[31.548201,103.685471],[31.546721,103.685173],[31.54623,103.685043],[31.545071,103.684883],[31.544661,103.684914],[31.54361,103.685059],[31.542259,103.685219],[31.541861,103.685226],[31.54143,103.68512],[31.54108,103.684959],[31.540331,103.684486],[31.539591,103.684113],[31.539339,103.683937],[31.538879,103.683456],[31.53878,103.683273],[31.538549,103.682693],[31.53841,103.682228],[31.538349,103.682083],[31.53797,103.681633],[31.537781,103.681549],[31.53731,103.681503],[31.536909,103.681633],[31.536739,103.681793],[31.53632,103.682243],[31.535919,103.682571],[31.53581,103.682632],[31.53521,103.682831],[31.5347,103.682961],[31.534069,103.683067],[31.533119,103.683151],[31.532459,103.683151],[31.532169,103.682983],[31.531931,103.682549],[31.53187,103.682388],[31.531691,103.682007],[31.531469,103.681419],[31.531269,103.681068],[31.53096,103.680771],[31.53055,103.680618],[31.53031,103.680397],[31.53005,103.680122],[31.52984,103.679527],[31.529831,103.679237],[31.52985,103.678467],[31.529909,103.678139],[31.529831,103.677742],[31.529591,103.677254],[31.529289,103.676773],[31.52895,103.676277],[31.52866,103.675941],[31.528271,103.675453],[31.527849,103.675003],[31.526911,103.674347],[31.525351,103.67337],[31.5249,103.673058],[31.524019,103.672531],[31.523661,103.672401],[31.52273,103.672012],[31.522129,103.671738],[31.521561,103.671509],[31.521231,103.67131],[31.52075,103.670868],[31.52038,103.670471],[31.520069,103.670227],[31.519911,103.670128],[31.51977,103.670013],[31.518841,103.669434],[31.518539,103.669327],[31.5182,103.669296],[31.516991,103.669312],[31.516451,103.669228],[31.516319,103.669167],[31.51606,103.668999],[31.515751,103.668556],[31.51548,103.668114],[31.515421,103.667801],[31.5154,103.667542],[31.515381,103.666924],[31.515329,103.666283],[31.515261,103.665817],[31.51515,103.665497],[31.51512,103.664787],[31.51515,103.664192],[31.51516,103.66349],[31.51511,103.66272],[31.5149,103.662178],[31.514629,103.661797],[31.514311,103.66124],[31.51392,103.660606],[31.513571,103.660072],[31.51343,103.65992],[31.51298,103.659317],[31.51251,103.658638],[31.512381,103.658386],[31.5123,103.658096],[31.51219,103.657417],[31.5121,103.656967],[31.512091,103.65657],[31.5121,103.656174],[31.51206,103.655632],[31.51227,103.654694],[31.51231,103.653923],[31.51231,103.653488],[31.512251,103.653],[31.51214,103.652657],[31.51195,103.652367],[31.511379,103.651993],[31.51108,103.651909],[31.51009,103.651833],[31.509399,103.651611],[31.509001,103.65139],[31.50861,103.651253],[31.508169,103.651001],[31.50762,103.650551],[31.507179,103.650223],[31.506929,103.650146],[31.506809,103.650017],[31.50654,103.649467],[31.506161,103.648819],[31.505791,103.648247],[31.505501,103.647942],[31.50522,103.647743],[31.50474,103.64743],[31.5044,103.647377],[31.503639,103.647423],[31.50312,103.647408],[31.50276,103.647362],[31.50252,103.647293],[31.502279,103.647186],[31.50178,103.647293],[31.50156,103.647324],[31.501129,103.647163],[31.50087,103.647011],[31.499599,103.646423],[31.499189,103.64592],[31.49877,103.64518],[31.49864,103.644798],[31.498529,103.644257],[31.49844,103.643959],[31.498249,103.643623],[31.49818,103.643509],[31.49803,103.643204],[31.49761,103.642769],[31.49737,103.64241],[31.497351,103.642281],[31.496889,103.641319],[31.49667,103.640373],[31.49663,103.640022],[31.49654,103.639511],[31.49651,103.639214],[31.496559,103.638962],[31.496651,103.638741],[31.496771,103.638527],[31.496889,103.638321],[31.49692,103.638],[31.496679,103.637642],[31.496361,103.637306],[31.49608,103.637123],[31.495819,103.637016],[31.495211,103.636902],[31.495001,103.636887],[31.4946,103.636818],[31.49444,103.636742],[31.49408,103.636436],[31.493879,103.636208],[31.49338,103.635498],[31.493259,103.635101],[31.49325,103.63456],[31.493299,103.634087],[31.49329,103.634064],[31.49328,103.633797],[31.493179,103.633537],[31.49304,103.633362],[31.49292,103.63311],[31.49287,103.632629],[31.492889,103.632347],[31.49287,103.632141],[31.49279,103.631889],[31.49268,103.631683],[31.492519,103.631279],[31.49246,103.631027],[31.49229,103.630524],[31.492279,103.630211],[31.49213,103.629646],[31.49206,103.629494],[31.492041,103.629478],[31.49194,103.629204],[31.49168,103.628479],[31.491529,103.627823],[31.491541,103.627007],[31.491779,103.625931],[31.49194,103.625412],[31.49206,103.625076],[31.49214,103.624893],[31.492161,103.624718],[31.49226,103.624557],[31.49284,103.624184],[31.493641,103.623482],[31.494209,103.622757],[31.49416,103.622543],[31.493589,103.621727],[31.493231,103.621323],[31.492849,103.621063],[31.49229,103.620827],[31.49198,103.62072],[31.491289,103.620644],[31.4911,103.620537],[31.490971,103.62043],[31.49082,103.62014],[31.490959,103.619667],[31.491131,103.619537],[31.49202,103.619431],[31.49262,103.619301],[31.492849,103.619164],[31.493589,103.618568],[31.493971,103.618217],[31.49407,103.618088],[31.49424,103.617722],[31.494249,103.617439],[31.494209,103.61702],[31.49416,103.616814],[31.49394,103.616463],[31.493799,103.616333],[31.49304,103.615288],[31.49287,103.614967],[31.49275,103.614693],[31.49246,103.61438],[31.49251,103.614326],[31.492359,103.614159],[31.4921,103.613907],[31.492029,103.613792],[31.491261,103.612923],[31.49037,103.611641],[31.489941,103.611397],[31.48942,103.611343],[31.489161,103.611237],[31.488001,103.611008],[31.48781,103.611],[31.48749,103.610901],[31.48715,103.610863],[31.48699,103.610863],[31.48642,103.610641],[31.485809,103.610527],[31.485399,103.610321],[31.48514,103.610168],[31.4848,103.609711],[31.48461,103.609352],[31.484529,103.609108],[31.48443,103.608566],[31.484421,103.608223],[31.484249,103.60759],[31.484171,103.60746],[31.484011,103.607246],[31.48378,103.60685],[31.483641,103.606483],[31.48325,103.605629],[31.48311,103.605347],[31.48307,103.605148],[31.48288,103.604584],[31.48271,103.604187],[31.482441,103.603287],[31.482109,103.602463],[31.481991,103.602074],[31.48176,103.601486],[31.481529,103.601044],[31.48126,103.600342],[31.48111,103.60006],[31.480829,103.599457],[31.48035,103.598396],[31.479919,103.597481],[31.479851,103.597382],[31.479401,103.596352],[31.47921,103.596039],[31.47884,103.59549],[31.478701,103.595261],[31.47863,103.59478],[31.478609,103.594254],[31.47863,103.59391],[31.478939,103.591682],[31.47924,103.590721],[31.47921,103.590088],[31.47917,103.589813],[31.479179,103.589661],[31.47929,103.588966],[31.47933,103.588593],[31.479521,103.587677],[31.479679,103.586761],[31.479891,103.585663],[31.47998,103.584953],[31.48003,103.584641],[31.480061,103.584351],[31.480089,103.584023],[31.47991,103.583214],[31.47979,103.58284],[31.47925,103.581673],[31.479031,103.581337],[31.478769,103.580887],[31.478291,103.580223],[31.47813,103.579971],[31.47789,103.579399],[31.477711,103.578911],[31.477579,103.578613],[31.47744,103.57827],[31.477369,103.578049],[31.477171,103.577744],[31.47682,103.577278],[31.476589,103.577057],[31.47645,103.576981],[31.47596,103.576874],[31.475651,103.576843],[31.47522,103.576736],[31.474939,103.576721],[31.474701,103.576691],[31.474701,103.576538],[31.47485,103.57589],[31.47493,103.575394],[31.474899,103.575012],[31.47488,103.574982],[31.474701,103.574913],[31.47438,103.574913],[31.4736,103.574699],[31.47336,103.574677],[31.47287,103.574707],[31.472691,103.574692],[31.472071,103.573463],[31.47057,103.572227],[31.469021,103.570557],[31.467991,103.569771],[31.467079,103.569771],[31.46619,103.570038],[31.46537,103.570297],[31.464979,103.570297],[31.46344,103.569809],[31.46101,103.568909],[31.460279,103.568176],[31.459869,103.566643],[31.459511,103.564423],[31.45912,103.562363],[31.45895,103.561737],[31.45866,103.561172],[31.457279,103.558601],[31.456921,103.557899],[31.45583,103.555847],[31.45546,103.555267],[31.45499,103.554581],[31.454519,103.55394],[31.454309,103.553558],[31.454201,103.552887],[31.454559,103.551971],[31.454941,103.551086],[31.45583,103.549187],[31.45603,103.548561],[31.456051,103.547821],[31.455839,103.54734],[31.45536,103.546867],[31.45483,103.546669],[31.454321,103.546539],[31.45405,103.54644],[31.45322,103.545769],[31.452959,103.545502],[31.45269,103.545273],[31.452419,103.545273],[31.45207,103.545097],[31.45167,103.544968],[31.4515,103.544937],[31.45006,103.544777],[31.449619,103.544678],[31.448759,103.544289],[31.447929,103.543854],[31.446199,103.542969],[31.445761,103.542709],[31.445221,103.542221],[31.44474,103.541649],[31.444201,103.5411],[31.44396,103.540993],[31.44367,103.540916],[31.44301,103.54097],[31.439659,103.541473],[31.43886,103.541656],[31.43778,103.542038],[31.43689,103.542381],[31.436449,103.542473],[31.4356,103.542572],[31.43504,103.542603],[31.43441,103.542709],[31.43392,103.542732],[31.43346,103.542732],[31.433439,103.542702],[31.43302,103.542763],[31.43259,103.542961],[31.42981,103.544456],[31.429331,103.544563],[31.429131,103.54454],[31.428671,103.544243],[31.42819,103.543793],[31.42675,103.542313],[31.42621,103.541862],[31.425631,103.541344],[31.4251,103.540894],[31.42322,103.539574],[31.42255,103.539131],[31.420071,103.537849],[31.419399,103.537537],[31.418791,103.537178],[31.41828,103.536774],[31.41699,103.535599],[31.41613,103.534889],[31.415621,103.534599],[31.415159,103.534439],[31.414471,103.534264],[31.4142,103.534172],[31.4135,103.533989],[31.41247,103.533699],[31.41194,103.533478],[31.4118,103.533379],[31.411671,103.533257],[31.41148,103.533012],[31.411209,103.532547],[31.41111,103.53241],[31.410629,103.531464],[31.41045,103.531174],[31.410061,103.530838],[31.409889,103.530731],[31.40934,103.530617],[31.409149,103.530602],[31.40756,103.530182],[31.405861,103.52977],[31.405149,103.529556],[31.404869,103.529404],[31.40461,103.529167],[31.404289,103.528397],[31.4041,103.527321],[31.403919,103.526123],[31.403549,103.523849],[31.403299,103.523109],[31.403049,103.522797],[31.402411,103.522438],[31.401699,103.522278],[31.4014,103.522232],[31.399179,103.521721],[31.398439,103.52153],[31.39542,103.520851],[31.39481,103.520683],[31.394239,103.520287],[31.39345,103.5196],[31.39155,103.517853],[31.39131,103.517677],[31.38913,103.515678],[31.389139,103.515663],[31.389111,103.515671],[31.38839,103.515022],[31.38792,103.514572],[31.3871,103.513901],[31.386959,103.513748],[31.372419,103.509407],[31.372141,103.509369],[31.37159,103.509079],[31.371031,103.508568],[31.370649,103.508171],[31.370449,103.507912],[31.36974,103.507149],[31.369089,103.506401],[31.36894,103.506187],[31.36865,103.505577],[31.36833,103.5047],[31.36797,103.503563],[31.36692,103.500427],[31.36664,103.499542],[31.366489,103.499138],[31.366409,103.498779],[31.366329,103.49865],[31.366199,103.498291],[31.36598,103.49752],[31.365681,103.49704],[31.364771,103.496407],[31.36245,103.494919],[31.36208,103.494667],[31.361071,103.494041],[31.359541,103.493042],[31.35741,103.491707],[31.35729,103.491661],[31.35708,103.491631],[31.3564,103.4916],[31.355619,103.491638],[31.355021,103.491547],[31.35438,103.491257],[31.35321,103.490623],[31.35268,103.490349],[31.352221,103.490082],[31.35165,103.489799],[31.35129,103.489647],[31.350531,103.489464],[31.34993,103.489326],[31.34919,103.489143],[31.34828,103.488937],[31.347219,103.488564],[31.346821,103.488358],[31.346279,103.488037],[31.34433,103.486763],[31.34374,103.486504],[31.343491,103.486443],[31.342831,103.486427],[31.342421,103.486519],[31.342251,103.486572],[31.34177,103.486649],[31.340799,103.486862],[31.340321,103.486931],[31.339331,103.487167],[31.339029,103.48719],[31.338591,103.487122],[31.33721,103.486099],[31.336519,103.485413],[31.33604,103.484711],[31.33556,103.483917],[31.335421,103.483276],[31.33383,103.480087],[31.333611,103.479721],[31.333361,103.479378],[31.333019,103.479057],[31.332359,103.478569],[31.33135,103.477859],[31.330931,103.477432],[31.33073,103.477013],[31.32996,103.47448],[31.329849,103.474258],[31.32967,103.47403],[31.32946,103.473862],[31.32926,103.473793],[31.328569,103.473801],[31.32366,103.474693],[31.322969,103.474777],[31.322241,103.474907],[31.321489,103.474937],[31.320959,103.47477],[31.320721,103.474617],[31.32004,103.474167],[31.31922,103.473587],[31.31871,103.473312],[31.31826,103.473183],[31.3176,103.473129],[31.31675,103.473099],[31.314791,103.473061],[31.314131,103.472977],[31.313431,103.472839],[31.31291,103.472748],[31.311569,103.472473],[31.31142,103.47245],[31.310841,103.47229],[31.310711,103.472237],[31.31061,103.472168],[31.310511,103.472069],[31.310221,103.471672],[31.30938,103.470322],[31.30928,103.470108],[31.30896,103.469612],[31.30871,103.469307],[31.308189,103.468964],[31.30788,103.468842],[31.30744,103.468697],[31.306231,103.468193],[31.30521,103.467827],[31.303169,103.466942],[31.302691,103.466766],[31.302429,103.46669],[31.301991,103.466507],[31.3016,103.466209],[31.301519,103.466164],[31.3015,103.466057],[31.301161,103.465897],[31.30098,103.465851],[31.300831,103.465759],[31.30061,103.465729],[31.300011,103.465698],[31.299561,103.465477],[31.2994,103.465157],[31.299179,103.464828],[31.29841,103.464378],[31.29821,103.464104],[31.298149,103.463753],[31.29805,103.463463],[31.29759,103.463226],[31.297171,103.462921],[31.295549,103.462402],[31.289801,103.460899],[31.28867,103.461166],[31.280279,103.469017],[31.27939,103.469353],[31.27865,103.470039],[31.277781,103.471283],[31.27607,103.474007],[31.274839,103.474609],[31.273741,103.474922],[31.27346,103.474907],[31.27326,103.474876],[31.273069,103.474823],[31.272539,103.474747],[31.27182,103.475014],[31.271271,103.475098],[31.27033,103.475189],[31.269159,103.475159],[31.26734,103.475319],[31.26685,103.475456],[31.26601,103.475906],[31.26573,103.476089],[31.264391,103.477097],[31.26379,103.477753],[31.26339,103.478279],[31.263041,103.479218],[31.26285,103.479637],[31.26289,103.480217],[31.26284,103.480522],[31.262449,103.481049],[31.261801,103.481667],[31.26133,103.482147],[31.260521,103.482559],[31.25906,103.480049],[31.257441,103.480988],[31.250851,103.486687],[31.249491,103.488113],[31.24909,103.488403],[31.24823,103.488411],[31.2472,103.487907],[31.24691,103.487778],[31.24605,103.487694],[31.231581,103.492683],[31.22551,103.486893],[31.20331,103.497948],[31.17948,103.496834],[31.160801,103.494209],[31.156799,103.491173],[31.148029,103.488243],[31.140209,103.48967],[31.13055,103.494873],[31.122959,103.496063],[31.118771,103.494431],[31.11475,103.489479],[31.11301,103.485519],[31.11005,103.483063],[31.107821,103.481087],[31.10568,103.479523],[31.1042,103.478653],[31.102659,103.478302],[31.1021,103.478157],[31.101521,103.478127],[31.1012,103.478233],[31.10042,103.478691],[31.09967,103.478943],[31.098499,103.479149],[31.098141,103.479118],[31.097481,103.479111],[31.097071,103.479134],[31.096581,103.479263],[31.0959,103.479858],[31.09536,103.480507],[31.09507,103.481194],[31.09473,103.482063],[31.094601,103.482246],[31.09396,103.483131],[31.09333,103.483788],[31.092581,103.484711],[31.091961,103.485336],[31.09182,103.485428],[31.091551,103.485481],[31.09111,103.485313],[31.0909,103.48513],[31.090441,103.484558],[31.09029,103.484444],[31.089769,103.484253],[31.089439,103.484322],[31.089211,103.484489],[31.088739,103.484894],[31.08844,103.485107],[31.08814,103.48526],[31.08798,103.485313],[31.087151,103.485283],[31.08099,103.485023],[31.08004,103.484787],[31.07909,103.484596],[31.07826,103.484528],[31.07803,103.484528],[31.076891,103.484703],[31.076639,103.484787],[31.07621,103.484901],[31.07493,103.485321],[31.07374,103.486191],[31.07304,103.486572],[31.072531,103.4869],[31.072001,103.487381],[31.07168,103.487602],[31.071199,103.487823],[31.07078,103.488029],[31.070181,103.488373],[31.06941,103.488876],[31.06925,103.489197],[31.068439,103.489433],[31.06757,103.489807],[31.06679,103.490547],[31.066259,103.490631],[31.065491,103.490921],[31.06476,103.491257],[31.064449,103.491547],[31.06436,103.491722],[31.064289,103.491898],[31.0641,103.492142],[31.063959,103.492287],[31.06378,103.492561],[31.06341,103.493294],[31.063021,103.494453],[31.04641,103.526978],[31.045561,103.528099],[31.045469,103.528198],[31.044621,103.52887],[31.04331,103.529427],[31.04154,103.529877],[31.03215,103.534622],[31.031231,103.535057],[31.02936,103.535568],[31.028521,103.535843],[31.028061,103.536072],[31.02762,103.536369],[31.0271,103.536819],[31.026369,103.537727],[31.02529,103.539307],[31.024401,103.540733],[31.02223,103.543907],[31.0205,103.546577],[31.01989,103.547508],[31.019421,103.548233],[31.018761,103.549217],[31.01827,103.550056],[31.016239,103.554207],[31,103.586853],[30.998091,103.59005],[30.997681,103.590523],[30.997181,103.590973],[30.996849,103.591232],[30.99613,103.591728],[30.994261,103.592941],[30.99297,103.593803],[30.99185,103.594482],[30.989941,103.594841],[30.988621,103.594322],[30.987591,103.59417],[30.986259,103.593773],[30.98485,103.593773],[30.98218,103.594559],[30.98111,103.594566],[30.979811,103.594269],[30.977461,103.59359],[30.976021,103.5933],[30.975691,103.593277],[30.974489,103.5933],[30.968679,103.594116],[30.964621,103.594727],[30.964001,103.594841],[30.96237,103.595337],[30.96122,103.596024],[30.960211,103.59697],[30.959351,103.598152],[30.958561,103.599762],[30.956551,103.604424],[30.955151,103.607269],[30.95435,103.608627],[30.95089,103.613831],[30.95076,103.614052],[30.950279,103.614952],[30.94981,103.615753],[30.95084,103.615593],[30.95225,103.615532],[30.953581,103.61544],[30.95606,103.615318],[30.95643,103.615288],[30.956989,103.615211],[30.957359,103.615143],[30.957899,103.614998],[30.958441,103.614822],[30.959141,103.614571],[30.959829,103.614304],[30.96102,103.613876],[30.96183,103.613579],[30.962391,103.613373],[30.9631,103.614807],[30.96336,103.615799],[30.963539,103.616302],[30.96368,103.616631],[30.96384,103.616966],[30.965599,103.620323],[30.96623,103.621567],[30.967489,103.624222],[30.9722,103.633148],[30.977289,103.642822],[30.979099,103.645447],[30.978251,103.646347],[30.976589,103.647888],[30.974079,103.650269],[30.97238,103.65197],[30.970909,103.653526],[30.969839,103.654716],[30.968639,103.656143],[30.96751,103.657547],[30.96689,103.658363],[30.96583,103.65979],[30.964109,103.662231],[30.96328,103.663368],[30.962151,103.664833],[30.96097,103.66626],[30.960381,103.667],[30.96023,103.667236],[30.960091,103.667473],[30.95998,103.667747],[30.959789,103.667877],[30.95978,103.667747],[30.959209,103.668411],[30.9589,103.668793],[30.958099,103.669853],[30.957161,103.671143],[30.95595,103.672943],[30.955231,103.674072],[30.952909,103.677902],[30.95179,103.679703],[30.95059,103.681709],[30.949539,103.683418],[30.948919,103.684387],[30.948441,103.685112],[30.946659,103.687637],[30.945499,103.689217],[30.944401,103.690613],[30.94367,103.691513],[30.941299,103.694313],[30.93787,103.698303],[30.9366,103.69986],[30.935209,103.701637],[30.933901,103.703407],[30.933069,103.704597],[30.932249,103.705803],[30.93026,103.708878],[30.92915,103.710564],[30.928301,103.711777],[30.92745,103.712952],[30.926741,103.713837],[30.926001,103.714722],[30.92543,103.715347],[30.924641,103.716148],[30.923651,103.717117],[30.922649,103.718063],[30.92116,103.71936],[30.919451,103.720932],[30.918831,103.721542],[30.91785,103.722572],[30.917471,103.722992],[30.91674,103.723831],[30.91588,103.724892],[30.91522,103.725761],[30.914129,103.727333],[30.913691,103.728027],[30.913139,103.728973],[30.9126,103.729927],[30.912069,103.730949],[30.91169,103.731743],[30.911209,103.732803],[30.91054,103.734383],[30.910151,103.735451],[30.90979,103.736519],[30.907459,103.744202],[30.90659,103.746933],[30.906219,103.747978],[30.90593,103.748749],[30.90542,103.749992],[30.904989,103.750977],[30.904369,103.752274],[30.90366,103.753609],[30.902901,103.754898],[30.902121,103.756119],[30.901489,103.757042],[30.900669,103.758133],[30.900181,103.758751],[30.899691,103.759354],[30.89871,103.760468],[30.897711,103.76152],[30.8972,103.762016],[30.896469,103.762703],[30.895241,103.763748],[30.894569,103.764267],[30.89386,103.764793],[30.892929,103.765442],[30.89245,103.765747],[30.89105,103.766602],[30.888321,103.768097],[30.887011,103.768806],[30.885719,103.769524],[30.884649,103.770149],[30.88401,103.770561],[30.88294,103.771317],[30.88183,103.772202],[30.88139,103.772591],[30.880751,103.773193],[30.87995,103.773979],[30.879379,103.774582],[30.87867,103.775398],[30.87817,103.776016],[30.87768,103.776649],[30.877211,103.777298],[30.87676,103.777946],[30.876011,103.779152],[30.875561,103.779938],[30.875271,103.780487],[30.87471,103.781616],[30.873949,103.783363],[30.873369,103.784813],[30.872669,103.786507],[30.87229,103.787331],[30.871759,103.788399],[30.871731,103.78846],[30.871059,103.789703],[30.87076,103.790207],[30.8703,103.790939],[30.86948,103.792137],[30.869141,103.792603],[30.86861,103.793266],[30.867701,103.794357],[30.867149,103.794991],[30.86639,103.795761],[30.86561,103.796501],[30.864811,103.797203],[30.861601,103.799957],[30.859289,103.80191],[30.858471,103.802628],[30.85726,103.803719],[30.856291,103.804657],[30.85533,103.805634],[30.854509,103.806503],[30.8498,103.811783],[30.848881,103.812798],[30.84778,103.813957],[30.846491,103.815239],[30.84572,103.815941],[30.844299,103.817162],[30.84318,103.818062],[30.842051,103.818932],[30.84137,103.819427],[30.840231,103.820213],[30.8391,103.820953],[30.8354,103.823181],[30.83396,103.824097],[30.833031,103.824722],[30.832359,103.825211],[30.83148,103.825867],[30.83041,103.826736],[30.82938,103.827629],[30.82819,103.828728],[30.8272,103.829712],[30.82618,103.830788],[30.82559,103.831444],[30.824631,103.832573],[30.82229,103.835541],[30.821581,103.836411],[30.82119,103.836853],[30.820379,103.83773],[30.819759,103.838371],[30.81912,103.838989],[30.818251,103.839783],[30.817591,103.840332],[30.81691,103.840874],[30.816,103.841553],[30.81461,103.842506],[30.810249,103.84536],[30.809401,103.845963],[30.808769,103.84642],[30.80835,103.846733],[30.807949,103.847061],[30.807341,103.84758],[30.806721,103.848129],[30.80587,103.848938],[30.80525,103.849564],[30.804661,103.850189],[30.8039,103.851044],[30.80353,103.851471],[30.80266,103.852547],[30.802,103.853439],[30.80117,103.854637],[30.80069,103.8554],[30.79991,103.856697],[30.7966,103.862488],[30.795549,103.864281],[30.79442,103.866318],[30.79245,103.869789],[30.790501,103.873192],[30.78861,103.876472],[30.78834,103.876984],[30.78797,103.877747],[30.7875,103.878838],[30.787291,103.879433],[30.78709,103.88002],[30.786909,103.880638],[30.786751,103.881271],[30.78661,103.881897],[30.786501,103.882553],[30.786409,103.883186],[30.786341,103.883827],[30.786289,103.88446],[30.786261,103.885094],[30.786261,103.886047],[30.78632,103.887306],[30.78647,103.889542],[30.78635,103.891296],[30.78624,103.892967],[30.785839,103.895668],[30.78549,103.897171],[30.78499,103.898582],[30.784599,103.899689],[30.78377,103.901466],[30.783159,103.902473],[30.78298,103.902771],[30.782511,103.903587],[30.78203,103.904282],[30.78134,103.905197],[30.77743,103.910294],[30.773211,103.915771],[30.772129,103.91713],[30.77091,103.91864],[30.769369,103.920647],[30.7686,103.921638],[30.766121,103.924881],[30.7631,103.929024],[30.76078,103.93219],[30.75775,103.936234],[30.757311,103.936577],[30.7565,103.93766],[30.75602,103.938057],[30.755301,103.938583],[30.754761,103.938843],[30.7542,103.939056],[30.75358,103.939201],[30.752729,103.939293],[30.7521,103.939232],[30.75139,103.939072],[30.750839,103.938889],[30.75004,103.938591],[30.748631,103.937691],[30.746429,103.936737],[30.74535,103.936371],[30.74428,103.93605],[30.7437,103.935883],[30.739031,103.934921],[30.736521,103.934418],[30.736271,103.934357],[30.734831,103.934059],[30.73411,103.933907],[30.73082,103.933296],[30.72954,103.933067],[30.729179,103.933006],[30.725719,103.93264],[30.725229,103.932571],[30.72271,103.932442],[30.719419,103.932381],[30.715771,103.932343],[30.712839,103.932167],[30.71044,103.931961],[30.70717,103.931511],[30.702971,103.930763],[30.70075,103.930359],[30.698931,103.930107],[30.6966,103.929947],[30.693951,103.929916],[30.69375,103.929916],[30.69273,103.929947],[30.69128,103.930038],[30.6903,103.930122],[30.685061,103.930573],[30.682341,103.930847],[30.67981,103.931221],[30.676941,103.931831],[30.674351,103.932541],[30.67045,103.93396],[30.66506,103.935852],[30.663919,103.936203],[30.66292,103.936432],[30.66181,103.936653],[30.660431,103.936867],[30.65892,103.936996],[30.65756,103.937042],[30.65484,103.937103],[30.650579,103.93708],[30.648371,103.93718],[30.64661,103.937378],[30.64509,103.937637],[30.64365,103.938019],[30.64196,103.938469],[30.63983,103.939247],[30.63492,103.941093],[30.633631,103.941528],[30.63224,103.941971],[30.630779,103.94239],[30.629311,103.942734],[30.627041,103.943169],[30.62483,103.943512],[30.619511,103.944397],[30.61833,103.944679],[30.616791,103.945107],[30.615311,103.945686],[30.61389,103.946373],[30.61227,103.947456],[30.61113,103.94841],[30.60972,103.949783],[30.60885,103.950798],[30.607639,103.952438],[30.606489,103.954514],[30.605459,103.956711],[30.60393,103.960114],[30.601891,103.964783],[30.60046,103.96785],[30.599171,103.970444],[30.597589,103.973083],[30.59609,103.975372],[30.59486,103.977203],[30.592131,103.981133],[30.591129,103.982712],[30.589991,103.985039],[30.589319,103.986877],[30.58885,103.988724],[30.58856,103.990677],[30.588461,103.992706],[30.58849,103.994728],[30.58868,104.002876],[30.58857,104.005081],[30.588181,104.007187],[30.58745,104.009308],[30.5863,104.011383],[30.584311,104.014137],[30.58374,104.014938],[30.58132,104.018349],[30.5807,104.019234],[30.579081,104.022034],[30.57872,104.02272],[30.578449,104.023232],[30.57793,104.023956],[30.577459,104.024513],[30.57682,104.024979],[30.576241,104.025208],[30.57585,104.025307],[30.575529,104.025391],[30.57468,104.025391],[30.57391,104.025269],[30.57362,104.025162],[30.571671,104.024368],[30.570181,104.023758],[30.56801,104.022743],[30.56468,104.020882],[30.554741,104.014908],[30.55094,104.012497],[30.548651,104.010696],[30.54603,104.008163],[30.54306,104.004494],[30.54019,103.999863],[30.538441,103.997513],[30.536329,103.995216],[30.528799,103.987923],[30.525129,103.984543],[30.522129,103.982224],[30.51981,103.980797],[30.51687,103.979141],[30.51384,103.977158],[30.51082,103.974457],[30.50326,103.967072],[30.50028,103.964706],[30.497601,103.96299],[30.48823,103.958504],[30.482201,103.955002],[30.476259,103.950844],[30.47337,103.948822],[30.470671,103.947304],[30.46776,103.94593],[30.45928,103.942421],[30.455521,103.940567],[30.452351,103.938187],[30.450029,103.935883],[30.44676,103.931976],[30.443501,103.928284],[30.43807,103.92318],[30.42778,103.913887],[30.424299,103.910683],[30.42137,103.908173],[30.418739,103.906342],[30.415751,103.904572],[30.409611,103.900833],[30.408791,103.900307],[30.40811,103.899879],[30.40642,103.89872],[30.406269,103.898613],[30.406139,103.898514],[30.405199,103.897797],[30.404831,103.897507],[30.404539,103.897301],[30.4027,103.895752],[30.402639,103.895714],[30.400829,103.894089],[30.395901,103.889481],[30.38553,103.878517],[30.38382,103.876129],[30.382191,103.873322],[30.381121,103.870064],[30.380699,103.86879],[30.38039,103.867699],[30.379641,103.864769],[30.378071,103.858124],[30.37772,103.856689],[30.376881,103.85466],[30.375919,103.852417],[30.374901,103.850273],[30.3745,103.849602],[30.373409,103.848267],[30.37274,103.847504],[30.371759,103.846527],[30.37007,103.845253],[30.37002,103.845222],[30.36821,103.844131],[30.36706,103.843628],[30.364889,103.842949],[30.362579,103.842438],[30.359209,103.841759],[30.35545,103.841057],[30.351959,103.840683],[30.349331,103.83992],[30.34514,103.838531],[30.342319,103.83725],[30.339621,103.836571],[30.336281,103.835983],[30.332951,103.835632],[30.32992,103.835281],[30.32859,103.835083],[30.3276,103.834839],[30.32691,103.834572],[30.326309,103.834229],[30.325581,103.833733],[30.32482,103.833267],[30.32445,103.833092],[30.324329,103.833061],[30.323629,103.832787],[30.32313,103.832687],[30.322559,103.832611],[30.32193,103.832611],[30.3211,103.83271],[30.32037,103.832901],[30.319811,103.833107],[30.319309,103.833397],[30.318569,103.8339],[30.318041,103.834328],[30.317631,103.834663],[30.31662,103.835457],[30.31559,103.835968],[30.3148,103.836304],[30.31304,103.83699],[30.311819,103.837433],[30.305599,103.839798],[30.303049,103.840767],[30.302441,103.841011],[30.301571,103.841316],[30.300711,103.841667],[30.300541,103.841743],[30.29854,103.842484],[30.29718,103.842903],[30.29463,103.843719],[30.293159,103.843903],[30.29126,103.844063],[30.28908,103.844002],[30.28517,103.843407],[30.279461,103.842461],[30.274309,103.84182],[30.272249,103.841682],[30.26882,103.841507],[30.263081,103.841637],[30.260481,103.841827],[30.25771,103.842117],[30.254551,103.842537],[30.252159,103.842957],[30.244909,103.844063],[30.238979,103.844971],[30.2346,103.845627],[30.228121,103.846626],[30.223459,103.847366],[30.21862,103.847878],[30.21557,103.848358],[30.21253,103.848862],[30.21196,103.848938],[30.21122,103.849037],[30.211149,103.849052],[30.21056,103.849129],[30.20863,103.849457],[30.206671,103.849739],[30.206619,103.849747],[30.20463,103.850037],[30.20118,103.850723],[30.19952,103.850739],[30.19763,103.850632],[30.195299,103.850273],[30.193661,103.849907],[30.192101,103.849403],[30.18655,103.847427],[30.18231,103.845909],[30.17621,103.843719],[30.170601,103.841721],[30.166719,103.840317],[30.161591,103.838501],[30.156549,103.83667],[30.15312,103.835442],[30.149229,103.83403],[30.14525,103.832611],[30.142139,103.831398],[30.139771,103.83033],[30.134809,103.827782],[30.13142,103.825974],[30.12595,103.82296],[30.12237,103.821037],[30.12002,103.819763],[30.11664,103.817947],[30.11326,103.816017],[30.111601,103.815163],[30.10816,103.813248],[30.1056,103.811852],[30.102711,103.810066],[30.099331,103.808411],[30.095301,103.806702],[30.09252,103.805687],[30.086599,103.80368],[30.08601,103.803482],[30.085569,103.803329],[30.08502,103.803139],[30.08182,103.80204],[30.081141,103.801811],[30.079639,103.8013],[30.07716,103.800453],[30.07605,103.800056],[30.074249,103.799438],[30.07411,103.799393],[30.07151,103.798538],[30.06843,103.797859],[30.06653,103.797302],[30.06459,103.796806],[30.062309,103.796303],[30.055731,103.795067],[30.050871,103.794098],[30.04826,103.793358],[30.046261,103.792587],[30.0441,103.791458],[30.042601,103.790527],[30.036551,103.786591],[30.03101,103.782967],[30.029051,103.781616],[30.024891,103.778503],[30.021879,103.775917],[30.0187,103.77298],[30.01498,103.769363],[30.013029,103.767441],[30.011021,103.765747],[30.009581,103.764793],[30.00824,103.764023],[30.00703,103.763443],[30.00528,103.762733],[30.004009,103.762444],[30.0023,103.762123],[30.00091,103.762047],[29.99885,103.762077],[29.996031,103.762238],[29.98945,103.762657],[29.98629,103.762863],[29.985081,103.762993],[29.983101,103.763489],[29.98243,103.763687],[29.9806,103.764481],[29.977921,103.765984],[29.97703,103.766487],[29.97328,103.768593],[29.97217,103.769096],[29.969801,103.769981],[29.969139,103.770142],[29.968201,103.770332],[29.965611,103.770554],[29.96287,103.770348],[29.96159,103.770027],[29.9582,103.769203],[29.956301,103.768723],[29.95241,103.767761],[29.94582,103.766167],[29.941891,103.764954],[29.938259,103.763428],[29.93232,103.760307],[29.9265,103.757187],[29.92123,103.754211],[29.9186,103.752403],[29.916189,103.75061],[29.9119,103.747131],[29.90592,103.742203],[29.90304,103.740356],[29.902201,103.739906],[29.90093,103.739372],[29.89822,103.738579],[29.89192,103.737061],[29.888399,103.735947],[29.886129,103.735092],[29.884081,103.734154],[29.88076,103.732521],[29.877239,103.730759],[29.87343,103.729156],[29.872789,103.728912],[29.86729,103.727081],[29.861521,103.725227],[29.8587,103.724289],[29.856159,103.723618],[29.854139,103.723183],[29.847811,103.72216],[29.84544,103.721687],[29.843941,103.72123],[29.842291,103.720627],[29.841141,103.720047],[29.839939,103.719368],[29.83886,103.718597],[29.834391,103.714973],[29.82803,103.709839],[29.824579,103.706779],[29.82353,103.705704],[29.818701,103.700737],[29.816549,103.699013],[29.81579,103.698471],[29.81492,103.69799],[29.81385,103.697479],[29.81284,103.697067],[29.81114,103.696518],[29.804569,103.694901],[29.801861,103.694099],[29.800591,103.693657],[29.79631,103.691856],[29.79286,103.690376],[29.78804,103.688293],[29.78281,103.686028],[29.7794,103.684883],[29.77482,103.683647],[29.771151,103.68325],[29.76623,103.682564],[29.7612,103.681862],[29.75733,103.680702],[29.752661,103.678726],[29.741501,103.673637],[29.735689,103.670433],[29.730261,103.667122],[29.728109,103.665894],[29.725889,103.665009],[29.723049,103.664223],[29.719179,103.663467],[29.71279,103.661957],[29.70635,103.660027],[29.70294,103.659363],[29.70014,103.659142],[29.68815,103.659363],[29.68462,103.659538],[29.68202,103.660202],[29.67861,103.661789],[29.669941,103.667168],[29.667179,103.669067],[29.66548,103.670013],[29.66226,103.671219],[29.65731,103.672684],[29.654421,103.673882],[29.651899,103.675377],[29.64912,103.677238],[29.64385,103.680489],[29.639219,103.682854],[29.63732,103.683731],[29.63269,103.685913],[29.629339,103.687523],[29.626249,103.68943],[29.62406,103.690987],[29.618151,103.695602],[29.61622,103.696747],[29.61463,103.697456],[29.61256,103.69812],[29.611,103.698418],[29.60833,103.698517],[29.59409,103.697853],[29.59317,103.697777],[29.59227,103.697708],[29.590639,103.697578],[29.589661,103.697533],[29.588791,103.697472],[29.588249,103.697449],[29.57856,103.697304],[29.5669,103.703148],[29.545259,103.705719],[29.533911,103.709663],[29.5194,103.710701],[29.50877,103.719643],[29.49684,103.726669],[29.47427,103.734573],[29.463039,103.741623],[29.456329,103.746758],[29.44392,103.752083],[29.435089,103.758949],[29.42598,103.763763],[29.41267,103.773537],[29.407921,103.7761],[29.388491,103.777473],[29.381571,103.779373],[29.375561,103.784538],[29.367929,103.790733],[29.359091,103.80069],[29.352209,103.809097],[29.335911,103.826767],[29.318411,103.840843],[29.305571,103.847687],[29.294029,103.850273],[29.289061,103.853722],[29.285049,103.858421],[29.28236,103.861847],[29.278641,103.865082],[29.27508,103.866959],[29.27075,103.867813],[29.266239,103.869019],[29.262159,103.871269],[29.25914,103.875252],[29.256281,103.880081],[29.254311,103.88562],[29.25462,103.892014],[29.25462,103.896103],[29.25388,103.89949],[29.25211,103.902519],[29.24992,103.903862],[29.24637,103.904198],[29.239189,103.902817],[29.2363,103.903],[29.2334,103.904572],[29.22904,103.90992],[29.22484,103.915077],[29.22064,103.922813],[29.217951,103.927429],[29.21423,103.930832],[29.210199,103.933403],[29.20557,103.936142],[29.201851,103.936989],[29.19854,103.937851],[29.19643,103.938721],[29.192829,103.940613],[29.18956,103.942139],[29.18597,103.942307],[29.18281,103.943001],[29.178619,103.944717],[29.171591,103.945229],[29.16573,103.945923],[29.161699,103.947372],[29.160009,103.947983],[29.158831,103.948608],[29.15626,103.949867],[29.152901,103.951424],[29.149111,103.953827],[29.1474,103.955566],[29.146151,103.957626],[29.145109,103.960457],[29.142111,103.970154],[29.14106,103.973381],[29.139879,103.975868],[29.13899,103.976921],[29.136841,103.97908],[29.134291,103.981583],[29.13253,103.984039],[29.13093,103.986557],[29.12966,103.987846],[29.12866,103.988503],[29.127199,103.98938],[29.125521,103.990341],[29.124041,103.991127],[29.119749,103.993317],[29.11607,103.995277],[29.11408,103.996292],[29.112249,103.997368],[29.11076,103.998611],[29.10943,104.000572],[29.108459,104.002899],[29.107861,104.005363],[29.107149,104.009163],[29.106421,104.012009],[29.10582,104.014008],[29.104271,104.017776],[29.103621,104.019836],[29.10293,104.023308],[29.102461,104.025742],[29.10177,104.027687],[29.100349,104.030693],[29.099409,104.032883],[29.098749,104.034416],[29.09796,104.036942],[29.097639,104.038231],[29.097269,104.039864],[29.09687,104.041733],[29.096081,104.043922],[29.09543,104.044937],[29.094481,104.04641],[29.093491,104.047684],[29.092251,104.049271],[29.09111,104.051208],[29.090521,104.053123],[29.09025,104.054497],[29.090191,104.055412],[29.09095,104.06636],[29.08976,104.070282],[29.086451,104.075089],[29.084789,104.082336],[29.08194,104.09523],[29.08194,104.100754],[29.083441,104.1138],[29.083441,104.123207],[29.08194,104.130234],[29.081051,104.137589],[29.078979,104.141144],[29.074051,104.144547],[29.07147,104.146637],[29.069349,104.150803],[29.0674,104.15818],[29.06502,104.162086],[29.06082,104.166382],[29.057659,104.171707],[29.053459,104.177032],[29.050289,104.182549],[29.04789,104.189774],[29.044889,104.195938],[29.042179,104.201973],[29.03993,104.212639],[29.03933,104.220207],[29.03903,104.228256],[29.03784,104.231812],[29.03484,104.236618],[29.028379,104.253113],[29.026449,104.257019],[29.021049,104.261993],[29.01655,104.268517],[29.01055,104.274857],[29.00544,104.280022],[29.00108,104.287064],[28.99402,104.295143],[28.98967,104.302856],[28.98292,104.309708],[28.97978,104.313469],[28.970779,104.318787],[28.95965,104.328072],[28.95751,104.330688],[28.9533,104.345627],[28.949699,104.352333],[28.94536,104.363281],[28.933331,104.374786],[28.93166,104.380173],[28.93046,104.396652],[28.928961,104.401611],[28.92506,104.414322],[28.92205,104.426697],[28.92115,104.433708],[28.91231,104.449966],[28.905689,104.457191],[28.902519,104.467171],[28.89502,104.482246],[28.8881,104.49015],[28.88599,104.496696],[28.88163,104.504936],[28.88027,104.513527],[28.873369,104.529999],[28.870211,104.537712],[28.86569,104.545631],[28.864491,104.554916],[28.860729,104.567627],[28.859831,104.576729],[28.857719,104.585152],[28.85787,104.598732],[28.857719,104.609558],[28.859831,104.621941],[28.861771,104.631523],[28.86043,104.638496],[28.857889,104.644302],[28.85685,104.64566],[28.856409,104.645889],[28.855829,104.645912],[28.85532,104.645851],[28.8547,104.645592],[28.854259,104.645401],[28.85355,104.644783],[28.85206,104.6436],[28.85038,104.642418],[28.84877,104.641296],[28.847361,104.64032],[28.84576,104.639198],[28.84403,104.637993],[28.84247,104.636917],[28.84119,104.636147],[28.839411,104.63517],[28.838369,104.634666],[28.83795,104.634483],[28.83754,104.634277],[28.83667,104.633926],[28.836451,104.633842],[28.83535,104.6334],[28.83428,104.63295],[28.833019,104.632332],[28.832069,104.631706],[28.83111,104.630867],[28.830311,104.629936],[28.830179,104.629784],[28.829399,104.628593],[28.82859,104.627098],[28.82773,104.625526],[28.82724,104.624779],[28.826429,104.623734],[28.82542,104.622673],[28.823549,104.621033],[28.82159,104.619324],[28.820299,104.618202],[28.81879,104.61689],[28.8176,104.615837],[28.816589,104.61496],[28.81525,104.6138],[28.81423,104.612862],[28.81304,104.611588],[28.811781,104.610023],[28.81085,104.608841],[28.809839,104.607529],[28.80899,104.606438],[28.80829,104.605591],[28.80397,104.599716],[28.79163,104.60006],[28.77869,104.590103],[28.768459,104.583923],[28.764999,104.582039],[28.75341,104.570534],[28.7498,104.564194],[28.741831,104.551826],[28.73023,104.546158],[28.723009,104.535347],[28.71352,104.533112],[28.71097,104.53157],[28.70705,104.521606],[28.703291,104.519379],[28.69832,104.519897],[28.68597,104.524361],[28.68507,104.523331],[28.682211,104.520752],[28.672421,104.509598],[28.66684,104.501183],[28.664129,104.500328],[28.65494,104.501701],[28.651779,104.500839],[28.63928,104.496384],[28.635811,104.493629],[28.62888,104.483849],[28.62285,104.476982],[28.61788,104.467537],[28.608089,104.457916],[28.599489,104.44368],[28.599649,104.435951],[28.59844,104.429077],[28.600401,104.421021],[28.601,104.411232],[28.603109,104.394073],[28.603109,104.384453],[28.59889,104.372437],[28.587891,104.364723],[28.56769,104.354424],[28.563009,104.348747],[28.56241,104.339653],[28.564819,104.332947],[28.564671,104.32798],[28.558189,104.323517],[28.549589,104.320587],[28.543711,104.312363],[28.544621,104.305489],[28.544769,104.295532],[28.53949,104.285919],[28.53919,104.276817],[28.542509,104.26532],[28.551399,104.260002],[28.55744,104.260857],[28.561199,104.257263],[28.563009,104.246437],[28.562111,104.240433],[28.555321,104.22876],[28.55216,104.226868],[28.5511,104.22155],[28.54492,104.213654],[28.54055,104.20919],[28.536169,104.200607],[28.536631,104.192368],[28.532709,104.189102],[28.52652,104.187729],[28.523661,104.184471],[28.51038,104.181381],[28.502541,104.186867],[28.49575,104.186363],[28.49379,104.184471],[28.491529,104.186012],[28.48896,104.190483],[28.484739,104.192879],[28.48217,104.192368],[28.47765,104.190987],[28.472059,104.191681],[28.46904,104.193222],[28.46467,104.192879],[28.45742,104.191849],[28.45561,104.192711],[28.45335,104.195969],[28.44837,104.196136],[28.446711,104.195107],[28.45335,104.187393],[28.45471,104.190132],[28.45335,104.192543],[28.451691,104.194427],[28.449881,104.194427],[28.44656,104.192711],[28.445049,104.187393],[28.44293,104.185837],[28.438709,104.184982],[28.436899,104.183441],[28.435989,104.179657],[28.43478,104.178802],[28.43207,104.179657],[28.430401,104.178978],[28.429199,104.177429],[28.427691,104.176743],[28.42573,104.176918],[28.41984,104.175369],[28.39855,104.157013],[28.39492,104.150993],[28.3916,104.147049],[28.38798,104.147217],[28.384649,104.147392],[28.38254,104.149452],[28.37635,104.150139],[28.372419,104.15168],[28.36698,104.152367],[28.35928,104.149803],[28.35656,104.14756],[28.350519,104.14035],[28.34553,104.13829],[28.340851,104.133324],[28.33481,104.132797],[28.328911,104.13623],[28.323021,104.135033],[28.318029,104.135536],[28.31501,104.134506],[28.3067,104.136063],[28.30216,104.138474],[28.298389,104.13726],[28.2943,104.138809],[28.2875,104.144302],[28.27949,104.143784],[28.27541,104.145683],[28.268,104.153397],[28.26059,104.152367],[28.254551,104.144989],[28.24925,104.141899],[28.24729,104.140869],[28.244869,104.137444],[28.228689,104.140869],[28.205839,104.139839],[28.204781,104.134506],[28.201611,104.131599],[28.202209,104.124557],[28.200399,104.118378],[28.19994,104.111],[28.188601,104.103104],[28.184361,104.1007],[28.17906,104.096581],[28.17725,104.092461],[28.17165,104.093658],[28.165291,104.094002],[28.16151,104.092796],[28.15213,104.084389],[28.14592,104.083191],[28.141991,104.082672],[28.13608,104.072548],[28.132151,104.072723],[28.1273,104.073227],[28.1273,104.079758],[28.1273,104.082848],[28.12488,104.083878],[28.119579,104.080788],[28.11731,104.081642],[28.114429,104.086792],[28.11458,104.090569],[28.09354,104.131943],[28.09066,104.134003],[28.08672,104.133141],[28.0846,104.133827],[28.074301,104.141899],[28.06855,104.141899],[28.063551,104.144989],[28.05961,104.144653],[28.053101,104.145844],[28.046881,104.143784],[28.04492,104.142593],[28.040979,104.132111],[28.03643,104.125237],[28.03734,104.121811],[28.03931,104.119408],[28.04492,104.104134],[28.04295,104.097778],[28.039459,104.089882],[28.036131,104.079582],[28.027639,104.075638],[28.023701,104.076317],[28.01643,104.066193],[28.01552,104.052979],[28.01749,104.047653],[28.02037,104.036842],[28.01128,104.010918],[28.00491,104.006973],[28.00279,104.00251],[27.992331,103.988777],[27.99157,103.974182],[27.97747,103.962509],[27.97505,103.953934],[27.966101,103.948952],[27.96595,103.941223],[27.963221,103.935913],[27.95549,103.935043],[27.94791,103.919937],[27.93684,103.917374],[27.928499,103.916679],[27.916361,103.915131],[27.904831,103.913254],[27.89315,103.909286],[27.89012,103.912041],[27.884649,103.910843],[27.874941,103.906197],[27.86569,103.89917],[27.861441,103.897621],[27.854151,103.889557],[27.85294,103.88784],[27.853701,103.88475],[27.8496,103.876343],[27.846411,103.875481],[27.84565,103.873253],[27.843229,103.872223],[27.840639,103.867073],[27.83503,103.867409],[27.831989,103.864151],[27.828501,103.863121],[27.824551,103.857109],[27.821369,103.855049],[27.817869,103.855217],[27.81332,103.856941],[27.81135,103.859512],[27.80846,103.858139],[27.804661,103.861923],[27.799959,103.863289],[27.797831,103.864838],[27.79814,103.868271],[27.787661,103.878403],[27.7869,103.880966],[27.77627,103.880287],[27.7749,103.883202],[27.7708,103.883202],[27.76852,103.88681],[27.75865,103.886978],[27.7547,103.88475],[27.749531,103.884918],[27.74634,103.887154],[27.74361,103.887321],[27.73844,103.891273],[27.73601,103.89299],[27.73358,103.895218],[27.732059,103.89196],[27.72872,103.892303],[27.725531,103.896927],[27.715651,103.891441],[27.712761,103.89196],[27.70896,103.889214],[27.703951,103.88681],[27.701361,103.887497],[27.698931,103.886467],[27.696199,103.886292],[27.69376,103.884918],[27.689659,103.884064],[27.686621,103.880463],[27.684799,103.879768],[27.682671,103.877876],[27.680389,103.877022],[27.67902,103.875481],[27.67598,103.874786],[27.67066,103.866722],[27.667311,103.865181],[27.66564,103.856598],[27.66412,103.852303],[27.65789,103.848183],[27.652719,103.846123],[27.65028,103.843552],[27.64694,103.843552],[27.64283,103.842857],[27.63949,103.839943],[27.63797,103.837029],[27.631729,103.83239],[27.628229,103.831017],[27.626101,103.827583],[27.623819,103.826393],[27.623671,103.82209],[27.621849,103.820717],[27.62261,103.816772],[27.61956,103.815567],[27.618191,103.811279],[27.61515,103.806824],[27.61059,103.80407],[27.605419,103.801147],[27.59964,103.800461],[27.59507,103.800461],[27.593861,103.801491],[27.592939,103.803207],[27.590811,103.804916],[27.588989,103.808357],[27.587311,103.807671],[27.588989,103.805267],[27.59005,103.80304],[27.59157,103.801826],[27.59157,103.798576],[27.592939,103.798576],[27.5931,103.795998],[27.587009,103.785873],[27.586399,103.783813],[27.58518,103.783813],[27.58518,103.781921],[27.582291,103.777107],[27.580311,103.774544],[27.57818,103.773682],[27.57773,103.771797],[27.57362,103.770416],[27.573931,103.768883],[27.57469,103.768021],[27.57453,103.765099],[27.57453,103.763039],[27.57469,103.761841],[27.57316,103.759781],[27.57073,103.758583],[27.56982,103.756172],[27.566931,103.756172],[27.56312,103.753937],[27.56053,103.754967],[27.55475,103.754112],[27.54973,103.752571],[27.54668,103.752739],[27.53923,103.748962],[27.53344,103.747589],[27.530701,103.746902],[27.52355,103.739182],[27.51639,103.736778],[27.51137,103.739182],[27.506189,103.740211],[27.50436,103.739349],[27.50071,103.734718],[27.49873,103.730423],[27.495081,103.729393],[27.494619,103.726646],[27.493549,103.726822],[27.491421,103.728203],[27.476191,103.728706],[27.454559,103.719437],[27.44207,103.725273],[27.41617,103.733856],[27.3988,103.720993],[27.38965,103.717033],[27.36128,103.693459],[27.35232,103.692528],[27.351521,103.692436],[27.34355,103.691467],[27.31587,103.685341],[27.29833,103.681534],[27.29615,103.68148],[27.294399,103.681831],[27.28997,103.683388],[27.2887,103.683456],[27.28771,103.683289],[27.269011,103.676178],[27.268061,103.67598],[27.25794,103.676392],[27.25091,103.676598],[27.24836,103.676224],[27.217649,103.667976],[27.210899,103.667221],[27.20487,103.667038],[27.200251,103.666199],[27.196159,103.664726],[27.19311,103.663017],[27.191919,103.662132],[27.182261,103.651466],[27.179991,103.649803],[27.1779,103.648628],[27.175831,103.647827],[27.17329,103.647232],[27.17054,103.647072],[27.167339,103.647293],[27.164,103.647942],[27.15872,103.649628],[27.154169,103.651733],[27.152031,103.652283],[27.147369,103.652802],[27.143101,103.653908],[27.14143,103.653961],[27.14053,103.65387],[27.131121,103.650887],[27.129351,103.650627],[27.127211,103.650993],[27.12598,103.651718],[27.125299,103.65181],[27.124319,103.651947],[27.12398,103.651947],[27.12299,103.651672],[27.12096,103.651001],[27.113211,103.649933],[27.11253,103.649673],[27.110041,103.648109],[27.10898,103.647667],[27.108009,103.647499],[27.104919,103.647614],[27.103239,103.647346],[27.10194,103.646919],[27.09943,103.645592],[27.09831,103.645218],[27.09693,103.645073],[27.095551,103.645157],[27.09359,103.64563],[27.091999,103.646187],[27.088079,103.647491],[27.08704,103.647629],[27.086451,103.647598],[27.08568,103.647453],[27.084551,103.646973],[27.083851,103.6465],[27.083,103.645699],[27.08264,103.645157],[27.082161,103.644569],[27.080271,103.641853],[27.07803,103.639061],[27.07766,103.63871],[27.077499,103.638573],[27.075359,103.636833],[27.07407,103.636208],[27.07329,103.636017],[27.072309,103.636047],[27.071739,103.636208],[27.07119,103.636482],[27.070351,103.637131],[27.0693,103.638069],[27.06863,103.638474],[27.068081,103.638657],[27.066259,103.638893],[27.065479,103.639137],[27.06492,103.639473],[27.064301,103.640038],[27.06389,103.640556],[27.06365,103.640984],[27.06341,103.641617],[27.063271,103.642319],[27.063351,103.645111],[27.06321,103.646027],[27.06299,103.646698],[27.06267,103.647324],[27.06238,103.647667],[27.06175,103.648239],[27.060841,103.64872],[27.06019,103.648888],[27.059589,103.648903],[27.058981,103.648804],[27.05514,103.647217],[27.05409,103.647003],[27.052629,103.647003],[27.051451,103.647293],[27.05052,103.647758],[27.04999,103.648079],[27.047319,103.650131],[27.045959,103.650383],[27.04484,103.650269],[27.043961,103.649933],[27.04318,103.649384],[27.04158,103.647636],[27.040319,103.646759],[27.039061,103.646202],[27.03179,103.644981],[27.0299,103.644348],[27.02809,103.643211],[27.027651,103.64283],[27.026739,103.641541],[27.02565,103.63929],[27.02478,103.638153],[27.023161,103.636528],[27.022461,103.635483],[27.02191,103.634117],[27.0217,103.632423],[27.02203,103.623558],[27.021061,103.613472],[27.02072,103.612587],[27.02059,103.612259],[27.020491,103.612167],[27.020229,103.61161],[27.01918,103.610069],[27.018311,103.6092],[27.01779,103.60881],[27.017229,103.608498],[27.015921,103.607979],[27.01515,103.607826],[27.0135,103.607803],[27.01181,103.608093],[27.011709,103.608093],[27.010019,103.608276],[27.00703,103.607964],[27.005871,103.608063],[27.00322,103.608597],[27.002371,103.60862],[27.00173,103.608582],[27.0007,103.608337],[26.999479,103.607758],[26.99892,103.607384],[26.99749,103.605911],[26.996691,103.604797],[26.99585,103.603188],[26.995411,103.601929],[26.99506,103.599991],[26.994711,103.594978],[26.994341,103.593391],[26.99378,103.592201],[26.990351,103.588181],[26.98736,103.583832],[26.98568,103.582413],[26.984591,103.581718],[26.98411,103.581467],[26.98325,103.581146],[26.98291,103.5811],[26.982059,103.58091],[26.977859,103.581146],[26.976681,103.580917],[26.97571,103.580482],[26.97448,103.579628],[26.97374,103.578789],[26.972731,103.577187],[26.97262,103.577072],[26.96594,103.565643],[26.965549,103.564171],[26.965549,103.561852],[26.96533,103.560837],[26.964781,103.559708],[26.9634,103.55764],[26.96254,103.556923],[26.96184,103.556503],[26.96139,103.556374],[26.951269,103.55677],[26.949631,103.55658],[26.94891,103.556358],[26.94841,103.556068],[26.947809,103.55555],[26.947411,103.555054],[26.94702,103.554291],[26.946119,103.5513],[26.945709,103.550461],[26.94334,103.547234],[26.94191,103.544724],[26.94112,103.543762],[26.94002,103.542824],[26.93877,103.542023],[26.93788,103.541611],[26.937149,103.541367],[26.93611,103.541443],[26.934299,103.541588],[26.933229,103.541473],[26.932819,103.541367],[26.932211,103.541054],[26.93066,103.539978],[26.93,103.539673],[26.92931,103.539543],[26.928841,103.539528],[26.928129,103.539642],[26.926069,103.540443],[26.925381,103.540588],[26.9245,103.540611],[26.923599,103.540489],[26.92186,103.539993],[26.92103,103.539917],[26.92061,103.539963],[26.919809,103.540237],[26.919241,103.540558],[26.9184,103.541283],[26.91699,103.542778],[26.915291,103.544022],[26.914021,103.544777],[26.91256,103.545868],[26.91078,103.547691],[26.907909,103.551788],[26.90708,103.552597],[26.9065,103.552979],[26.90564,103.553337],[26.904961,103.553467],[26.903021,103.553612],[26.90229,103.55378],[26.901381,103.554176],[26.90003,103.554817],[26.899111,103.555107],[26.898161,103.555237],[26.89669,103.555199],[26.89435,103.554764],[26.89176,103.553963],[26.89102,103.553658],[26.890181,103.553383],[26.888451,103.552727],[26.888281,103.552612],[26.882441,103.549599],[26.8783,103.547081],[26.87499,103.545753],[26.873461,103.545357],[26.870871,103.544884],[26.86898,103.544853],[26.866899,103.54525],[26.86474,103.545937],[26.863489,103.546127],[26.86207,103.546089],[26.86063,103.545738],[26.85984,103.545372],[26.85869,103.544601],[26.85038,103.53727],[26.84799,103.535637],[26.846399,103.534782],[26.84396,103.533813],[26.83536,103.531258],[26.8347,103.530968],[26.83407,103.530586],[26.83326,103.530037],[26.832041,103.528839],[26.83091,103.527328],[26.83005,103.525391],[26.82686,103.516579],[26.82457,103.512283],[26.821711,103.508636],[26.820379,103.507294],[26.81715,103.504631],[26.814951,103.502937],[26.812519,103.500366],[26.810841,103.498398],[26.809139,103.496788],[26.80666,103.495071],[26.80418,103.493851],[26.801371,103.493073],[26.79701,103.492371],[26.795879,103.492073],[26.79248,103.490677],[26.79015,103.489326],[26.78669,103.48716],[26.783381,103.485764],[26.78071,103.485107],[26.77058,103.482986],[26.766041,103.481598],[26.76531,103.481339],[26.76446,103.480957],[26.763821,103.480339],[26.76302,103.479523],[26.762051,103.478531],[26.761669,103.478287],[26.76128,103.478104],[26.76041,103.477943],[26.759781,103.477966],[26.759159,103.478119],[26.75857,103.478416],[26.757839,103.478989],[26.75737,103.479553],[26.75712,103.479958],[26.75683,103.480637],[26.756651,103.481377],[26.75659,103.482094],[26.756491,103.483223],[26.75629,103.483994],[26.756069,103.484467],[26.755079,103.486023],[26.753731,103.487671],[26.751841,103.489517],[26.75123,103.489983],[26.750151,103.490578],[26.74922,103.490883],[26.74822,103.491028],[26.747219,103.490982],[26.746269,103.490784],[26.744961,103.490211],[26.743071,103.489067],[26.742649,103.488876],[26.74197,103.488708],[26.74106,103.48864],[26.737221,103.488533],[26.737341,103.487473],[26.736679,103.486862],[26.736601,103.486687],[26.735531,103.485252],[26.734989,103.484703],[26.73424,103.484253],[26.732981,103.483849],[26.732,103.483582],[26.731449,103.483307],[26.7311,103.483078],[26.730499,103.482452],[26.730009,103.481682],[26.729321,103.480247],[26.728939,103.479683],[26.728479,103.479187],[26.728121,103.478951],[26.726521,103.478203],[26.72613,103.477951],[26.72559,103.477501],[26.725121,103.476929],[26.723829,103.474678],[26.72327,103.474121],[26.72208,103.473419],[26.721121,103.472977],[26.72057,103.472603],[26.71909,103.471123],[26.718109,103.470413],[26.716681,103.469528],[26.715919,103.468903],[26.71526,103.468147],[26.710609,103.461243],[26.708389,103.458847],[26.70776,103.457916],[26.70702,103.456749],[26.70652,103.456177],[26.705839,103.455643],[26.704889,103.455193],[26.70277,103.45462],[26.701481,103.454048],[26.691151,103.446541],[26.68638,103.443703],[26.685579,103.443001],[26.68322,103.440132],[26.67824,103.435547],[26.677401,103.43454],[26.67481,103.430267],[26.674141,103.429466],[26.67314,103.428673],[26.670521,103.426804],[26.669189,103.425629],[26.6684,103.424561],[26.668381,103.424461],[26.666929,103.423126],[26.666401,103.422836],[26.66445,103.420998],[26.663811,103.420197],[26.663759,103.41996],[26.66337,103.419403],[26.660549,103.416901],[26.65888,103.414871],[26.65806,103.414238],[26.654551,103.412773],[26.65377,103.41227],[26.65312,103.411682],[26.65242,103.410744],[26.650511,103.407066],[26.65012,103.406532],[26.64963,103.406036],[26.64196,103.400917],[26.638769,103.399353],[26.636061,103.398041],[26.634979,103.397331],[26.63376,103.396317],[26.63225,103.394592],[26.627741,103.389038],[26.62705,103.387947],[26.624969,103.382874],[26.62381,103.379868],[26.623381,103.379211],[26.622931,103.37886],[26.622601,103.378677],[26.62208,103.37851],[26.62118,103.378342],[26.620661,103.378143],[26.620199,103.3778],[26.618971,103.376579],[26.61879,103.376266],[26.6173,103.374977],[26.616819,103.374672],[26.61614,103.374443],[26.615271,103.374283],[26.614929,103.374153],[26.614441,103.373901],[26.613911,103.373398],[26.613041,103.372147],[26.612579,103.37178],[26.61199,103.371429],[26.610559,103.37085],[26.609949,103.370407],[26.60861,103.368393],[26.608141,103.367996],[26.60759,103.36776],[26.607281,103.367691],[26.60648,103.367706],[26.604321,103.368393],[26.603701,103.368401],[26.60276,103.368134],[26.602051,103.367638],[26.600719,103.3666],[26.600389,103.366402],[26.599649,103.366127],[26.594931,103.365623],[26.59449,103.365494],[26.59387,103.365181],[26.59334,103.364754],[26.593019,103.364357],[26.59199,103.363037],[26.58865,103.358833],[26.588079,103.358269],[26.587099,103.357651],[26.586571,103.357437],[26.585621,103.357277],[26.584681,103.357353],[26.58441,103.357368],[26.58337,103.357529],[26.582121,103.357491],[26.58202,103.35746],[26.57988,103.35688],[26.57847,103.356453],[26.576639,103.356483],[26.57616,103.356628],[26.57501,103.357262],[26.573641,103.358566],[26.572889,103.360184],[26.57221,103.361847],[26.57144,103.362839],[26.570829,103.363373],[26.570009,103.363831],[26.56896,103.36412],[26.56839,103.364113],[26.56765,103.364037],[26.56732,103.363983],[26.56605,103.36335],[26.565611,103.363037],[26.561211,103.358841],[26.56068,103.358238],[26.55739,103.352203],[26.55625,103.350777],[26.555281,103.349998],[26.551029,103.347748],[26.54763,103.345238],[26.543949,103.342262],[26.54328,103.341537],[26.54122,103.338219],[26.5352,103.32708],[26.5343,103.326233],[26.53418,103.326141],[26.5306,103.324722],[26.53013,103.324417],[26.52984,103.324158],[26.529591,103.323853],[26.52923,103.323128],[26.529131,103.322723],[26.529091,103.321892],[26.52928,103.32029],[26.529249,103.319679],[26.529091,103.319107],[26.52883,103.318604],[26.5261,103.315666],[26.5256,103.315247],[26.52487,103.314781],[26.52132,103.313271],[26.520399,103.313087],[26.51967,103.313087],[26.513321,103.313911],[26.512739,103.313904],[26.51181,103.31369],[26.511129,103.313377],[26.51038,103.312759],[26.5098,103.312019],[26.50769,103.307098],[26.506969,103.306129],[26.5065,103.305687],[26.505831,103.305313],[26.504841,103.305023],[26.499769,103.305023],[26.49926,103.304916],[26.49859,103.304657],[26.49827,103.304459],[26.49769,103.303886],[26.496719,103.302559],[26.49597,103.301826],[26.49544,103.301514],[26.494869,103.301292],[26.494061,103.301193],[26.49346,103.301247],[26.49209,103.301643],[26.487391,103.30336],[26.484831,103.303802],[26.484209,103.303802],[26.483999,103.303772],[26.482771,103.303909],[26.481871,103.304153],[26.480391,103.304916],[26.47942,103.305557],[26.4783,103.306091],[26.47756,103.306236],[26.477131,103.306213],[26.476629,103.306061],[26.476021,103.305687],[26.474951,103.304581],[26.473909,103.303993],[26.47316,103.30378],[26.472469,103.303741],[26.471979,103.303833],[26.47183,103.303886],[26.47172,103.304001],[26.471331,103.304131],[26.470421,103.304176],[26.46986,103.304047],[26.46932,103.303772],[26.468941,103.303452],[26.468309,103.302727],[26.466181,103.299278],[26.46574,103.298576],[26.46533,103.29808],[26.46483,103.297737],[26.464491,103.297577],[26.463921,103.297493],[26.46352,103.297531],[26.462311,103.297974],[26.460239,103.298714],[26.459629,103.298843],[26.459009,103.298889],[26.45858,103.298851],[26.457951,103.298683],[26.456949,103.298157],[26.456591,103.297897],[26.456091,103.297447],[26.455721,103.296959],[26.45507,103.295624],[26.453449,103.290291],[26.4531,103.289574],[26.45273,103.28907],[26.452141,103.288483],[26.447451,103.285461],[26.447041,103.285057],[26.44672,103.284607],[26.44651,103.284088],[26.44643,103.283531],[26.44644,103.282013],[26.44626,103.281258],[26.44591,103.280571],[26.442511,103.276314],[26.44105,103.274773],[26.42713,103.267792],[26.42532,103.266891],[26.424749,103.266602],[26.424561,103.266487],[26.393221,103.250977],[26.391689,103.250366],[26.391001,103.250252],[26.390511,103.250252],[26.38979,103.250359],[26.389311,103.250511],[26.388599,103.250839],[26.38796,103.251289],[26.387421,103.251831],[26.38199,103.258743],[26.380569,103.260162],[26.3787,103.261597],[26.37796,103.262077],[26.376129,103.262993],[26.374269,103.263718],[26.37236,103.264168],[26.36668,103.265137],[26.36566,103.26519],[26.36433,103.265091],[26.36381,103.264969],[26.36306,103.264641],[26.36236,103.264252],[26.359619,103.262039],[26.358789,103.261551],[26.35813,103.261337],[26.35747,103.261276],[26.355379,103.261307],[26.354601,103.261162],[26.34967,103.258942],[26.348619,103.25872],[26.34795,103.258759],[26.34745,103.258904],[26.34697,103.259163],[26.346371,103.259651],[26.34589,103.260277],[26.34553,103.261009],[26.34346,103.267906],[26.3433,103.269096],[26.343361,103.269836],[26.34374,103.271461],[26.3438,103.272087],[26.34333,103.27475],[26.34334,103.27597],[26.343531,103.277008],[26.34387,103.278038],[26.34478,103.280586],[26.344999,103.281326],[26.34659,103.285301],[26.346701,103.285789],[26.346741,103.28656],[26.346519,103.288887],[26.346769,103.292091],[26.34671,103.29287],[26.34654,103.29332],[26.344839,103.296158],[26.344681,103.296356],[26.34429,103.296669],[26.343599,103.296982],[26.34197,103.297363],[26.34129,103.297623],[26.3395,103.298767],[26.338619,103.299133],[26.334459,103.300262],[26.333811,103.300591],[26.333441,103.30088],[26.332121,103.302429],[26.328951,103.30632],[26.328211,103.307053],[26.327579,103.307518],[26.32666,103.307922],[26.32531,103.308357],[26.32243,103.309929],[26.32165,103.310471],[26.31884,103.314163],[26.31797,103.315041],[26.31698,103.315773],[26.315729,103.316521],[26.315001,103.317123],[26.31403,103.318253],[26.312361,103.320862],[26.31218,103.321312],[26.311239,103.325974],[26.31101,103.326736],[26.309771,103.329491],[26.309549,103.330276],[26.30946,103.330818],[26.30946,103.332451],[26.309401,103.332977],[26.309179,103.33374],[26.30858,103.334938],[26.3076,103.336472],[26.30689,103.338226],[26.30661,103.339333],[26.30633,103.340973],[26.30619,103.341461],[26.305849,103.342163],[26.305531,103.342537],[26.30406,103.343918],[26.30307,103.344681],[26.30007,103.347366],[26.298969,103.348038],[26.29743,103.348663],[26.294941,103.349159],[26.294559,103.349297],[26.29011,103.352043],[26.28854,103.353416],[26.287861,103.354118],[26.287491,103.354378],[26.286869,103.354637],[26.28377,103.355232],[26.283331,103.355377],[26.28273,103.355713],[26.280279,103.358047],[26.279699,103.358467],[26.277109,103.359993],[26.2764,103.360291],[26.27462,103.360687],[26.273331,103.36097],[26.27282,103.361153],[26.27235,103.361397],[26.27169,103.361893],[26.26902,103.364273],[26.26837,103.36467],[26.2679,103.364868],[26.267389,103.36499],[26.266621,103.36499],[26.26524,103.364647],[26.26186,103.363678],[26.261129,103.363548],[26.260429,103.363541],[26.26001,103.363602],[26.25942,103.363823],[26.257891,103.364769],[26.257271,103.365021],[26.256359,103.365173],[26.253691,103.365349],[26.25301,103.365479],[26.24645,103.367821],[26.244711,103.368767],[26.24288,103.370148],[26.238939,103.373947],[26.2377,103.375526],[26.236839,103.377007],[26.235729,103.379669],[26.235359,103.38105],[26.234341,103.389236],[26.23395,103.390549],[26.23344,103.39151],[26.233101,103.391953],[26.23229,103.392693],[26.23144,103.393372],[26.230499,103.394333],[26.229891,103.395218],[26.22916,103.396698],[26.22888,103.397476],[26.228121,103.400261],[26.227501,103.40213],[26.227301,103.402931],[26.227091,103.403427],[26.226641,103.404121],[26.22611,103.404709],[26.22547,103.405182],[26.224661,103.405533],[26.221069,103.406113],[26.219521,103.406143],[26.218451,103.40596],[26.21789,103.405693],[26.215919,103.404037],[26.21559,103.403633],[26.21291,103.401031],[26.21072,103.399094],[26.207279,103.39798],[26.203951,103.398811],[26.2036,103.399063],[26.203199,103.3992],[26.202829,103.399406],[26.20146,103.399971],[26.200609,103.400146],[26.19997,103.400192],[26.19912,103.400063],[26.19795,103.399513],[26.196461,103.398643],[26.195471,103.398148],[26.19492,103.397797],[26.194241,103.397324],[26.194031,103.397247],[26.19183,103.396027],[26.190729,103.39579],[26.189899,103.395866],[26.188931,103.396301],[26.18684,103.397659],[26.1859,103.39827],[26.18556,103.398376],[26.183399,103.398598],[26.18268,103.398857],[26.181829,103.399399],[26.18091,103.400352],[26.178711,103.403313],[26.17831,103.403709],[26.177891,103.403923],[26.177549,103.403999],[26.177019,103.403893],[26.176781,103.403763],[26.176559,103.403557],[26.176319,103.403137],[26.17622,103.402802],[26.17618,103.402283],[26.176229,103.401787],[26.176371,103.4011],[26.17642,103.400589],[26.17622,103.398972],[26.17621,103.397568],[26.17647,103.39576],[26.176189,103.393623],[26.175739,103.391579],[26.175739,103.391418],[26.17531,103.390739],[26.174931,103.390457],[26.174641,103.390373],[26.174351,103.390373],[26.17407,103.390442],[26.173679,103.390701],[26.173361,103.391098],[26.173,103.391907],[26.172779,103.392677],[26.172409,103.393379],[26.17231,103.393494],[26.17207,103.393646],[26.171659,103.393723],[26.168779,103.393097],[26.168171,103.392822],[26.16744,103.392273],[26.167351,103.392174],[26.166031,103.391159],[26.16197,103.38813],[26.160919,103.387016],[26.160311,103.386307],[26.15793,103.384117],[26.157539,103.383659],[26.155451,103.380707],[26.154449,103.379318],[26.153799,103.377769],[26.153231,103.375031],[26.153231,103.374878],[26.15317,103.374748],[26.15295,103.374046],[26.152229,103.373108],[26.151541,103.372322],[26.15114,103.371468],[26.1509,103.370163],[26.150761,103.369881],[26.15069,103.36956],[26.15045,103.369148],[26.14999,103.368767],[26.149561,103.368652],[26.14912,103.368683],[26.1486,103.368927],[26.147631,103.369682],[26.147181,103.369873],[26.14687,103.369904],[26.146391,103.369827],[26.14535,103.369431],[26.14488,103.36937],[26.144581,103.369408],[26.144341,103.36953],[26.14411,103.369728],[26.14381,103.370247],[26.143709,103.370888],[26.143721,103.372162],[26.1436,103.372597],[26.143379,103.373001],[26.1432,103.373222],[26.142719,103.373543],[26.14189,103.373787],[26.137711,103.373772],[26.136459,103.373596],[26.135691,103.373672],[26.13501,103.373833],[26.12385,103.377121],[26.122641,103.377708],[26.11801,103.381523],[26.116779,103.382263],[26.1161,103.38253],[26.11503,103.382759],[26.113741,103.382843],[26.111959,103.382561],[26.11124,103.382233],[26.110331,103.381683],[26.110001,103.381363],[26.108641,103.379333],[26.10817,103.378563],[26.107849,103.377998],[26.107479,103.377693],[26.10696,103.377563],[26.10442,103.377533],[26.10367,103.377296],[26.102921,103.376793],[26.102301,103.376068],[26.100321,103.372772],[26.099701,103.371986],[26.099489,103.371803],[26.09893,103.371521],[26.098669,103.371498],[26.098049,103.371613],[26.097521,103.371902],[26.096581,103.372757],[26.095949,103.373337],[26.09532,103.373833],[26.09458,103.3741],[26.09387,103.374077],[26.09329,103.373894],[26.090401,103.372589],[26.083139,103.368111],[26.082951,103.368011],[26.07933,103.364166],[26.078779,103.363388],[26.078369,103.362213],[26.078131,103.361214],[26.07766,103.360123],[26.07703,103.359161],[26.07538,103.356583],[26.07522,103.356468],[26.07472,103.356041],[26.074341,103.355797],[26.07395,103.355652],[26.07341,103.355598],[26.07279,103.35569],[26.066151,103.35788],[26.06604,103.357964],[26.06423,103.358704],[26.054621,103.363274],[26.05266,103.3638],[26.05201,103.364159],[26.051319,103.364777],[26.05094,103.365219],[26.050579,103.365707],[26.050171,103.366112],[26.049669,103.366417],[26.04929,103.366547],[26.048889,103.366623],[26.04748,103.36657],[26.04694,103.366669],[26.04641,103.36689],[26.045811,103.367363],[26.043739,103.369476],[26.042669,103.370308],[26.037701,103.373703],[26.03702,103.373978],[26.036551,103.374069],[26.035601,103.374107],[26.03249,103.37413],[26.030939,103.374496],[26.027519,103.375816],[26.02634,103.376213],[26.025709,103.376297],[26.02487,103.376244],[26.02202,103.375542],[26.015551,103.374832],[26.014351,103.374496],[26.01321,103.374023],[26.0124,103.373756],[26.011789,103.373688],[26.007721,103.373962],[26.00436,103.373741],[26.00349,103.37384],[26.000931,103.374496],[26.00028,103.374527],[25.99984,103.374474],[25.99917,103.374283],[25.99048,103.369667],[25.98843,103.368462],[25.987419,103.367493],[25.98374,103.362061],[25.98126,103.359642],[25.974859,103.354439],[25.97471,103.354286],[25.968161,103.348991],[25.967581,103.348373],[25.967051,103.347679],[25.96632,103.346207],[25.966,103.34536],[25.965891,103.344963],[25.965139,103.343102],[25.96468,103.3423],[25.96401,103.341583],[25.96048,103.339149],[25.95989,103.338921],[25.95927,103.33886],[25.95841,103.338966],[25.95583,103.339653],[25.954,103.339706],[25.95211,103.339279],[25.95129,103.339073],[25.95068,103.339043],[25.950279,103.339081],[25.949671,103.339279],[25.94873,103.339767],[25.94838,103.340057],[25.946369,103.342346],[25.945511,103.343246],[25.945009,103.343643],[25.944611,103.343849],[25.944201,103.343979],[25.943991,103.344009],[25.943371,103.343933],[25.942789,103.343681],[25.94227,103.343277],[25.941629,103.34256],[25.937929,103.337509],[25.93656,103.335693],[25.935539,103.334587],[25.934219,103.33329],[25.933281,103.33181],[25.93195,103.32885],[25.93116,103.327721],[25.93108,103.327606],[25.930941,103.327522],[25.93082,103.32737],[25.93,103.326981],[25.928551,103.326042],[25.92778,103.325394],[25.926069,103.323463],[25.925529,103.323059],[25.924589,103.322632],[25.92318,103.322243],[25.922449,103.3218],[25.921789,103.321243],[25.920389,103.319901],[25.920111,103.319733],[25.919769,103.319641],[25.91926,103.319649],[25.915279,103.321182],[25.9137,103.321838],[25.91114,103.321938],[25.91078,103.319809],[25.91044,103.316429],[25.910641,103.316177],[25.910789,103.315857],[25.911779,103.314079],[25.912121,103.313232],[25.912319,103.312576],[25.9126,103.310478],[25.913059,103.308723],[25.913099,103.308289],[25.912689,103.306068],[25.91288,103.303902],[25.912809,103.303436],[25.912411,103.302567],[25.91205,103.302177],[25.911591,103.301903],[25.91148,103.301888],[25.910851,103.301537],[25.910299,103.301361],[25.908951,103.300728],[25.9088,103.300598],[25.906731,103.299622],[25.905649,103.299858],[25.905439,103.300003],[25.905359,103.299957],[25.904671,103.300102],[25.903919,103.300034],[25.903509,103.299767],[25.90321,103.299316],[25.902201,103.295471],[25.90147,103.293877],[25.90085,103.293854],[25.90065,103.293762],[25.90052,103.293427],[25.900061,103.292648],[25.89992,103.291634],[25.899891,103.291107],[25.899771,103.290756],[25.899521,103.290352],[25.89922,103.290131],[25.899059,103.290092],[25.89883,103.290108],[25.89856,103.290039],[25.897209,103.290359],[25.8962,103.290253],[25.895651,103.289963],[25.89509,103.289436],[25.894699,103.288834],[25.894199,103.287666],[25.893629,103.287033],[25.893419,103.28688],[25.89274,103.286728],[25.89192,103.286789],[25.890381,103.287148],[25.8895,103.287239],[25.887739,103.286926],[25.88566,103.286507],[25.88493,103.286583],[25.883249,103.287277],[25.88265,103.287369],[25.881981,103.287216],[25.879101,103.28566],[25.87722,103.284523],[25.876011,103.284119],[25.871019,103.283287],[25.86895,103.283157],[25.86727,103.282509],[25.86611,103.281937],[25.865749,103.28183],[25.86347,103.281464],[25.86125,103.280663],[25.85948,103.280479],[25.856489,103.280434],[25.854349,103.280251],[25.8536,103.279984],[25.853001,103.279556],[25.852051,103.278236],[25.850981,103.276466],[25.850651,103.276039],[25.8494,103.275017],[25.849079,103.274834],[25.84857,103.274673],[25.848049,103.274628],[25.847309,103.274696],[25.84659,103.274849],[25.845449,103.274872],[25.84498,103.274757],[25.844231,103.274399],[25.843599,103.274246],[25.84259,103.274292],[25.838961,103.274857],[25.837351,103.274857],[25.83423,103.273956],[25.833731,103.273933],[25.833059,103.274109],[25.832451,103.27446],[25.8311,103.275482],[25.83045,103.275703],[25.829679,103.275757],[25.827801,103.275658],[25.82725,103.275711],[25.826559,103.275932],[25.82596,103.27626],[25.82546,103.276657],[25.82526,103.276878],[25.8204,103.277748],[25.8202,103.277733],[25.820049,103.277649],[25.81978,103.277359],[25.81876,103.276527],[25.8181,103.276207],[25.817751,103.276108],[25.816999,103.276108],[25.81418,103.276428],[25.81275,103.276459],[25.810659,103.276108],[25.80863,103.276161],[25.803711,103.276512],[25.799,103.275848],[25.797159,103.275597],[25.796749,103.275597],[25.796009,103.275749],[25.7952,103.276108],[25.79451,103.276657],[25.79405,103.277161],[25.793079,103.278763],[25.79258,103.279327],[25.79213,103.279648],[25.791451,103.279907],[25.790899,103.279999],[25.790331,103.279953],[25.789801,103.279778],[25.78635,103.277962],[25.78553,103.277649],[25.784929,103.277496],[25.784149,103.277458],[25.78261,103.277557],[25.78163,103.277496],[25.78021,103.277199],[25.77636,103.276031],[25.771879,103.274979],[25.77083,103.274529],[25.769979,103.274109],[25.769329,103.273857],[25.76755,103.273407],[25.76668,103.273247],[25.76523,103.272781],[25.76408,103.272308],[25.763359,103.272102],[25.762831,103.272057],[25.762381,103.272133],[25.76111,103.27253],[25.7603,103.272797],[25.75943,103.272858],[25.759081,103.272781],[25.7582,103.272346],[25.75625,103.271156],[25.755899,103.271004],[25.75555,103.270882],[25.75481,103.27076],[25.75461,103.27076],[25.75441,103.270798],[25.75098,103.27066],[25.74658,103.27095],[25.745951,103.270882],[25.74535,103.270699],[25.741751,103.269157],[25.740379,103.268951],[25.727909,103.269653],[25.72686,103.269577],[25.72611,103.269402],[25.72541,103.269096],[25.723101,103.267998],[25.722099,103.267677],[25.721081,103.267548],[25.72028,103.267563],[25.719259,103.267677],[25.7166,103.267754],[25.714849,103.267647],[25.71176,103.267097],[25.709009,103.26635],[25.708229,103.266197],[25.70643,103.266159],[25.703899,103.266403],[25.70166,103.266502],[25.695101,103.266151],[25.69413,103.26593],[25.69368,103.265709],[25.692631,103.26506],[25.69173,103.264702],[25.69101,103.26458],[25.6898,103.264664],[25.68721,103.265106],[25.685909,103.265381],[25.6849,103.265511],[25.68416,103.26548],[25.683701,103.265358],[25.681999,103.264557],[25.68136,103.264351],[25.68075,103.264259],[25.67716,103.265152],[25.676611,103.265182],[25.67605,103.265083],[25.67461,103.264557],[25.67281,103.263763],[25.67136,103.26326],[25.668329,103.262451],[25.667351,103.261978],[25.665979,103.261162],[25.665279,103.260902],[25.664801,103.260811],[25.664061,103.260811],[25.661209,103.261253],[25.66028,103.261253],[25.65893,103.261002],[25.65873,103.260933],[25.657881,103.26078],[25.65686,103.260857],[25.65041,103.263283],[25.64731,103.264412],[25.64706,103.264481],[25.646259,103.264603],[25.645109,103.264549],[25.64435,103.264412],[25.63361,103.261147],[25.63203,103.260757],[25.63093,103.260399],[25.62985,103.259933],[25.628759,103.259354],[25.62656,103.257698],[25.62546,103.256607],[25.62421,103.254982],[25.62351,103.25383],[25.62183,103.250664],[25.620859,103.249229],[25.61961,103.247726],[25.607679,103.235161],[25.599199,103.226303],[25.597651,103.224983],[25.595449,103.223511],[25.5819,103.217506],[25.5807,103.217133],[25.57921,103.216927],[25.578711,103.216911],[25.577959,103.216927],[25.57568,103.216881],[25.574659,103.216698],[25.566509,103.214333],[25.5655,103.213852],[25.5634,103.212646],[25.5632,103.212509],[25.55838,103.209663],[25.556431,103.208527],[25.55505,103.207977],[25.553829,103.20768],[25.550329,103.207092],[25.54949,103.206947],[25.549971,103.207581],[25.55011,103.207863],[25.55036,103.208107],[25.550711,103.208153],[25.551161,103.208252],[25.551571,103.208557],[25.55184,103.206657],[25.55212,103.2062],[25.552441,103.206009],[25.55271,103.205597],[25.552811,103.204437],[25.55295,103.201317],[25.55307,103.197433],[25.553141,103.196373],[25.553471,103.191902],[25.55352,103.191704],[25.55443,103.188454],[25.55512,103.185707],[25.55559,103.183983],[25.556129,103.182167],[25.556459,103.181473],[25.556829,103.180923],[25.557421,103.18029],[25.557961,103.179893],[25.558849,103.179443],[25.56251,103.177856],[25.56278,103.177696],[25.563021,103.177513],[25.56337,103.176979],[25.56349,103.176689],[25.56361,103.176163],[25.5637,103.175423],[25.56385,103.174667],[25.566589,103.167618],[25.56706,103.166313],[25.56739,103.165588],[25.568171,103.164452],[25.568741,103.163582],[25.569189,103.163292],[25.57011,103.16304],[25.57065,103.162827],[25.57196,103.16214],[25.572519,103.161873],[25.573351,103.16143],[25.573721,103.161507],[25.5742,103.161903],[25.57464,103.161949],[25.574829,103.161812],[25.57535,103.161179],[25.57547,103.160851],[25.575331,103.160667],[25.57497,103.160606],[25.57469,103.160347],[25.574699,103.15976],[25.5748,103.159492],[25.57592,103.158859],[25.57621,103.158661],[25.576571,103.158234],[25.57695,103.157837],[25.57728,103.157677],[25.57756,103.157677],[25.577869,103.1576],[25.578381,103.15728],[25.578501,103.157158],[25.578569,103.156998],[25.578751,103.156227],[25.57889,103.155884],[25.578951,103.155617],[25.578899,103.155373],[25.57851,103.154999],[25.578341,103.154762],[25.5783,103.154556],[25.578291,103.153717],[25.578421,103.153511],[25.578581,103.153572],[25.578779,103.153908],[25.57897,103.154114],[25.579531,103.154411],[25.5797,103.154297],[25.579691,103.154083],[25.57925,103.153549],[25.579029,103.153137],[25.57893,103.152763],[25.57901,103.152313],[25.579121,103.152031],[25.57951,103.151489],[25.57963,103.15123],[25.57971,103.150513],[25.57984,103.15023],[25.580021,103.15023],[25.58012,103.150337],[25.580151,103.150909],[25.58033,103.151741],[25.580509,103.15197],[25.580709,103.152061],[25.58091,103.152077],[25.58124,103.151878],[25.582331,103.149551],[25.583521,103.147102],[25.58371,103.146568],[25.583759,103.14608],[25.58305,103.142853],[25.582661,103.141586],[25.582661,103.141121],[25.583111,103.139793],[25.58313,103.139458],[25.58235,103.136772],[25.581261,103.134132],[25.58086,103.133087],[25.580469,103.132187],[25.58016,103.131752],[25.57819,103.130074],[25.57766,103.129532],[25.577579,103.129402],[25.57732,103.128807],[25.576981,103.127869],[25.57686,103.127609],[25.576509,103.127213],[25.57601,103.126793],[25.575859,103.126587],[25.57546,103.125763],[25.575029,103.125343],[25.574381,103.125191],[25.57383,103.125221],[25.573139,103.125366],[25.572701,103.125343],[25.572411,103.12513],[25.572041,103.124657],[25.57058,103.12236],[25.570129,103.121719],[25.56999,103.121452],[25.56992,103.12104],[25.570089,103.120644],[25.57011,103.120171],[25.569851,103.119743],[25.569521,103.119537],[25.567829,103.119141],[25.567499,103.11882],[25.567249,103.118172],[25.566469,103.117126],[25.566259,103.116653],[25.566311,103.116257],[25.56665,103.115494],[25.566719,103.114906],[25.5667,103.11467],[25.566521,103.114182],[25.56608,103.113403],[25.56568,103.112846],[25.565281,103.112373],[25.56498,103.112122],[25.563419,103.111099],[25.55805,103.107399],[25.55769,103.107231],[25.5539,103.105881],[25.5509,103.104362],[25.54928,103.103989],[25.54875,103.103996],[25.548,103.10421],[25.547489,103.104179],[25.546881,103.103958],[25.546,103.103523],[25.54587,103.103317],[25.5459,103.103203],[25.546021,103.102921],[25.54619,103.10276],[25.546551,103.102676],[25.547609,103.102509],[25.54808,103.102531],[25.548491,103.102364],[25.548651,103.102249],[25.548809,103.101883],[25.54903,103.101791],[25.549311,103.102112],[25.549601,103.102226],[25.55043,103.102081],[25.55094,103.101936],[25.55117,103.101807],[25.55135,103.101593],[25.551689,103.101341],[25.55188,103.101341],[25.55261,103.101448],[25.552971,103.101334],[25.553209,103.101028],[25.55323,103.100754],[25.552891,103.099854],[25.55262,103.099663],[25.55237,103.099602],[25.55221,103.099319],[25.552,103.098473],[25.551741,103.097923],[25.55172,103.097511],[25.55191,103.097099],[25.552271,103.096809],[25.5527,103.09684],[25.552879,103.096947],[25.553631,103.097603],[25.554001,103.097733],[25.555149,103.097931],[25.555559,103.098129],[25.55596,103.098267],[25.55673,103.097969],[25.55715,103.097763],[25.557779,103.097687],[25.558451,103.097481],[25.559259,103.096878],[25.559469,103.096367],[25.55983,103.096092],[25.55995,103.09584],[25.559891,103.095459],[25.55999,103.095337],[25.56019,103.095222],[25.56027,103.094994],[25.560261,103.09491],[25.56045,103.094612],[25.56053,103.094597],[25.560789,103.094353],[25.56094,103.093941],[25.561159,103.093773],[25.56131,103.093964],[25.56152,103.094498],[25.561859,103.094933],[25.562401,103.095062],[25.562771,103.095047],[25.563141,103.09494],[25.56348,103.094719],[25.564951,103.093613],[25.565281,103.093552],[25.56558,103.093719],[25.56576,103.093781],[25.566071,103.093773],[25.56847,103.093002],[25.568859,103.09269],[25.570089,103.091476],[25.570459,103.091301],[25.570709,103.091263],[25.571011,103.09111],[25.571091,103.090919],[25.571091,103.090347],[25.57073,103.089706],[25.570801,103.089394],[25.57111,103.089249],[25.571381,103.08902],[25.57136,103.088783],[25.570959,103.088074],[25.57095,103.087837],[25.571119,103.087791],[25.57139,103.087784],[25.572081,103.087608],[25.57238,103.08741],[25.57251,103.087021],[25.572309,103.083817],[25.57247,103.082024],[25.572451,103.081833],[25.572371,103.081642],[25.571899,103.080872],[25.57159,103.080421],[25.571381,103.08004],[25.57136,103.079712],[25.571541,103.079498],[25.571911,103.079277],[25.572201,103.078949],[25.57238,103.078491],[25.572651,103.078102],[25.573219,103.077606],[25.57412,103.076927],[25.57445,103.076408],[25.57472,103.075829],[25.57514,103.07444],[25.57538,103.073853],[25.576191,103.072327],[25.576509,103.071617],[25.576969,103.070282],[25.57692,103.069893],[25.57634,103.068428],[25.576241,103.068283],[25.57583,103.067947],[25.575491,103.067886],[25.57477,103.067917],[25.57431,103.067993],[25.573549,103.068024],[25.573231,103.067886],[25.573071,103.067589],[25.572729,103.06546],[25.572651,103.065163],[25.572309,103.064743],[25.571779,103.064262],[25.571659,103.063957],[25.57176,103.063797],[25.573151,103.062553],[25.57329,103.062248],[25.57332,103.058449],[25.57328,103.057503],[25.573191,103.056824],[25.572861,103.05513],[25.57259,103.054642],[25.5718,103.053482],[25.57119,103.052803],[25.57078,103.052467],[25.5707,103.052429],[25.5704,103.052116],[25.57029,103.051788],[25.570129,103.051514],[25.56991,103.051277],[25.569401,103.051086],[25.56897,103.051041],[25.568569,103.050858],[25.568251,103.050484],[25.56826,103.050209],[25.568439,103.050117],[25.56875,103.050163],[25.56941,103.050034],[25.56971,103.049828],[25.570129,103.049744],[25.57021,103.049751],[25.57085,103.049637],[25.57099,103.049553],[25.571159,103.049057],[25.571171,103.048843],[25.5711,103.048607],[25.57073,103.047859],[25.57004,103.046677],[25.56974,103.046463],[25.56904,103.04615],[25.56856,103.04583],[25.56805,103.045403],[25.56785,103.045097],[25.567631,103.044533],[25.567249,103.044243],[25.566759,103.044067],[25.56636,103.044167],[25.56559,103.044731],[25.56531,103.044678],[25.565241,103.043938],[25.56517,103.043663],[25.565241,103.043167],[25.565371,103.042923],[25.56538,103.042542],[25.565269,103.042374],[25.56428,103.041054],[25.563749,103.040413],[25.562929,103.039612],[25.562571,103.03894],[25.56245,103.038544],[25.562031,103.037956],[25.561899,103.037437],[25.561741,103.037323],[25.561319,103.037193],[25.56114,103.037109],[25.56098,103.036812],[25.561119,103.036598],[25.56152,103.036247],[25.56159,103.036003],[25.56147,103.035896],[25.561171,103.035744],[25.56093,103.035667],[25.56032,103.035713],[25.56004,103.035538],[25.55975,103.035011],[25.55949,103.034401],[25.55925,103.034157],[25.55895,103.033997],[25.55879,103.033691],[25.558889,103.033432],[25.55932,103.032944],[25.559469,103.032471],[25.55938,103.032204],[25.55883,103.031616],[25.55821,103.031197],[25.55794,103.030731],[25.55785,103.030411],[25.5576,103.030113],[25.556141,103.029617],[25.555771,103.029457],[25.555401,103.02948],[25.555309,103.029533],[25.554899,103.029587],[25.55475,103.029381],[25.554729,103.028687],[25.554689,103.028503],[25.554489,103.028358],[25.55349,103.028343],[25.55323,103.028152],[25.55324,103.027718],[25.55316,103.027229],[25.55294,103.026657],[25.5527,103.026413],[25.55253,103.026337],[25.552259,103.025993],[25.552361,103.025703],[25.552589,103.025459],[25.55295,103.025337],[25.55312,103.025436],[25.553419,103.025757],[25.55369,103.025909],[25.555309,103.025841],[25.55563,103.025673],[25.55615,103.025169],[25.556259,103.024849],[25.55616,103.024689],[25.55513,103.023552],[25.555019,103.023193],[25.55521,103.023087],[25.555559,103.023102],[25.556179,103.022926],[25.556749,103.02269],[25.55724,103.022552],[25.55743,103.022537],[25.557711,103.022598],[25.55817,103.022781],[25.559549,103.023666],[25.56052,103.024246],[25.561411,103.024841],[25.562189,103.025307],[25.56303,103.025551],[25.56348,103.025864],[25.563971,103.025993],[25.56423,103.026016],[25.564751,103.025917],[25.565861,103.025681],[25.566389,103.025398],[25.566771,103.025307],[25.567551,103.025284],[25.567841,103.025299],[25.56811,103.025513],[25.568371,103.02594],[25.568729,103.026199],[25.568899,103.026283],[25.569241,103.026222],[25.569469,103.026047],[25.569651,103.025772],[25.569889,103.0252],[25.569969,103.024673],[25.57015,103.024231],[25.570391,103.023933],[25.57065,103.023376],[25.57066,103.022972],[25.570589,103.022568],[25.57069,103.022057],[25.57078,103.021828],[25.570761,103.021362],[25.570669,103.021133],[25.570669,103.020638],[25.570841,103.019882],[25.570829,103.019081],[25.570971,103.018578],[25.57155,103.017769],[25.572029,103.017174],[25.572241,103.016777],[25.573,103.014839],[25.573151,103.01416],[25.573271,103.013031],[25.573271,103.012833],[25.57338,103.012459],[25.573601,103.012138],[25.5737,103.011833],[25.57345,103.011597],[25.57276,103.011101],[25.572639,103.010773],[25.57287,103.010193],[25.57291,103.009628],[25.5728,103.008873],[25.572901,103.008636],[25.573071,103.00869],[25.574011,103.009239],[25.57431,103.009277],[25.574421,103.009071],[25.574459,103.00782],[25.574369,103.007431],[25.574089,103.00692],[25.57399,103.006683],[25.57394,103.006271],[25.573971,103.005928],[25.5744,103.004807],[25.574659,103.003403],[25.574949,103.002617],[25.575359,103.001923],[25.5756,103.001801],[25.5758,103.001961],[25.576151,103.002373],[25.5765,103.002541],[25.57749,103.001961],[25.577869,103.0019],[25.578369,103.001999],[25.57873,103.001869],[25.57901,103.001549],[25.579069,103.001289],[25.577009,102.99852],[25.57688,102.998253],[25.57686,102.997772],[25.577089,102.996407],[25.57708,102.996094],[25.57691,102.995811],[25.5767,102.995773],[25.576521,102.995819],[25.575609,102.996269],[25.575411,102.99617],[25.57548,102.996048],[25.5763,102.995232],[25.57654,102.995064],[25.57675,102.995033],[25.57715,102.995049],[25.577591,102.99514],[25.57785,102.995064],[25.57794,102.99482],[25.57836,102.993217],[25.578449,102.992981],[25.578621,102.992683],[25.578791,102.992439],[25.579309,102.991913],[25.5812,102.990082],[25.58205,102.989059],[25.582279,102.988907],[25.58251,102.988792],[25.58301,102.988663],[25.583771,102.988411],[25.58437,102.988167],[25.5846,102.988037],[25.585039,102.987671],[25.58606,102.98629],[25.58633,102.986267],[25.586519,102.986343],[25.58758,102.986969],[25.587811,102.987312],[25.587959,102.987717],[25.58802,102.988091],[25.588169,102.988327],[25.588539,102.988564],[25.58975,102.988907],[25.590191,102.988777],[25.590389,102.988503],[25.590839,102.987663],[25.59111,102.987282],[25.591299,102.987152],[25.591869,102.987137],[25.592039,102.986992],[25.59201,102.986649],[25.59215,102.986328],[25.592461,102.986252],[25.5931,102.986252],[25.59341,102.986153],[25.593769,102.985893],[25.594481,102.985092],[25.59498,102.984711],[25.595209,102.984337],[25.595329,102.98391],[25.59564,102.983597],[25.59643,102.983238],[25.59668,102.983063],[25.597679,102.981483],[25.59775,102.98114],[25.597561,102.980873],[25.59642,102.979721],[25.59584,102.979057],[25.59581,102.978737],[25.59623,102.977921],[25.596569,102.977707],[25.597219,102.977814],[25.59786,102.978073],[25.59832,102.978287],[25.599661,102.9786],[25.599911,102.978561],[25.60006,102.97834],[25.6001,102.977921],[25.599991,102.977463],[25.599779,102.976967],[25.5998,102.976639],[25.600031,102.976479],[25.60071,102.976173],[25.60117,102.975754],[25.60154,102.975067],[25.601641,102.974602],[25.601561,102.974007],[25.60165,102.973717],[25.60182,102.973747],[25.602051,102.974007],[25.60243,102.97509],[25.6024,102.975471],[25.60183,102.976227],[25.60181,102.976547],[25.602011,102.976547],[25.603609,102.975906],[25.603821,102.975647],[25.603769,102.97541],[25.603359,102.974609],[25.603331,102.974472],[25.60346,102.974319],[25.604481,102.974373],[25.604771,102.974297],[25.60491,102.974197],[25.605009,102.973938],[25.60498,102.973549],[25.60494,102.973457],[25.604691,102.973167],[25.604469,102.973106],[25.60416,102.973312],[25.603689,102.973396],[25.603491,102.973343],[25.60321,102.973167],[25.60293,102.972801],[25.60251,102.972412],[25.60206,102.972237],[25.601959,102.97213],[25.601971,102.971931],[25.602171,102.971863],[25.602819,102.971992],[25.60317,102.972214],[25.60331,102.972351],[25.603649,102.972473],[25.60388,102.972321],[25.60404,102.972183],[25.60442,102.972023],[25.60486,102.972092],[25.60602,102.972649],[25.60634,102.972748],[25.606899,102.97274],[25.60745,102.972878],[25.607981,102.972961],[25.608231,102.972862],[25.60829,102.972633],[25.608471,102.972298],[25.60874,102.972343],[25.608879,102.972397],[25.60988,102.972366],[25.610029,102.972321],[25.610189,102.972076],[25.61021,102.971901],[25.610331,102.971603],[25.61055,102.971573],[25.61134,102.971786],[25.61194,102.972267],[25.612289,102.972359],[25.613131,102.972153],[25.613319,102.972054],[25.61364,102.971764],[25.613831,102.971558],[25.614111,102.971474],[25.614429,102.97155],[25.615049,102.971512],[25.615311,102.971291],[25.6154,102.971161],[25.61553,102.971077],[25.615829,102.971008],[25.615959,102.970932],[25.616211,102.970627],[25.616461,102.970528],[25.616739,102.970497],[25.617399,102.969994],[25.61771,102.969803],[25.617941,102.969498],[25.61805,102.969223],[25.618219,102.969032],[25.61842,102.969048],[25.618561,102.969223],[25.618561,102.969383],[25.618481,102.970016],[25.618481,102.970551],[25.618549,102.971062],[25.618759,102.971489],[25.618971,102.971657],[25.619221,102.97171],[25.61978,102.971733],[25.62006,102.971626],[25.620211,102.971413],[25.62038,102.970863],[25.620449,102.970512],[25.620649,102.970238],[25.62126,102.969719],[25.62174,102.969093],[25.6222,102.968323],[25.622499,102.968132],[25.62294,102.96814],[25.6234,102.968117],[25.62351,102.968178],[25.623699,102.968407],[25.623911,102.96859],[25.625469,102.967621],[25.627781,102.966187],[25.627621,102.965813],[25.627621,102.965477],[25.627859,102.96505],[25.6283,102.964462],[25.628889,102.963753],[25.629,102.963387],[25.629089,102.962563],[25.62904,102.962257],[25.628839,102.961777],[25.62862,102.961403],[25.62833,102.961143],[25.62796,102.960907],[25.627819,102.960747],[25.62731,102.959862],[25.62722,102.959396],[25.62723,102.959007],[25.627291,102.958633],[25.627211,102.958298],[25.62694,102.95784],[25.62648,102.957329],[25.62628,102.956963],[25.62595,102.956596],[25.625601,102.956352],[25.62553,102.956039],[25.62541,102.955711],[25.62524,102.955406],[25.62499,102.955162],[25.62484,102.955063],[25.623581,102.954483],[25.62315,102.954224],[25.622629,102.953583],[25.62224,102.953362],[25.62196,102.953468],[25.62182,102.953552],[25.621469,102.953529],[25.620239,102.952423],[25.61982,102.951881],[25.61858,102.950859],[25.61842,102.95076],[25.618259,102.9505],[25.61829,102.950073],[25.61845,102.949753],[25.618719,102.949577],[25.61883,102.949387],[25.618811,102.949226],[25.618719,102.948967],[25.618641,102.948402],[25.618441,102.947952],[25.61828,102.94735],[25.618179,102.946892],[25.61812,102.94632],[25.617769,102.945633],[25.61768,102.945137],[25.61776,102.94471],[25.617649,102.944382],[25.617491,102.944077],[25.61746,102.943748],[25.617781,102.942963],[25.617809,102.942078],[25.61795,102.941742],[25.61797,102.941528],[25.617781,102.94117],[25.61776,102.940407],[25.617861,102.939972],[25.617901,102.939339],[25.6178,102.938782],[25.61771,102.938461],[25.61768,102.937958],[25.617781,102.937714],[25.617821,102.937241],[25.618,102.936813],[25.61805,102.936348],[25.618099,102.935249],[25.617941,102.934036],[25.61797,102.933632],[25.617861,102.932953],[25.617729,102.932457],[25.617479,102.932083],[25.617371,102.931808],[25.617081,102.931541],[25.616779,102.931427],[25.61676,102.931282],[25.61688,102.931107],[25.61673,102.930267],[25.616631,102.929993],[25.616199,102.929237],[25.615931,102.928963],[25.614639,102.928253],[25.61445,102.928078],[25.613991,102.927422],[25.613489,102.927032],[25.6127,102.92659],[25.61248,102.926521],[25.61199,102.926628],[25.61153,102.926666],[25.611259,102.926537],[25.61105,102.925926],[25.610781,102.925697],[25.610479,102.925613],[25.6103,102.925392],[25.610371,102.924728],[25.610371,102.924301],[25.61043,102.923973],[25.610491,102.923828],[25.610439,102.9235],[25.610201,102.923363],[25.609949,102.923264],[25.609461,102.923233],[25.60914,102.923157],[25.6084,102.922737],[25.60824,102.922859],[25.608191,102.923111],[25.608259,102.923241],[25.608219,102.923508],[25.60812,102.923492],[25.607941,102.923561],[25.607849,102.923927],[25.607771,102.924011],[25.60762,102.92395],[25.60759,102.923622],[25.607691,102.922592],[25.60787,102.922256],[25.60795,102.921982],[25.607821,102.921707],[25.607491,102.921211],[25.60722,102.921173],[25.607071,102.921188],[25.60692,102.921127],[25.60644,102.92083],[25.606291,102.920807],[25.606211,102.920982],[25.606159,102.921494],[25.606091,102.921577],[25.605961,102.921516],[25.60586,102.921082],[25.60568,102.92099],[25.605619,102.920792],[25.60569,102.920547],[25.60565,102.92009],[25.60545,102.919838],[25.604271,102.91967],[25.60396,102.91951],[25.60379,102.919617],[25.60364,102.919807],[25.603559,102.920151],[25.603359,102.920151],[25.602989,102.919861],[25.60272,102.919739],[25.602579,102.919456],[25.60223,102.919037],[25.60183,102.918709],[25.60136,102.918083],[25.601191,102.917763],[25.600969,102.917557],[25.60087,102.917397],[25.600599,102.917236],[25.6003,102.917297],[25.600161,102.917664],[25.600241,102.918022],[25.60009,102.918243],[25.599541,102.918098],[25.59934,102.918182],[25.599211,102.918518],[25.599051,102.918556],[25.5989,102.918793],[25.59885,102.918968],[25.59865,102.919121],[25.59852,102.918968],[25.598511,102.918709],[25.59864,102.918373],[25.59866,102.918228],[25.598579,102.918022],[25.598511,102.917908],[25.598511,102.917587],[25.598379,102.917328],[25.598351,102.917107],[25.59819,102.916779],[25.59796,102.916611],[25.59761,102.916496],[25.59729,102.916458],[25.596769,102.916283],[25.59659,102.916077],[25.59671,102.915573],[25.596649,102.914948],[25.596519,102.914742],[25.596359,102.914711],[25.59586,102.914703],[25.59573,102.914757],[25.5954,102.915154],[25.59506,102.91571],[25.59487,102.915878],[25.59474,102.915932],[25.594431,102.915878],[25.59407,102.915756],[25.593691,102.915382],[25.593519,102.914993],[25.592871,102.914192],[25.592609,102.913803],[25.59234,102.913513],[25.59211,102.912987],[25.59197,102.912491],[25.591669,102.911789],[25.59071,102.91037],[25.590469,102.91021],[25.590071,102.910103],[25.58975,102.90995],[25.58959,102.909912],[25.589211,102.909927],[25.58868,102.910004],[25.5884,102.909897],[25.588261,102.909798],[25.58798,102.909813],[25.58782,102.909859],[25.5875,102.909882],[25.58699,102.90976],[25.585819,102.909187],[25.585449,102.908943],[25.58544,102.908699],[25.5858,102.908569],[25.586081,102.908386],[25.586241,102.908234],[25.586269,102.908043],[25.58604,102.907837],[25.585581,102.90773],[25.584961,102.907799],[25.584629,102.907753],[25.58371,102.907288],[25.583099,102.906822],[25.58275,102.906807],[25.582661,102.906822],[25.58205,102.906647],[25.58185,102.90641],[25.58164,102.905609],[25.581699,102.905273],[25.58185,102.905029],[25.581779,102.904793],[25.58152,102.904533],[25.58119,102.904556],[25.58087,102.904472],[25.580669,102.904457],[25.5804,102.904388],[25.580099,102.904373],[25.580009,102.904198],[25.58032,102.903831],[25.58083,102.903282],[25.580879,102.903183],[25.580811,102.903053],[25.580469,102.902924],[25.57958,102.902191],[25.57937,102.901939],[25.57925,102.901649],[25.57921,102.901337],[25.5791,102.901031],[25.57893,102.901062],[25.578751,102.90136],[25.578501,102.901573],[25.578369,102.901543],[25.57807,102.90139],[25.57753,102.900818],[25.577379,102.900467],[25.577169,102.899788],[25.57715,102.899384],[25.5774,102.899071],[25.57745,102.898804],[25.577271,102.898483],[25.577089,102.898247],[25.57703,102.897957],[25.577141,102.897652],[25.577379,102.897438],[25.577539,102.897362],[25.577721,102.897148],[25.577629,102.897003],[25.57741,102.896973],[25.577209,102.897003],[25.576229,102.897469],[25.57593,102.897659],[25.5756,102.897598],[25.57543,102.897522],[25.57514,102.897453],[25.57485,102.897209],[25.57473,102.896812],[25.57469,102.896591],[25.57452,102.896301],[25.57415,102.896103],[25.573811,102.896027],[25.572241,102.896133],[25.572001,102.896263],[25.57193,102.896683],[25.57172,102.896973],[25.57151,102.897011],[25.57128,102.896873],[25.571131,102.896721],[25.57074,102.896187],[25.570379,102.89521],[25.57044,102.89476],[25.57066,102.894417],[25.57089,102.894234],[25.57114,102.894127],[25.57148,102.894119],[25.571859,102.893997],[25.572029,102.893837],[25.571951,102.893669],[25.571739,102.893547],[25.57148,102.893463],[25.57128,102.893227],[25.57128,102.89296],[25.5714,102.892723],[25.571951,102.892273],[25.57198,102.892021],[25.57176,102.891647],[25.57155,102.891586],[25.571421,102.891663],[25.571011,102.891693],[25.570869,102.891327],[25.57057,102.891052],[25.57011,102.890793],[25.569719,102.890694],[25.569361,102.89035],[25.568489,102.889229],[25.567909,102.887688],[25.56793,102.88752],[25.567909,102.886253],[25.567949,102.885918],[25.56806,102.885567],[25.568069,102.885399],[25.56794,102.885048],[25.56743,102.884483],[25.567261,102.884377],[25.567141,102.884232],[25.566931,102.883827],[25.56671,102.883163],[25.566589,102.882423],[25.56633,102.881477],[25.56632,102.881042],[25.56641,102.880409],[25.56662,102.880058],[25.56691,102.879951],[25.5672,102.879997],[25.567471,102.880219],[25.567591,102.88018],[25.56765,102.878922],[25.567579,102.878487],[25.56748,102.878326],[25.5672,102.87812],[25.56711,102.877892],[25.56727,102.877777],[25.567751,102.877922],[25.56814,102.878143],[25.56839,102.878052],[25.568529,102.877747],[25.56867,102.877533],[25.568661,102.877319],[25.56848,102.877167],[25.56822,102.876717],[25.567921,102.875954],[25.56743,102.875412],[25.567089,102.874863],[25.56694,102.874687],[25.566811,102.874443],[25.56683,102.873787],[25.566799,102.873581],[25.566589,102.873062],[25.566509,102.872383],[25.566549,102.872101],[25.56629,102.871712],[25.56604,102.871521],[25.565519,102.871399],[25.565491,102.871338],[25.56555,102.87114],[25.56568,102.871109],[25.566219,102.871094],[25.566681,102.871117],[25.566839,102.871063],[25.56694,102.870743],[25.567181,102.870689],[25.567419,102.870743],[25.56765,102.870598],[25.5679,102.870247],[25.56834,102.87001],[25.56852,102.869949],[25.56879,102.869957],[25.568951,102.869881],[25.568781,102.86982],[25.56852,102.869843],[25.568211,102.869904],[25.56769,102.870216],[25.56748,102.870209],[25.567341,102.870003],[25.567181,102.869881],[25.56711,102.869911],[25.566959,102.869873],[25.56674,102.869568],[25.566549,102.869568],[25.5662,102.869759],[25.565901,102.869751],[25.565769,102.869553],[25.565639,102.869141],[25.565439,102.868973],[25.565161,102.86927],[25.56481,102.869278],[25.564409,102.869057],[25.56431,102.868896],[25.564449,102.868843],[25.564699,102.869011],[25.56496,102.868927],[25.56514,102.868698],[25.565149,102.86824],[25.565331,102.867973],[25.56554,102.867981],[25.565651,102.868149],[25.56567,102.868233],[25.56596,102.868752],[25.566059,102.86882],[25.56624,102.868729],[25.56636,102.8685],[25.56641,102.868118],[25.566561,102.867844],[25.566719,102.867844],[25.56735,102.867981],[25.56756,102.868156],[25.567579,102.868401],[25.56781,102.868553],[25.568159,102.86853],[25.568399,102.868423],[25.56855,102.868217],[25.568529,102.867973],[25.568211,102.867592],[25.568029,102.867249],[25.56786,102.867027],[25.567881,102.866783],[25.568911,102.866707],[25.569241,102.866783],[25.570761,102.86763],[25.57093,102.867523],[25.570921,102.867348],[25.57099,102.867012],[25.571159,102.86647],[25.57136,102.866241],[25.57143,102.866257],[25.571569,102.866379],[25.57169,102.866524],[25.57197,102.866653],[25.572149,102.866577],[25.572069,102.866501],[25.57164,102.866364],[25.57136,102.866058],[25.571199,102.865608],[25.571171,102.864967],[25.57122,102.864708],[25.57115,102.864471],[25.570881,102.864357],[25.570511,102.864471],[25.57025,102.864342],[25.57019,102.864197],[25.569851,102.863907],[25.569229,102.86396],[25.568859,102.863937],[25.568781,102.863853],[25.56867,102.863609],[25.568251,102.863373],[25.56687,102.86322],[25.56637,102.86319],[25.566031,102.863022],[25.565651,102.862617],[25.56531,102.862083],[25.56517,102.861656],[25.56525,102.86129],[25.565519,102.860847],[25.565741,102.860687],[25.56608,102.860863],[25.56629,102.860771],[25.566311,102.860611],[25.566139,102.860527],[25.565479,102.860512],[25.565109,102.860558],[25.56468,102.860573],[25.564329,102.860741],[25.56365,102.861557],[25.563601,102.861717],[25.563629,102.861923],[25.563789,102.862122],[25.563881,102.862328],[25.563761,102.862427],[25.563601,102.862373],[25.56307,102.861832],[25.562429,102.861343],[25.561569,102.860893],[25.561119,102.860367],[25.560459,102.859528],[25.56015,102.859093],[25.56003,102.85833],[25.559959,102.857964],[25.559919,102.857437],[25.559719,102.856163],[25.55953,102.855972],[25.55942,102.855942],[25.55896,102.855942],[25.55772,102.856003],[25.55703,102.855904],[25.55681,102.855904],[25.55654,102.855782],[25.55633,102.855614],[25.55617,102.855263],[25.55599,102.855133],[25.555901,102.855164],[25.555651,102.855431],[25.555321,102.855392],[25.55456,102.85511],[25.554291,102.855057],[25.553921,102.855179],[25.553591,102.855324],[25.553341,102.855362],[25.55294,102.855301],[25.552679,102.855202],[25.55188,102.855217],[25.55147,102.855087],[25.550859,102.854698],[25.54953,102.853508],[25.54875,102.852898],[25.548559,102.852814],[25.54796,102.852661],[25.547449,102.852577],[25.546801,102.852379],[25.546551,102.852379],[25.54578,102.852631],[25.54534,102.85257],[25.544741,102.852402],[25.544359,102.852173],[25.543779,102.85141],[25.543341,102.850937],[25.542999,102.850693],[25.54266,102.850594],[25.54203,102.850563],[25.54142,102.850288],[25.54101,102.849953],[25.540751,102.849663],[25.540251,102.849312],[25.53968,102.849091],[25.539049,102.8489],[25.53875,102.848778],[25.53825,102.848732],[25.537319,102.848907],[25.53697,102.848846],[25.53651,102.848648],[25.53606,102.848587],[25.53561,102.848587],[25.53496,102.84845],[25.53355,102.848106],[25.53294,102.847832],[25.532459,102.847412],[25.53199,102.846916],[25.53117,102.846443],[25.53091,102.846397],[25.530769,102.846527],[25.530701,102.846657],[25.530491,102.846817],[25.52914,102.847054],[25.52866,102.846939],[25.528021,102.846474],[25.526331,102.84597],[25.525669,102.845963],[25.52438,102.845863],[25.5235,102.845863],[25.521919,102.845772],[25.521441,102.845711],[25.520981,102.845543],[25.520729,102.845329],[25.520269,102.84507],[25.519991,102.844971],[25.51977,102.84494],[25.51848,102.845047],[25.51799,102.845009],[25.517521,102.844788],[25.51539,102.843437],[25.515289,102.843292],[25.51527,102.84272],[25.51557,102.841843],[25.51557,102.841537],[25.5149,102.840942],[25.514481,102.840714],[25.514111,102.840759],[25.513929,102.840874],[25.513559,102.841217],[25.513269,102.841309],[25.513109,102.841232],[25.51281,102.841003],[25.512461,102.8405],[25.51214,102.840179],[25.51178,102.839981],[25.511009,102.840279],[25.50868,102.841408],[25.507601,102.841782],[25.5072,102.841812],[25.50643,102.841499],[25.505911,102.841209],[25.50576,102.84108],[25.50568,102.840912],[25.50565,102.840752],[25.505659,102.840363],[25.50563,102.840202],[25.505501,102.840057],[25.50535,102.839996],[25.504881,102.840202],[25.50456,102.840401],[25.50433,102.840698],[25.50415,102.841026],[25.504129,102.841652],[25.504061,102.84185],[25.50346,102.842682],[25.503401,102.84285],[25.50321,102.843002],[25.50305,102.84301],[25.502899,102.842857],[25.5028,102.842712],[25.50263,102.842163],[25.502251,102.841728],[25.50206,102.841614],[25.501881,102.84156],[25.50173,102.841629],[25.50161,102.841751],[25.501551,102.841911],[25.50153,102.842102],[25.501699,102.842911],[25.50173,102.843353],[25.5016,102.843964],[25.501631,102.844162],[25.501949,102.844704],[25.502001,102.844856],[25.50201,102.845062],[25.501961,102.845253],[25.501881,102.845398],[25.50091,102.845932],[25.500811,102.846062],[25.50058,102.846848],[25.50036,102.84716],[25.500231,102.84726],[25.50005,102.847298],[25.499531,102.847183],[25.498911,102.846977],[25.498529,102.846832],[25.498199,102.846657],[25.497431,102.846008],[25.49725,102.846008],[25.497061,102.846153],[25.496731,102.846649],[25.49658,102.846779],[25.496401,102.846878],[25.49621,102.846901],[25.49605,102.846802],[25.49593,102.846649],[25.495649,102.8461],[25.49518,102.845451],[25.495001,102.845131],[25.494949,102.844948],[25.494949,102.844711],[25.495131,102.844299],[25.495461,102.84388],[25.495529,102.843681],[25.49548,102.843483],[25.495279,102.843407],[25.49511,102.843452],[25.494909,102.843552],[25.494711,102.843559],[25.49456,102.843483],[25.494431,102.843353],[25.494129,102.842613],[25.493851,102.842361],[25.49333,102.842079],[25.492979,102.842056],[25.492781,102.842102],[25.491449,102.842697],[25.491261,102.842728],[25.49066,102.842682],[25.49048,102.842712],[25.490351,102.84285],[25.49028,102.843033],[25.49025,102.843262],[25.490259,102.843498],[25.49033,102.843758],[25.49045,102.843979],[25.49118,102.844856],[25.491461,102.845497],[25.491579,102.84568],[25.492001,102.846497],[25.492149,102.846931],[25.492149,102.847107],[25.49206,102.847298],[25.491211,102.848328],[25.491131,102.84848],[25.4911,102.848663],[25.49118,102.848877],[25.492599,102.849213],[25.492929,102.849411],[25.49305,102.849602],[25.493059,102.849762],[25.492979,102.849998],[25.49276,102.850098],[25.4921,102.850159],[25.49176,102.850311],[25.491449,102.850578],[25.491261,102.850861],[25.49118,102.851227],[25.491199,102.851608],[25.491501,102.853897],[25.491631,102.854309],[25.492001,102.854851],[25.492149,102.854958],[25.492611,102.855202],[25.493151,102.855362],[25.49333,102.855461],[25.49346,102.855598],[25.493629,102.855713],[25.49371,102.855827],[25.493759,102.856033],[25.49371,102.856232],[25.49328,102.857147],[25.493151,102.857277],[25.49301,102.857353],[25.492701,102.857353],[25.49131,102.857033],[25.49065,102.856781],[25.490499,102.856781],[25.49036,102.85688],[25.49025,102.857033],[25.49,102.857529],[25.489611,102.858009],[25.48958,102.8582],[25.489651,102.858528],[25.48966,102.858711],[25.48963,102.858963],[25.489429,102.859299],[25.489309,102.859428],[25.488501,102.860626],[25.48835,102.860809],[25.48811,102.861008],[25.4869,102.861458],[25.486309,102.861809],[25.48605,102.862099],[25.485649,102.8629],[25.485399,102.863228],[25.48378,102.864662],[25.48358,102.864731],[25.4834,102.864632],[25.48321,102.864349],[25.48316,102.864159],[25.48311,102.863579],[25.482929,102.863258],[25.482731,102.863152],[25.482559,102.863007],[25.482531,102.862801],[25.48255,102.862549],[25.482599,102.862381],[25.482599,102.862183],[25.48255,102.861961],[25.48246,102.861801],[25.48225,102.861702],[25.4821,102.861763],[25.481661,102.862099],[25.48148,102.862152],[25.48131,102.862099],[25.48101,102.8619],[25.48085,102.861847],[25.4807,102.861847],[25.479509,102.862251],[25.479111,102.862358],[25.478609,102.86235],[25.478559,102.862152],[25.47875,102.861504],[25.478649,102.860329],[25.4786,102.86013],[25.47851,102.859947],[25.478331,102.859802],[25.47753,102.859261],[25.47735,102.859261],[25.477261,102.859413],[25.477261,102.860153],[25.477501,102.860397],[25.477831,102.860603],[25.47805,102.860832],[25.47806,102.861],[25.478029,102.861183],[25.477949,102.861351],[25.47761,102.861801],[25.47753,102.861977],[25.47748,102.862228],[25.47735,102.86261],[25.47736,102.862808],[25.477409,102.862999],[25.47806,102.863533],[25.478251,102.863564],[25.47891,102.863503],[25.47913,102.863411],[25.47933,102.863403],[25.47953,102.863449],[25.47961,102.863663],[25.4795,102.864311],[25.479259,102.864883],[25.47893,102.865448],[25.478809,102.865578],[25.478661,102.865662],[25.47813,102.865753],[25.4769,102.865433],[25.476549,102.86541],[25.47576,102.865562],[25.47558,102.86573],[25.47566,102.865913],[25.4758,102.866051],[25.476049,102.866379],[25.47608,102.866547],[25.476049,102.866707],[25.47596,102.866882],[25.47571,102.867126],[25.4744,102.868561],[25.47431,102.868759],[25.474331,102.868927],[25.4744,102.86911],[25.47456,102.869263],[25.47488,102.869331],[25.47506,102.869476],[25.47513,102.869713],[25.475109,102.869904],[25.47493,102.870232],[25.47411,102.87101],[25.47381,102.871529],[25.47368,102.871658],[25.473551,102.871712],[25.473181,102.871696],[25.473,102.871727],[25.47283,102.871803],[25.472731,102.871948],[25.47266,102.87236],[25.472759,102.87291],[25.4729,102.8731],[25.47308,102.873131],[25.47341,102.873062],[25.473579,102.873062],[25.473749,102.873207],[25.473881,102.873734],[25.47385,102.874153],[25.47378,102.874352],[25.473499,102.874611],[25.4734,102.874748],[25.473249,102.875282],[25.473129,102.875481],[25.473,102.875557],[25.472799,102.875633],[25.47246,102.875664],[25.47233,102.875732],[25.472231,102.875908],[25.47226,102.876083],[25.472349,102.876228],[25.472509,102.876381],[25.47296,102.87661],[25.47303,102.876762],[25.473,102.876953],[25.47278,102.87735],[25.472811,102.877548],[25.47291,102.877747],[25.473249,102.878059],[25.47333,102.878258],[25.473351,102.878433],[25.473301,102.878609],[25.4732,102.878761],[25.47295,102.878998],[25.47263,102.879112],[25.472281,102.879128],[25.471979,102.879333],[25.471901,102.879501],[25.471861,102.879677],[25.471951,102.879913],[25.47208,102.880051],[25.472361,102.880257],[25.47258,102.8806],[25.472731,102.880707],[25.473961,102.881401],[25.47415,102.881332],[25.474279,102.881203],[25.47476,102.880508],[25.474899,102.880402],[25.4751,102.880333],[25.475281,102.880432],[25.475349,102.880653],[25.47525,102.881012],[25.474911,102.881432],[25.47423,102.881828],[25.473909,102.882057],[25.473749,102.882133],[25.47356,102.882149],[25.47341,102.882103],[25.471951,102.881058],[25.47163,102.880852],[25.47106,102.880859],[25.470329,102.881081],[25.470011,102.881081],[25.46986,102.881012],[25.469761,102.880852],[25.469761,102.880661],[25.469931,102.88031],[25.47015,102.879349],[25.47028,102.879181],[25.470631,102.879051],[25.470831,102.878906],[25.47093,102.8787],[25.470949,102.878532],[25.470751,102.877808],[25.470659,102.877632],[25.47053,102.87751],[25.469311,102.876862],[25.46911,102.876801],[25.46891,102.876778],[25.46871,102.876831],[25.468081,102.877312],[25.467911,102.877861],[25.46788,102.878082],[25.467779,102.87825],[25.466949,102.879158],[25.466749,102.879227],[25.466579,102.87925],[25.46641,102.879211],[25.466129,102.87896],[25.46583,102.878448],[25.4657,102.878326],[25.465549,102.878258],[25.465401,102.87825],[25.46493,102.878311],[25.46476,102.87825],[25.464649,102.878113],[25.4646,102.87793],[25.4646,102.877731],[25.464531,102.87735],[25.464411,102.877251],[25.46426,102.877182],[25.46298,102.877258],[25.462259,102.876953],[25.461411,102.876801],[25.46125,102.87661],[25.461229,102.87645],[25.461309,102.876297],[25.46216,102.875549],[25.462311,102.875381],[25.462811,102.874962],[25.46335,102.874832],[25.463511,102.874763],[25.463631,102.874657],[25.46373,102.874512],[25.46385,102.87413],[25.46406,102.873802],[25.464211,102.873779],[25.46493,102.873901],[25.465111,102.873863],[25.465231,102.873749],[25.4653,102.87355],[25.46533,102.873352],[25.4652,102.873161],[25.464729,102.873001],[25.464581,102.87291],[25.46446,102.87278],[25.46406,102.872147],[25.463909,102.872002],[25.46356,102.87178],[25.462851,102.871513],[25.4627,102.871407],[25.46258,102.871277],[25.462379,102.870979],[25.461849,102.870407],[25.46151,102.870262],[25.4608,102.870033],[25.460461,102.869881],[25.460329,102.869759],[25.45993,102.869049],[25.45923,102.868309],[25.4587,102.868134],[25.45853,102.868027],[25.458401,102.867897],[25.45816,102.867561],[25.45788,102.866852],[25.457781,102.866699],[25.4575,102.866402],[25.457411,102.866226],[25.457399,102.866051],[25.457451,102.865463],[25.45743,102.864883],[25.457199,102.864357],[25.4571,102.863602],[25.45698,102.863449],[25.45653,102.863258],[25.456181,102.863258],[25.45583,102.863129],[25.455709,102.862984],[25.455629,102.862801],[25.45566,102.86261],[25.455851,102.862129],[25.455851,102.861954],[25.455759,102.861763],[25.455231,102.86145],[25.454981,102.861061],[25.454651,102.86071],[25.454359,102.860558],[25.45381,102.86013],[25.453501,102.859932],[25.452881,102.859734],[25.45211,102.859901],[25.45195,102.859978],[25.45178,102.860107],[25.45166,102.86026],[25.45155,102.860611],[25.4515,102.861214],[25.45145,102.861382],[25.451361,102.861526],[25.451031,102.861748],[25.450661,102.861877],[25.44981,102.862411],[25.44965,102.862556],[25.44873,102.863228],[25.447849,102.863831],[25.44751,102.863998],[25.44698,102.864159],[25.44636,102.864182],[25.44566,102.864281],[25.445311,102.86425],[25.44516,102.864159],[25.44491,102.863899],[25.44475,102.863808],[25.444401,102.863762],[25.44418,102.863808],[25.44401,102.863899],[25.44385,102.864029],[25.44346,102.864449],[25.44326,102.864563],[25.44306,102.864609],[25.44265,102.864632],[25.44243,102.864609],[25.44228,102.864563],[25.441481,102.864502],[25.441059,102.864502],[25.440861,102.864548],[25.440359,102.864807],[25.440201,102.864799],[25.440029,102.864708],[25.439581,102.864227],[25.43918,102.863983],[25.438959,102.86393],[25.438749,102.863953],[25.43853,102.864014],[25.43811,102.864197],[25.437929,102.86425],[25.4377,102.864258],[25.43751,102.864357],[25.437229,102.864754],[25.436661,102.866081],[25.43648,102.86618],[25.4363,102.86618],[25.436131,102.866081],[25.436029,102.865898],[25.435961,102.865677],[25.43586,102.865013],[25.435961,102.864311],[25.435949,102.863708],[25.436001,102.86351],[25.436279,102.862808],[25.436279,102.862633],[25.43618,102.862511],[25.436029,102.862427],[25.435881,102.862396],[25.43536,102.862381],[25.43516,102.862297],[25.435011,102.86216],[25.43471,102.861603],[25.434561,102.861427],[25.433929,102.861099],[25.43343,102.860611],[25.43306,102.860382],[25.43128,102.859863],[25.430349,102.859657],[25.43,102.85968],[25.429359,102.859863],[25.42898,102.859833],[25.4284,102.859848],[25.428209,102.859909],[25.42803,102.860031],[25.427879,102.860184],[25.427759,102.860359],[25.427731,102.86058],[25.427759,102.860802],[25.42828,102.862396],[25.42823,102.862579],[25.428101,102.862701],[25.42786,102.862709],[25.42775,102.862633],[25.427629,102.86248],[25.427481,102.862106],[25.427361,102.861931],[25.427151,102.861351],[25.427059,102.861183],[25.426809,102.860878],[25.426611,102.860558],[25.426359,102.860352],[25.4258,102.859497],[25.42568,102.859001],[25.425659,102.858482],[25.4256,102.858261],[25.425501,102.858101],[25.42535,102.857964],[25.42518,102.857857],[25.424311,102.857552],[25.42363,102.85733],[25.423401,102.8573],[25.423161,102.857307],[25.422029,102.857483],[25.42161,102.857384],[25.42083,102.857002],[25.420059,102.856499],[25.419701,102.856201],[25.4195,102.856079],[25.419081,102.855957],[25.41791,102.855911],[25.41675,102.855782],[25.416531,102.855698],[25.416349,102.855583],[25.41605,102.855278],[25.41556,102.854599],[25.41531,102.853363],[25.41511,102.852951],[25.414961,102.852783],[25.414631,102.852531],[25.413759,102.85218],[25.413309,102.851929],[25.41258,102.851334],[25.412251,102.850998],[25.411699,102.850212],[25.41028,102.848152],[25.409849,102.847504],[25.409679,102.847298],[25.409401,102.846863],[25.4091,102.846481],[25.408279,102.84568],[25.40801,102.845253],[25.407801,102.84481],[25.40765,102.84465],[25.40731,102.844383],[25.4069,102.844254],[25.406731,102.844162],[25.406561,102.844002],[25.40645,102.843811],[25.406099,102.842812],[25.40543,102.841782],[25.40526,102.841614],[25.4046,102.84108],[25.4042,102.841011],[25.404011,102.841026],[25.403851,102.840958],[25.403749,102.840828],[25.4037,102.84063],[25.403629,102.839958],[25.403549,102.839752],[25.403231,102.839432],[25.403049,102.839333],[25.402849,102.839302],[25.402651,102.83931],[25.40205,102.8395],[25.401831,102.839478],[25.401649,102.839378],[25.401461,102.839211],[25.40118,102.838852],[25.400949,102.838432],[25.400551,102.83786],[25.40011,102.83741],[25.399799,102.837196],[25.399509,102.837151],[25.399111,102.837181],[25.39893,102.83725],[25.3983,102.83741],[25.3981,102.83741],[25.397079,102.837151],[25.39666,102.837158],[25.396259,102.83725],[25.395309,102.837646],[25.394609,102.838028],[25.394279,102.838058],[25.39415,102.838013],[25.39385,102.837807],[25.39315,102.837379],[25.39286,102.837112],[25.392679,102.836731],[25.39233,102.836159],[25.392151,102.835747],[25.39205,102.835327],[25.391781,102.834534],[25.3915,102.83416],[25.388599,102.83271],[25.38818,102.832428],[25.387711,102.831909],[25.38728,102.830551],[25.38706,102.830101],[25.386909,102.829613],[25.386909,102.829399],[25.38703,102.828911],[25.38703,102.828697],[25.38698,102.828499],[25.38686,102.828346],[25.386101,102.827682],[25.3855,102.826782],[25.38496,102.825996],[25.38435,102.824959],[25.384211,102.824753],[25.38353,102.823349],[25.38341,102.823128],[25.38328,102.823029],[25.38295,102.822678],[25.382799,102.822433],[25.38241,102.821632],[25.38208,102.821159],[25.38188,102.820961],[25.381451,102.82061],[25.3806,102.82],[25.380381,102.819878],[25.37966,102.819252],[25.37941,102.81913],[25.378929,102.819061],[25.37793,102.81913],[25.37746,102.81926],[25.3766,102.81971],[25.375759,102.820084],[25.375549,102.820213],[25.375311,102.820297],[25.37466,102.820213],[25.373779,102.819809],[25.373329,102.819809],[25.371929,102.820152],[25.371679,102.820259],[25.37105,102.820633],[25.370449,102.82106],[25.369749,102.8218],[25.368879,102.822632],[25.368311,102.82296],[25.368111,102.823013],[25.36688,102.823463],[25.36648,102.823509],[25.365629,102.823448],[25.365499,102.823311],[25.365379,102.823112],[25.365179,102.822479],[25.36491,102.8218],[25.36458,102.820801],[25.36446,102.820549],[25.36393,102.819061],[25.3638,102.818878],[25.363649,102.818581],[25.36335,102.817749],[25.36265,102.816528],[25.36178,102.814552],[25.361549,102.813408],[25.36161,102.81295],[25.361879,102.811958],[25.36203,102.811501],[25.362061,102.811028],[25.3619,102.809761],[25.3619,102.809196],[25.36198,102.808327],[25.362181,102.805733],[25.36215,102.805511],[25.36198,102.805099],[25.36161,102.804459],[25.36153,102.804001],[25.361549,102.803726],[25.361429,102.803261],[25.3612,102.802811],[25.36083,102.801811],[25.36063,102.800056],[25.360531,102.79985],[25.36006,102.799309],[25.35881,102.798058],[25.35746,102.795761],[25.357,102.795113],[25.356331,102.79451],[25.35531,102.793701],[25.35508,102.793411],[25.355009,102.793198],[25.355009,102.792198],[25.35533,102.790901],[25.35535,102.790398],[25.355129,102.78878],[25.355181,102.786247],[25.35511,102.785751],[25.3549,102.785332],[25.354759,102.785133],[25.354259,102.78418],[25.35335,102.782707],[25.353201,102.782562],[25.35285,102.782303],[25.352551,102.781883],[25.352051,102.781357],[25.35166,102.781197],[25.35148,102.781181],[25.35108,102.78125],[25.350901,102.781258],[25.3507,102.781197],[25.35051,102.781097],[25.350361,102.78093],[25.3501,102.780533],[25.349751,102.780312],[25.349609,102.780159],[25.349449,102.779877],[25.3491,102.779411],[25.348579,102.779114],[25.34816,102.77903],[25.347561,102.779129],[25.34738,102.779251],[25.347231,102.779411],[25.347,102.779846],[25.346861,102.780006],[25.34668,102.780128],[25.345711,102.78035],[25.344999,102.780563],[25.3444,102.780884],[25.343981,102.781029],[25.3438,102.781128],[25.343451,102.781433],[25.342911,102.782227],[25.342751,102.782303],[25.34256,102.782303],[25.342381,102.782249],[25.341379,102.781799],[25.340401,102.780952],[25.339411,102.779709],[25.33926,102.779549],[25.339149,102.779358],[25.3389,102.779053],[25.338699,102.7789],[25.338511,102.778847],[25.33835,102.778862],[25.33798,102.77906],[25.337681,102.779182],[25.33713,102.779282],[25.33671,102.779228],[25.335751,102.778976],[25.334999,102.778748],[25.33411,102.778229],[25.33375,102.778152],[25.3332,102.778198],[25.332109,102.778458],[25.33078,102.77903],[25.329651,102.779747],[25.329109,102.780182],[25.328581,102.78038],[25.328159,102.780403],[25.32778,102.780296],[25.327459,102.780029],[25.327101,102.779297],[25.3269,102.778999],[25.326759,102.778877],[25.32641,102.778709],[25.32626,102.778709],[25.32546,102.778847],[25.32505,102.778862],[25.32481,102.778809],[25.324249,102.778603],[25.32403,102.77858],[25.32296,102.778801],[25.32276,102.778801],[25.32201,102.778458],[25.320801,102.778099],[25.3204,102.777901],[25.31953,102.777107],[25.31885,102.7761],[25.318029,102.775299],[25.3179,102.775131],[25.317801,102.774902],[25.317751,102.774658],[25.317711,102.774178],[25.317579,102.773697],[25.31743,102.773514],[25.317101,102.773201],[25.31636,102.772697],[25.31525,102.771652],[25.314301,102.770958],[25.313709,102.770607],[25.313061,102.770683],[25.312851,102.77066],[25.311979,102.770409],[25.311359,102.770302],[25.30946,102.769798],[25.30933,102.769707],[25.30883,102.769157],[25.30838,102.768501],[25.308109,102.767357],[25.308149,102.765984],[25.30813,102.76503],[25.307949,102.764412],[25.307699,102.764076],[25.30756,102.763977],[25.306709,102.762749],[25.3062,102.762283],[25.305599,102.761902],[25.30525,102.761581],[25.305149,102.761383],[25.30501,102.76091],[25.30493,102.760429],[25.3048,102.760231],[25.304609,102.760078],[25.303801,102.759712],[25.3027,102.759331],[25.30253,102.759209],[25.30241,102.759048],[25.30233,102.758827],[25.30221,102.758148],[25.3022,102.757431],[25.30213,102.75721],[25.301979,102.757057],[25.301611,102.756882],[25.301479,102.756729],[25.301081,102.755898],[25.300461,102.754181],[25.3002,102.753799],[25.300011,102.753632],[25.299101,102.752998],[25.298161,102.752251],[25.297831,102.75193],[25.29756,102.751534],[25.296909,102.750809],[25.29673,102.750702],[25.29631,102.750633],[25.295959,102.750458],[25.295811,102.750313],[25.295549,102.749947],[25.29483,102.749382],[25.29401,102.749008],[25.293579,102.748901],[25.29213,102.748711],[25.2918,102.748528],[25.289631,102.747597],[25.288031,102.7472],[25.286249,102.746384],[25.285561,102.746201],[25.28441,102.745758],[25.28348,102.745483],[25.282261,102.745361],[25.282009,102.7453],[25.281601,102.745148],[25.28043,102.744957],[25.279409,102.745033],[25.27891,102.744911],[25.27791,102.744728],[25.2775,102.744583],[25.277309,102.744453],[25.276699,102.743713],[25.276501,102.743584],[25.276331,102.74353],[25.27615,102.743553],[25.27533,102.743752],[25.27416,102.74411],[25.27375,102.744377],[25.27355,102.744476],[25.273331,102.74453],[25.272881,102.744461],[25.27243,102.744431],[25.27141,102.744263],[25.27063,102.744202],[25.26993,102.7444],[25.26943,102.744408],[25.268709,102.744331],[25.26803,102.744263],[25.26738,102.744247],[25.267179,102.744308],[25.26638,102.744659],[25.266159,102.744682],[25.26573,102.744553],[25.2649,102.74408],[25.264681,102.744034],[25.2642,102.74398],[25.263729,102.743797],[25.26333,102.74353],[25.262911,102.742996],[25.26273,102.742607],[25.26263,102.742012],[25.26255,102.741852],[25.26235,102.74176],[25.26218,102.741882],[25.261999,102.74221],[25.261829,102.74231],[25.2614,102.742279],[25.261181,102.742302],[25.260981,102.742363],[25.260799,102.742477],[25.260611,102.742554],[25.26041,102.742531],[25.260031,102.742348],[25.25985,102.742203],[25.25935,102.741982],[25.25881,102.741859],[25.25831,102.741814],[25.25808,102.74173],[25.257111,102.741249],[25.25668,102.740982],[25.256451,102.740898],[25.256201,102.740883],[25.25573,102.740952],[25.25548,102.740959],[25.254749,102.741096],[25.254511,102.741096],[25.253901,102.740807],[25.25366,102.740761],[25.252911,102.740898],[25.252159,102.740959],[25.25168,102.740883],[25.251129,102.740631],[25.250759,102.740601],[25.250111,102.740707],[25.2498,102.740646],[25.249359,102.740402],[25.249201,102.740356],[25.24901,102.740356],[25.24855,102.740601],[25.24818,102.740631],[25.24753,102.740608],[25.24736,102.740646],[25.247129,102.740578],[25.246811,102.740402],[25.24625,102.739906],[25.24605,102.739777],[25.245609,102.739662],[25.24523,102.739449],[25.245001,102.739197],[25.244551,102.7388],[25.24441,102.738731],[25.2442,102.738747],[25.243811,102.738899],[25.24361,102.738876],[25.2435,102.738777],[25.243299,102.73851],[25.24305,102.738281],[25.24271,102.738129],[25.24238,102.73806],[25.241579,102.738113],[25.241211,102.738159],[25.24103,102.738129],[25.2409,102.738029],[25.24078,102.737862],[25.24066,102.737747],[25.240179,102.737511],[25.240009,102.73748],[25.239229,102.73745],[25.238729,102.737282],[25.23835,102.737251],[25.237881,102.737297],[25.237221,102.737343],[25.235609,102.736977],[25.234329,102.736778],[25.2339,102.736633],[25.233561,102.73645],[25.23329,102.736298],[25.23288,102.736214],[25.23233,102.73616],[25.230209,102.736107],[25.229759,102.736511],[25.229549,102.736862],[25.22921,102.737083],[25.22872,102.737267],[25.228609,102.737549],[25.2286,102.737953],[25.228479,102.738281],[25.2283,102.738564],[25.2281,102.738861],[25.228081,102.739014],[25.22818,102.739159],[25.228359,102.739212],[25.22863,102.739128],[25.229,102.738701],[25.229481,102.738197],[25.229851,102.738068],[25.230709,102.738083],[25.231279,102.738281],[25.231649,102.738281],[25.231859,102.738297],[25.2321,102.738564],[25.23221,102.738762],[25.23258,102.738907],[25.232929,102.738853],[25.233179,102.739014],[25.23344,102.739212],[25.233629,102.739616],[25.23385,102.739777],[25.23403,102.73983],[25.23436,102.739761],[25.234619,102.739822],[25.235109,102.740349],[25.23571,102.740593],[25.23596,102.740913],[25.235979,102.74115],[25.235941,102.74144],[25.23563,102.741623],[25.235201,102.741631],[25.23461,102.741753],[25.234079,102.742081],[25.233801,102.742172],[25.233379,102.742126],[25.23267,102.742027],[25.2323,102.742172],[25.232019,102.742378],[25.23185,102.742706],[25.231701,102.74308],[25.231529,102.743401],[25.231359,102.743507],[25.2311,102.743477],[25.230749,102.74321],[25.230709,102.742867],[25.230579,102.742317],[25.230129,102.742027],[25.229601,102.741783],[25.22872,102.741814],[25.227989,102.741661],[25.227409,102.741661],[25.22665,102.741447],[25.226259,102.741127],[25.225981,102.74073],[25.225731,102.740448],[25.225559,102.740402],[25.22541,102.74041],[25.22529,102.740593],[25.225189,102.74073],[25.224751,102.741013],[25.22418,102.741211],[25.223949,102.741653],[25.22373,102.741837],[25.22183,102.742447],[25.219999,102.742653],[25.21899,102.742851],[25.21788,102.742699],[25.2171,102.742561],[25.215811,102.742683],[25.214781,102.742683],[25.21406,102.742882],[25.21328,102.742981],[25.21253,102.742828],[25.212231,102.743088],[25.211861,102.743858],[25.21159,102.744217],[25.211161,102.744347],[25.211029,102.744209],[25.210899,102.743446],[25.210871,102.742729],[25.21055,102.742264],[25.21018,102.74202],[25.20965,102.741982],[25.20941,102.742279],[25.209459,102.742699],[25.209351,102.742912],[25.20911,102.742943],[25.207479,102.742851],[25.205999,102.742462],[25.20532,102.742371],[25.204309,102.741959],[25.20381,102.741859],[25.203341,102.741959],[25.202749,102.741966],[25.20096,102.741631],[25.19952,102.741211],[25.19906,102.74118],[25.19445,102.741096],[25.192699,102.740768],[25.192181,102.7407],[25.191839,102.740784],[25.19108,102.741158],[25.19055,102.741158],[25.189501,102.741226],[25.18906,102.741074],[25.18828,102.740822],[25.187519,102.740784],[25.186279,102.740784],[25.185511,102.740677],[25.18507,102.740356],[25.184259,102.739868],[25.182449,102.73896],[25.180901,102.738281],[25.17981,102.737999],[25.17901,102.737846],[25.178101,102.737534],[25.177349,102.737221],[25.17658,102.736443],[25.176279,102.736061],[25.17568,102.73568],[25.17518,102.735573],[25.174761,102.735382],[25.17448,102.73513],[25.174141,102.734596],[25.174101,102.734512],[25.174061,102.734062],[25.17408,102.733528],[25.17395,102.733047],[25.173759,102.732803],[25.173281,102.732712],[25.171709,102.733147],[25.17136,102.733078],[25.170719,102.732887],[25.17041,102.73288],[25.17008,102.733032],[25.16971,102.733414],[25.169359,102.733856],[25.169081,102.734032],[25.16876,102.734001],[25.167959,102.733429],[25.166889,102.73288],[25.16662,102.732826],[25.166071,102.732826],[25.165831,102.73275],[25.16568,102.73243],[25.165621,102.732117],[25.165449,102.731796],[25.165211,102.731827],[25.16507,102.732018],[25.16501,102.732109],[25.16511,102.732559],[25.1654,102.733002],[25.16581,102.733147],[25.16637,102.733238],[25.1667,102.733253],[25.166901,102.733482],[25.16687,102.73362],[25.16671,102.733849],[25.166439,102.733757],[25.165951,102.73349],[25.165461,102.733429],[25.165001,102.733307],[25.16473,102.733078],[25.164579,102.73278],[25.164591,102.732483],[25.164579,102.732147],[25.164551,102.731758],[25.16436,102.731583],[25.16415,102.731651],[25.16408,102.731979],[25.1642,102.732529],[25.16419,102.732811],[25.164301,102.733307],[25.16448,102.733551],[25.164829,102.733658],[25.16518,102.733711],[25.165421,102.733833],[25.16543,102.734154],[25.1653,102.734283],[25.165001,102.734253],[25.16433,102.73391],[25.16366,102.733597],[25.1635,102.73317],[25.16338,102.732651],[25.163231,102.732201],[25.16297,102.731949],[25.162689,102.73188],[25.162411,102.732079],[25.16213,102.73278],[25.16194,102.733513],[25.161711,102.733711],[25.160521,102.734306],[25.1602,102.734238],[25.15971,102.733849],[25.15906,102.733299],[25.158609,102.73307],[25.158409,102.733078],[25.158159,102.732979],[25.157909,102.732857],[25.157761,102.732536],[25.157579,102.732353],[25.157471,102.732361],[25.157301,102.732452],[25.15723,102.732613],[25.1572,102.732948],[25.15723,102.733299],[25.157459,102.733528],[25.15806,102.733688],[25.15843,102.733833],[25.158751,102.734261],[25.15893,102.734871],[25.15921,102.735603],[25.15962,102.735992],[25.160009,102.736122],[25.160339,102.736259],[25.1609,102.736732],[25.161659,102.737053],[25.16231,102.737183],[25.162661,102.73716],[25.162769,102.737213],[25.162979,102.73735],[25.163139,102.73777],[25.1632,102.737846],[25.1633,102.738113],[25.16328,102.73838],[25.163059,102.738678],[25.162661,102.739052],[25.16227,102.739311],[25.161751,102.739433],[25.16147,102.739403],[25.16116,102.739403],[25.161051,102.739372],[25.160629,102.73925],[25.160061,102.739029],[25.15967,102.738876],[25.15741,102.738419],[25.156481,102.738129],[25.15554,102.737587],[25.153151,102.736588],[25.150579,102.735527],[25.149429,102.735031],[25.148701,102.734787],[25.14473,102.733528],[25.143021,102.73275],[25.141371,102.732208],[25.136999,102.730568],[25.130501,102.728256],[25.12912,102.727676],[25.12747,102.726837],[25.12598,102.725861],[25.12476,102.72522],[25.123051,102.724701],[25.121719,102.72422],[25.119909,102.72393],[25.118311,102.723679],[25.117149,102.723381],[25.11606,102.723129],[25.11553,102.723099],[25.115311,102.723259],[25.11496,102.724297],[25.114599,102.725632],[25.114111,102.72641],[25.11356,102.727448],[25.1129,102.728729],[25.108379,102.726807],[25.10449,102.725151],[25.101049,102.723686],[25.10005,102.72654],[25.09898,102.729637],[25.09713,102.73497],[25.096161,102.737579],[25.09581,102.737534],[25.09334,102.736557],[25.09148,102.735909],[25.09123,102.735817],[25.0889,102.73497],[25.08815,102.734673],[25.087391,102.734383],[25.085621,102.732613],[25.0839,102.730911],[25.081699,102.733963],[25.08021,102.736153],[25.07494,102.743919],[25.074869,102.744019],[25.071899,102.74762],[25.07069,102.749336],[25.07015,102.751411],[25.067841,102.750389],[25.066681,102.749413],[25.065109,102.747681],[25.063669,102.746552],[25.06233,102.745644],[25.060631,102.744438],[25.060289,102.744202],[25.057619,102.742691],[25.057409,102.742462],[25.05604,102.742752],[25.051701,102.742897],[25.049891,102.742989],[25.04567,102.743103],[25.04431,102.743134],[25.0413,102.743263],[25.03709,102.743469],[25.035601,102.743599],[25.033911,102.743767],[25.03154,102.74382],[25.030161,102.74353],[25.02953,102.743271],[25.02825,102.742767],[25.026091,102.741898],[25.025089,102.741814],[25.0238,102.74205],[25.0231,102.742233],[25.022341,102.742371],[25.02179,102.742477],[25.021219,102.742592],[25.01985,102.742943],[25.01964,102.743042],[25.019501,102.743187],[25.019449,102.743347],[25.01948,102.743477],[25.01955,102.74366],[25.0198,102.74395],[25.01992,102.744102],[25.02,102.744362],[25.020029,102.744621],[25.01989,102.745796],[25.01976,102.746368],[25.01919,102.749313],[25.01759,102.755577],[25.017191,102.756592],[25.01643,102.757927],[25.01516,102.759399],[25.01408,102.760368],[25.00745,102.764168],[25.005659,102.76519],[25.004789,102.765747],[25.004169,102.766327],[25.00341,102.767403],[25.00296,102.768417],[25.00198,102.770973],[25.00152,102.771751],[25.0009,102.772476],[24.9932,102.778389],[24.992041,102.779327],[24.99118,102.779999],[24.990601,102.780243],[24.98991,102.780342],[24.98925,102.780243],[24.98415,102.778168],[24.982491,102.777603],[24.98114,102.777588],[24.978029,102.777863],[24.973841,102.778633],[24.973101,102.778778],[24.972031,102.779068],[24.971201,102.779381],[24.96909,102.780296],[24.967541,102.781143],[24.966209,102.781967],[24.957451,102.787659],[24.956369,102.788292],[24.955509,102.788712],[24.95487,102.788963],[24.95372,102.78936],[24.951731,102.789703],[24.95056,102.78978],[24.93424,102.789619],[24.926109,102.788887],[24.924629,102.788948],[24.923161,102.789169],[24.92104,102.789757],[24.919081,102.79068],[24.917391,102.791763],[24.904909,102.800919],[24.90271,102.802032],[24.900499,102.802696],[24.898359,102.802963],[24.89703,102.80323],[24.895639,102.803741],[24.894461,102.804321],[24.89431,102.804398],[24.89344,102.804947],[24.89315,102.805153],[24.891251,102.806808],[24.88316,102.814201],[24.880819,102.815666],[24.878929,102.816467],[24.876221,102.817123],[24.874001,102.817291],[24.84852,102.817581],[24.84655,102.81736],[24.84318,102.816437],[24.839991,102.814957],[24.830021,102.808449],[24.828449,102.807693],[24.82411,102.806129],[24.822969,102.805481],[24.819901,102.802963],[24.817209,102.801666],[24.81572,102.801048],[24.814489,102.800247],[24.81016,102.795677],[24.8069,102.793289],[24.8011,102.787453],[24.800039,102.78669],[24.79859,102.785896],[24.79657,102.785118],[24.795799,102.784828],[24.785509,102.780983],[24.784889,102.780609],[24.784161,102.780037],[24.783541,102.779297],[24.78186,102.776398],[24.779381,102.77179],[24.77845,102.770477],[24.77702,102.76889],[24.776011,102.768021],[24.77453,102.766991],[24.77227,102.765877],[24.770599,102.765327],[24.76366,102.764069],[24.734501,102.754677],[24.732719,102.753777],[24.73086,102.752457],[24.72957,102.751198],[24.709591,102.725899],[24.69681,102.713463],[24.696119,102.712807],[24.694839,102.710548],[24.69313,102.706947],[24.69272,102.706306],[24.69241,102.705963],[24.691811,102.705513],[24.69121,102.70517],[24.68935,102.704407],[24.688761,102.704002],[24.68825,102.703491],[24.68782,102.702888],[24.68749,102.70192],[24.685551,102.695763],[24.678829,102.681763],[24.67807,102.680649],[24.67717,102.67971],[24.67095,102.675392],[24.670059,102.674568],[24.669491,102.67379],[24.668909,102.672684],[24.668631,102.671654],[24.664829,102.653343],[24.66445,102.65229],[24.66386,102.651253],[24.66073,102.647186],[24.65988,102.646393],[24.6506,102.638947],[24.643311,102.630211],[24.64097,102.628479],[24.627899,102.623543],[24.627211,102.623138],[24.626381,102.622452],[24.62466,102.620277],[24.623949,102.619698],[24.617371,102.616913],[24.61204,102.614761],[24.605829,102.610237],[24.601089,102.607674],[24.599501,102.606468],[24.597919,102.604881],[24.58987,102.595268],[24.579691,102.585068],[24.57741,102.583359],[24.57579,102.58242],[24.56934,102.579987],[24.55953,102.577469],[24.555241,102.575607],[24.554131,102.57534],[24.549549,102.575256],[24.54882,102.575157],[24.54788,102.574913],[24.542219,102.572319],[24.541121,102.571609],[24.54015,102.570663],[24.53915,102.569366],[24.53838,102.568626],[24.537069,102.567719],[24.53651,102.567162],[24.536051,102.566528],[24.53557,102.565552],[24.535021,102.56356],[24.5345,102.56234],[24.53392,102.56147],[24.533079,102.560638],[24.53204,102.55999],[24.53105,102.559647],[24.52458,102.558792],[24.523661,102.558517],[24.522989,102.558189],[24.52256,102.557877],[24.519461,102.555054],[24.51862,102.554459],[24.517719,102.554039],[24.516569,102.553757],[24.515289,102.553772],[24.514521,102.55397],[24.50947,102.556023],[24.50729,102.556717],[24.50609,102.557312],[24.500919,102.560722],[24.5002,102.561043],[24.494989,102.561996],[24.493891,102.562347],[24.49102,102.563553],[24.489889,102.563797],[24.488701,102.563843],[24.487949,102.563721],[24.487209,102.563522],[24.485359,102.562782],[24.484381,102.562553],[24.481859,102.562187],[24.481131,102.561974],[24.48068,102.561729],[24.47967,102.560867],[24.47547,102.556763],[24.471451,102.554123],[24.470181,102.55291],[24.468599,102.550987],[24.467661,102.550163],[24.466789,102.549622],[24.466089,102.549316],[24.46512,102.549049],[24.41419,102.541649],[24.40333,102.539558],[24.399929,102.53891],[24.398029,102.538544],[24.391729,102.537331],[24.390289,102.537117],[24.37652,102.535439],[24.37458,102.534958],[24.370319,102.533524],[24.359261,102.530693],[24.3577,102.530441],[24.35693,102.530312],[24.355539,102.53009],[24.353239,102.529762],[24.350981,102.529442],[24.349449,102.529114],[24.34881,102.528976],[24.33872,102.52536],[24.335779,102.523987],[24.331289,102.521278],[24.328819,102.519768],[24.32793,102.519234],[24.324511,102.517273],[24.32218,102.516609],[24.317949,102.515617],[24.316759,102.515068],[24.31604,102.514557],[24.315069,102.513573],[24.3137,102.511871],[24.312799,102.511147],[24.31176,102.510597],[24.30479,102.508911],[24.3043,102.508743],[24.30143,102.507187],[24.291599,102.50116],[24.290791,102.500458],[24.29007,102.499619],[24.28937,102.498367],[24.288759,102.497108],[24.288271,102.496353],[24.2878,102.495827],[24.28723,102.495407],[24.286591,102.495087],[24.285919,102.494888],[24.28525,102.494797],[24.282829,102.494797],[24.282221,102.494743],[24.28142,102.494476],[24.280569,102.493973],[24.2794,102.492844],[24.276489,102.4879],[24.27578,102.487053],[24.274691,102.486198],[24.273609,102.485657],[24.272449,102.485382],[24.26977,102.485046],[24.268471,102.48465],[24.26585,102.483528],[24.26474,102.483238],[24.26259,102.483109],[24.25843,102.483162],[24.25771,102.483017],[24.25713,102.482857],[24.25701,102.482826],[24.25679,102.48275],[24.256611,102.482689],[24.256069,102.482513],[24.25515,102.482117],[24.253349,102.48143],[24.25172,102.480797],[24.250879,102.480476],[24.25012,102.480263],[24.248831,102.480049],[24.247219,102.480019],[24.23737,102.481071],[24.235371,102.480927],[24.224079,102.478661],[24.212351,102.474663],[24.210661,102.473763],[24.20948,102.472878],[24.20829,102.471649],[24.204809,102.466621],[24.203409,102.46524],[24.20174,102.464043],[24.196659,102.461678],[24.19556,102.460876],[24.194941,102.460243],[24.19416,102.459106],[24.193331,102.457581],[24.191719,102.455399],[24.191389,102.454742],[24.191139,102.454033],[24.19101,102.45327],[24.19099,102.452591],[24.19091,102.45002],[24.190901,102.449692],[24.19076,102.444458],[24.19109,102.441818],[24.191771,102.437843],[24.19174,102.436836],[24.191641,102.436348],[24.19136,102.435623],[24.191099,102.435181],[24.18651,102.43042],[24.185989,102.429581],[24.185711,102.428879],[24.184311,102.419518],[24.183969,102.418533],[24.183371,102.417389],[24.182409,102.415947],[24.181881,102.414803],[24.18154,102.413551],[24.1812,102.403793],[24.180929,102.402191],[24.18042,102.400688],[24.177509,102.395042],[24.176331,102.392754],[24.17631,102.392723],[24.176149,102.392403],[24.17314,102.386574],[24.172701,102.385933],[24.170879,102.384216],[24.17062,102.383812],[24.17046,102.383347],[24.170179,102.381378],[24.16997,102.380669],[24.169609,102.380043],[24.169121,102.379478],[24.16855,102.379021],[24.16753,102.378349],[24.167021,102.377808],[24.166389,102.377007],[24.166019,102.376701],[24.165569,102.376472],[24.16416,102.376099],[24.16374,102.3759],[24.163389,102.375603],[24.163139,102.375191],[24.162661,102.374092],[24.162411,102.373703],[24.162251,102.37352],[24.16185,102.373238],[24.161409,102.373077],[24.15999,102.37294],[24.15954,102.372833],[24.159321,102.372726],[24.158939,102.372467],[24.15859,102.372147],[24.158319,102.371773],[24.15811,102.37133],[24.15798,102.37085],[24.157841,102.369583],[24.15766,102.368828],[24.157379,102.368118],[24.15666,102.367088],[24.156179,102.366371],[24.155479,102.364662],[24.15521,102.364029],[24.154329,102.363487],[24.153721,102.363167],[24.152889,102.362442],[24.15229,102.361687],[24.15196,102.361397],[24.15155,102.361153],[24.15045,102.360817],[24.149799,102.360527],[24.149441,102.360222],[24.149151,102.35984],[24.14892,102.359413],[24.14876,102.358917],[24.148399,102.356651],[24.148041,102.355782],[24.14629,102.353394],[24.14595,102.35276],[24.145611,102.35183],[24.14521,102.350128],[24.145029,102.349693],[24.14465,102.349068],[24.14324,102.347618],[24.142731,102.346786],[24.1418,102.344177],[24.14126,102.343384],[24.140659,102.342873],[24.140129,102.342621],[24.13954,102.342499],[24.138929,102.342506],[24.136841,102.342957],[24.1362,102.343002],[24.135571,102.342903],[24.13516,102.342743],[24.132589,102.340973],[24.13216,102.340759],[24.131701,102.340622],[24.130989,102.340523],[24.127661,102.340523],[24.12628,102.340202],[24.124981,102.339577],[24.12085,102.33638],[24.117701,102.334648],[24.11706,102.334412],[24.11635,102.334328],[24.11565,102.334381],[24.114941,102.334572],[24.114281,102.334923],[24.113449,102.33548],[24.11302,102.335693],[24.11256,102.335808],[24.11208,102.335823],[24.11161,102.335716],[24.111179,102.335503],[24.10861,102.333557],[24.106741,102.33268],[24.10528,102.331383],[24.10442,102.330612],[24.102909,102.329628],[24.10244,102.329132],[24.102039,102.328522],[24.101669,102.327477],[24.101049,102.32486],[24.10013,102.319603],[24.09733,102.308762],[24.097191,102.307899],[24.096939,102.306992],[24.09639,102.305817],[24.09561,102.304764],[24.094851,102.304039],[24.093651,102.30307],[24.093321,102.302711],[24.09306,102.302307],[24.092791,102.301651],[24.092609,102.300667],[24.092541,102.29995],[24.092421,102.29953],[24.092239,102.299141],[24.091841,102.298592],[24.09063,102.297256],[24.0902,102.296577],[24.08963,102.295433],[24.08935,102.295059],[24.08901,102.294746],[24.0886,102.294563],[24.088381,102.29451],[24.087959,102.294518],[24.087219,102.29483],[24.08667,102.295097],[24.08625,102.295174],[24.08585,102.295242],[24.082951,102.296356],[24.082621,102.296516],[24.08209,102.296532],[24.0816,102.296417],[24.081181,102.296318],[24.08079,102.296112],[24.08042,102.295807],[24.08012,102.295441],[24.07991,102.295013],[24.07976,102.29454],[24.079679,102.294022],[24.0797,102.293243],[24.0802,102.290543],[24.08024,102.290009],[24.08013,102.28923],[24.079941,102.288757],[24.07933,102.287903],[24.077909,102.28611],[24.0777,102.285744],[24.0776,102.285332],[24.07761,102.284912],[24.077709,102.2845],[24.077909,102.284126],[24.078409,102.283669],[24.078991,102.283257],[24.079321,102.282921],[24.07955,102.282509],[24.07966,102.282051],[24.07967,102.281578],[24.07852,102.277153],[24.07806,102.276161],[24.075491,102.272011],[24.075199,102.271309],[24.0748,102.269821],[24.074591,102.269386],[24.074459,102.269173],[24.073931,102.2686],[24.07037,102.266113],[24.069981,102.265747],[24.06966,102.26532],[24.06941,102.264839],[24.069151,102.264069],[24.06813,102.258057],[24.067631,102.25647],[24.063391,102.248207],[24.063089,102.247742],[24.06238,102.246918],[24.06155,102.246246],[24.059299,102.244904],[24.057791,102.243858],[24.057039,102.243134],[24.05673,102.242722],[24.05632,102.242027],[24.05582,102.240761],[24.054319,102.236038],[24.05357,102.234596],[24.05155,102.231468],[24.050631,102.22953],[24.04875,102.224281],[24.048401,102.223633],[24.04619,102.221077],[24.04599,102.220711],[24.045799,102.220093],[24.045759,102.219177],[24.045759,102.21759],[24.045759,102.217461],[24.04575,102.214523],[24.04575,102.213913],[24.045691,102.207733],[24.045561,102.206467],[24.045349,102.205673],[24.04513,102.205132],[24.04483,102.204391],[24.044189,102.203178],[24.037531,102.195297],[24.036949,102.194763],[24.03628,102.194359],[24.031691,102.192528],[24.03071,102.192322],[24.029181,102.192192],[24.02747,102.192032],[24.026331,102.191757],[24.02446,102.191139],[24.023439,102.190964],[24.014271,102.191002],[24.01329,102.190872],[24.0121,102.190483],[24.0112,102.189987],[24.010401,102.189377],[24.00802,102.186996],[24.007721,102.186577],[24.00737,102.18586],[24.006901,102.18457],[24.00667,102.18409],[24.006371,102.183662],[24.005791,102.183144],[24.005569,102.182983],[24.00429,102.182053],[24.004009,102.181839],[24.00309,102.181152],[24.002621,102.180801],[23.999161,102.178482],[23.99815,102.178101],[23.997219,102.177979],[23.993441,102.17823],[23.991911,102.17807],[23.98851,102.17717],[23.987881,102.177116],[23.98723,102.17717],[23.986589,102.17733],[23.98562,102.177834],[23.98452,102.178513],[23.983761,102.178818],[23.982731,102.178993],[23.981871,102.178902],[23.98102,102.178642],[23.979971,102.178177],[23.979059,102.177948],[23.9765,102.177856],[23.975559,102.177658],[23.97468,102.177238],[23.974079,102.176819],[23.971951,102.174683],[23.97135,102.174232],[23.96685,102.171967],[23.96616,102.171738],[23.965191,102.171669],[23.96447,102.171761],[23.963039,102.172127],[23.962561,102.172188],[23.96209,102.172127],[23.96162,102.171944],[23.96122,102.171661],[23.958651,102.168922],[23.95356,102.16555],[23.953131,102.16507],[23.952921,102.164711],[23.952669,102.163879],[23.95248,102.162537],[23.952339,102.162109],[23.952101,102.161728],[23.95179,102.161423],[23.946501,102.158653],[23.94496,102.157494],[23.942419,102.154846],[23.9419,102.154488],[23.941311,102.154297],[23.94047,102.154228],[23.93947,102.154266],[23.939091,102.154243],[23.93854,102.154083],[23.937599,102.153488],[23.93655,102.152649],[23.935699,102.152184],[23.93387,102.15155],[23.933331,102.151237],[23.932699,102.150703],[23.932409,102.150391],[23.931231,102.148399],[23.93082,102.14798],[23.93018,102.147568],[23.929529,102.147186],[23.92911,102.146828],[23.92877,102.146393],[23.928169,102.145157],[23.92758,102.144363],[23.926809,102.14373],[23.92609,102.143349],[23.91666,102.14122],[23.914061,102.140831],[23.913349,102.140778],[23.908159,102.14093],[23.90766,102.140877],[23.897499,102.139458],[23.89678,102.139381],[23.896061,102.139252],[23.89463,102.13871],[23.89208,102.137512],[23.890499,102.136703],[23.88798,102.134712],[23.887449,102.134132],[23.88703,102.133453],[23.88681,102.132957],[23.886379,102.13176],[23.885281,102.129013],[23.877159,102.123848],[23.876949,102.123734],[23.87628,102.123627],[23.874849,102.12368],[23.874399,102.12365],[23.87398,102.123482],[23.87368,102.123154],[23.873461,102.12278],[23.872881,102.121277],[23.872459,102.120659],[23.87211,102.1203],[23.870911,102.119453],[23.87038,102.118896],[23.87023,102.118698],[23.86998,102.118233],[23.86936,102.116547],[23.86911,102.11615],[23.86895,102.115959],[23.868561,102.115646],[23.86725,102.114952],[23.865561,102.113297],[23.864361,102.11203],[23.86401,102.11145],[23.863859,102.110832],[23.86388,102.110413],[23.864111,102.10981],[23.864361,102.109459],[23.86471,102.109177],[23.86515,102.109001],[23.867279,102.108498],[23.86791,102.108231],[23.868099,102.108109],[23.868401,102.107727],[23.86895,102.106552],[23.869209,102.10611],[23.869551,102.105713],[23.869949,102.105431],[23.870399,102.105209],[23.87126,102.104851],[23.871599,102.104584],[23.871849,102.104279],[23.871929,102.104057],[23.87195,102.103851],[23.87188,102.103378],[23.87175,102.103012],[23.871481,102.102699],[23.871111,102.102448],[23.870911,102.102364],[23.870501,102.102333],[23.87026,102.102379],[23.86981,102.1026],[23.86916,102.102798],[23.86871,102.102829],[23.8685,102.102814],[23.867149,102.102249],[23.86648,102.10183],[23.865879,102.101303],[23.86536,102.100647],[23.86388,102.098213],[23.86368,102.09761],[23.863661,102.097412],[23.8638,102.096764],[23.864031,102.096359],[23.86445,102.095848],[23.864981,102.095001],[23.865299,102.094254],[23.865681,102.093201],[23.86581,102.092934],[23.866131,102.092484],[23.86668,102.091904],[23.867149,102.091263],[23.867399,102.090759],[23.86763,102.089981],[23.867781,102.088951],[23.86775,102.088509],[23.867701,102.088303],[23.867479,102.087929],[23.867149,102.087646],[23.8666,102.087448],[23.8664,102.087448],[23.86618,102.087509],[23.865761,102.087761],[23.86545,102.088081],[23.865259,102.088478],[23.865049,102.0896],[23.864811,102.090233],[23.864599,102.090599],[23.864059,102.091103],[23.861059,102.092583],[23.86046,102.092957],[23.860161,102.093208],[23.85955,102.094032],[23.85935,102.094452],[23.859079,102.09481],[23.85873,102.095154],[23.857849,102.095581],[23.85738,102.095703],[23.857161,102.095711],[23.85676,102.095901],[23.856409,102.096161],[23.85626,102.096313],[23.856159,102.096497],[23.85605,102.096626],[23.85606,102.0989],[23.85601,102.099152],[23.855801,102.099579],[23.855511,102.099983],[23.85516,102.100304],[23.85471,102.100906],[23.854309,102.101929],[23.854,102.102547],[23.853701,102.102913],[23.853161,102.10331],[23.852949,102.103401],[23.85203,102.10363],[23.85128,102.103683],[23.85055,102.1036],[23.84981,102.103409],[23.84853,102.10321],[23.84803,102.103027],[23.847799,102.102913],[23.847401,102.102577],[23.846701,102.101784],[23.84593,102.101196],[23.84486,102.100601],[23.84428,102.100159],[23.843531,102.099258],[23.84318,102.09893],[23.842779,102.098663],[23.841961,102.098312],[23.84136,102.097954],[23.841181,102.097809],[23.84103,102.097633],[23.8407,102.096977],[23.84058,102.096527],[23.8403,102.095161],[23.840151,102.094727],[23.84005,102.094551],[23.83938,102.093979],[23.839199,102.093857],[23.837481,102.093353],[23.83728,102.093262],[23.835831,102.092857],[23.835409,102.092659],[23.835011,102.092377],[23.834681,102.092049],[23.83445,102.091698],[23.834129,102.090881],[23.8332,102.088898],[23.83288,102.08831],[23.830799,102.084099],[23.83016,102.083054],[23.829861,102.08271],[23.82933,102.082359],[23.828329,102.081863],[23.822161,102.078331],[23.82205,102.078178],[23.82181,102.077698],[23.821199,102.076813],[23.82086,102.076462],[23.8188,102.074661],[23.818331,102.074333],[23.817829,102.074112],[23.817329,102.074013],[23.81706,102.074051],[23.81608,102.073959],[23.81583,102.073883],[23.815359,102.073601],[23.81246,102.070953],[23.811911,102.070358],[23.810949,102.069153],[23.810579,102.068832],[23.81036,102.06871],[23.809879,102.068527],[23.809629,102.068497],[23.80913,102.06855],[23.808661,102.068703],[23.80765,102.069527],[23.80718,102.069809],[23.806931,102.069908],[23.806431,102.069977],[23.805929,102.069809],[23.8057,102.069702],[23.805111,102.069206],[23.804449,102.068359],[23.804079,102.067978],[23.80345,102.067581],[23.80213,102.067047],[23.80155,102.066658],[23.801029,102.0662],[23.79903,102.064003],[23.798861,102.06385],[23.79821,102.063148],[23.797501,102.062531],[23.79648,102.061852],[23.795851,102.061501],[23.79565,102.061363],[23.79418,102.060448],[23.792999,102.059502],[23.791599,102.058357],[23.79055,102.057701],[23.78875,102.056847],[23.78598,102.056],[23.78591,102.055946],[23.785601,102.055771],[23.785271,102.05555],[23.78495,102.055313],[23.784639,102.055054],[23.78433,102.054779],[23.783991,102.054497],[23.78377,102.054321],[23.783541,102.054138],[23.7833,102.053963],[23.78306,102.05378],[23.78281,102.053612],[23.78229,102.053284],[23.782021,102.053123],[23.78175,102.052963],[23.781481,102.052818],[23.7812,102.052673],[23.780661,102.052353],[23.78039,102.052193],[23.780121,102.05204],[23.77984,102.05188],[23.77957,102.05172],[23.779301,102.051559],[23.77903,102.051399],[23.77877,102.051224],[23.778509,102.051064],[23.778259,102.05088],[23.778009,102.05069],[23.777769,102.050507],[23.77754,102.050323],[23.777309,102.050117],[23.777081,102.049919],[23.776859,102.049721],[23.77664,102.049507],[23.77643,102.049316],[23.77622,102.049118],[23.77602,102.04892],[23.77581,102.048721],[23.775511,102.048431],[23.7752,102.048141],[23.7749,102.047859],[23.77459,102.047569],[23.77438,102.047371],[23.774179,102.04718],[23.773979,102.046982],[23.77376,102.046783],[23.77355,102.046593],[23.77322,102.046303],[23.772989,102.046112],[23.77276,102.045937],[23.77252,102.045761],[23.77227,102.045593],[23.77202,102.045433],[23.77178,102.045273],[23.771521,102.04512],[23.771271,102.044983],[23.771021,102.04483],[23.770769,102.044693],[23.77051,102.04454],[23.77026,102.044403],[23.77002,102.044243],[23.76977,102.044098],[23.76952,102.043953],[23.76927,102.043793],[23.76902,102.043663],[23.76878,102.04351],[23.76853,102.043373],[23.76829,102.043221],[23.76804,102.043083],[23.767799,102.042938],[23.76755,102.042801],[23.767309,102.042664],[23.767071,102.042503],[23.76683,102.042351],[23.7666,102.042198],[23.766371,102.042038],[23.766041,102.041786],[23.76582,102.041618],[23.76549,102.041344],[23.76528,102.041161],[23.76507,102.04097],[23.76486,102.040771],[23.76465,102.040573],[23.764441,102.040367],[23.764231,102.040161],[23.76403,102.039963],[23.763821,102.039757],[23.76362,102.039551],[23.76321,102.039162],[23.76289,102.038918],[23.76255,102.038696],[23.762199,102.038513],[23.76182,102.038368],[23.761419,102.038277],[23.761141,102.038239],[23.76086,102.038223],[23.760571,102.038193],[23.760269,102.038147],[23.759979,102.038116],[23.759689,102.038078],[23.757641,102.03775],[23.757311,102.037598],[23.756981,102.03743],[23.756651,102.037262],[23.756321,102.037079],[23.755989,102.036888],[23.755011,102.036324],[23.754681,102.036102],[23.75433,102.035889],[23.753969,102.03569],[23.753599,102.035492],[23.753241,102.035309],[23.752871,102.035103],[23.75251,102.034882],[23.75218,102.034607],[23.7519,102.034271],[23.751671,102.033897],[23.751459,102.033508],[23.75127,102.033119],[23.75107,102.032738],[23.750851,102.032372],[23.750629,102.032013],[23.75038,102.031677],[23.75012,102.031349],[23.749861,102.031029],[23.74958,102.030724],[23.7493,102.030403],[23.74902,102.030083],[23.748791,102.029701],[23.74864,102.029289],[23.748581,102.028877],[23.748619,102.028458],[23.74872,102.028053],[23.74893,102.027687],[23.74921,102.02739],[23.74954,102.027168],[23.749901,102.027031],[23.750259,102.026939],[23.750629,102.026894],[23.750999,102.026817],[23.75135,102.026718],[23.751659,102.026527],[23.751909,102.026268],[23.75206,102.025917],[23.752131,102.025558],[23.752119,102.025169],[23.75209,102.024773],[23.75205,102.024353],[23.752041,102.023933],[23.752081,102.023499],[23.75218,102.023071],[23.7523,102.022659],[23.752541,102.021828],[23.75256,102.021408],[23.752501,102.021004],[23.75231,102.020653],[23.75205,102.020363],[23.75172,102.02021],[23.751369,102.020126],[23.75102,102.020172],[23.750681,102.020287],[23.75042,102.020561],[23.75021,102.020889],[23.75001,102.02124],[23.74964,102.021957],[23.749451,102.022324],[23.74926,102.022667],[23.749041,102.023003],[23.748739,102.023247],[23.748409,102.02343],[23.74807,102.023537],[23.747721,102.023613],[23.74737,102.023666],[23.74703,102.023781],[23.746719,102.023956],[23.74645,102.024193],[23.74621,102.024467],[23.745991,102.024773],[23.74575,102.02507],[23.74552,102.02536],[23.74523,102.025597],[23.74489,102.025787],[23.74453,102.025871],[23.744169,102.02581],[23.74382,102.025681],[23.74349,102.02549],[23.743179,102.025299],[23.74287,102.025101],[23.742559,102.024902],[23.74225,102.024696],[23.74193,102.024513],[23.74161,102.024307],[23.741289,102.024109],[23.74095,102.023911],[23.740601,102.02372],[23.740259,102.023529],[23.73991,102.023338],[23.739571,102.023163],[23.739229,102.022987],[23.738899,102.022812],[23.73856,102.022629],[23.738239,102.022461],[23.737909,102.022293],[23.737579,102.022118],[23.737261,102.021942],[23.736931,102.021767],[23.736589,102.021599],[23.73625,102.021431],[23.73591,102.021248],[23.735571,102.021057],[23.735241,102.020844],[23.73493,102.020592],[23.734631,102.020317],[23.73436,102.020027],[23.734131,102.019699],[23.73391,102.019363],[23.733709,102.019028],[23.73349,102.0187],[23.733231,102.018402],[23.73295,102.01815],[23.73263,102.01799],[23.732281,102.017921],[23.73192,102.01796],[23.731581,102.018059],[23.73127,102.018257],[23.73101,102.018532],[23.73082,102.01886],[23.730709,102.019241],[23.730671,102.019638],[23.73073,102.020042],[23.73086,102.020432],[23.731039,102.020798],[23.73127,102.021141],[23.731501,102.021477],[23.73172,102.021843],[23.731939,102.022202],[23.73214,102.02256],[23.73234,102.022926],[23.73254,102.023277],[23.732731,102.023651],[23.732901,102.024033],[23.73307,102.024406],[23.733231,102.024803],[23.733379,102.0252],[23.73353,102.025597],[23.733681,102.026009],[23.73382,102.026413],[23.733959,102.02681],[23.73411,102.027206],[23.734249,102.027611],[23.73439,102.028023],[23.734541,102.028419],[23.734699,102.028816],[23.73485,102.029213],[23.735001,102.02961],[23.73514,102.030022],[23.735229,102.030441],[23.73527,102.030884],[23.73526,102.031319],[23.73522,102.031761],[23.73513,102.032173],[23.734989,102.03257],[23.7348,102.032944],[23.734591,102.033287],[23.734341,102.033592],[23.734051,102.033867],[23.733749,102.034103],[23.733419,102.034286],[23.73308,102.034439],[23.732719,102.034561],[23.732349,102.034653],[23.731979,102.034683],[23.7316,102.034668],[23.731199,102.034607],[23.730789,102.034538],[23.73037,102.034447],[23.729919,102.03437],[23.729469,102.034286],[23.72901,102.034233],[23.728559,102.03418],[23.728109,102.034126],[23.727659,102.034103],[23.7272,102.03405],[23.726749,102.033997],[23.726311,102.033928],[23.72587,102.033821],[23.725451,102.033691],[23.725031,102.033539],[23.724621,102.033371],[23.724211,102.033188],[23.723789,102.03302],[23.723351,102.032913],[23.7229,102.032883],[23.72246,102.032944],[23.72204,102.033089],[23.721649,102.03331],[23.721291,102.033546],[23.72093,102.033798],[23.72056,102.034027],[23.7202,102.034264],[23.71983,102.034462],[23.71946,102.034668],[23.71908,102.034866],[23.71871,102.035072],[23.71833,102.035263],[23.717951,102.035461],[23.71756,102.035637],[23.717171,102.035828],[23.716789,102.036011],[23.716419,102.036209],[23.71603,102.036308],[23.71563,102.036346],[23.71525,102.036301],[23.714899,102.036148],[23.714581,102.035927],[23.714291,102.035683],[23.71402,102.035408],[23.71372,102.035156],[23.713409,102.03492],[23.713079,102.034714],[23.712721,102.034538],[23.71236,102.034393],[23.711981,102.034264],[23.711599,102.034103],[23.711229,102.033951],[23.710871,102.033783],[23.71052,102.033577],[23.71019,102.033363],[23.709869,102.033119],[23.70957,102.032867],[23.709261,102.032623],[23.708941,102.032402],[23.708611,102.032211],[23.70826,102.032066],[23.707911,102.03196],[23.70755,102.031891],[23.70718,102.031853],[23.70681,102.031837],[23.70644,102.031822],[23.70606,102.031792],[23.7057,102.031723],[23.705351,102.031593],[23.705009,102.031433],[23.704691,102.031227],[23.704399,102.030983],[23.704121,102.030693],[23.703871,102.03038],[23.70363,102.030052],[23.703381,102.029716],[23.703119,102.029404],[23.70257,102.028763],[23.70228,102.02845],[23.701969,102.028137],[23.70167,102.027847],[23.701361,102.02755],[23.70105,102.02726],[23.700741,102.026993],[23.70059,102.026863],[23.70014,102.026466],[23.699841,102.02623],[23.699539,102.025978],[23.699261,102.025703],[23.698999,102.025414],[23.698771,102.025078],[23.69857,102.024727],[23.698389,102.024361],[23.69825,102.023987],[23.698139,102.023598],[23.698071,102.023209],[23.698021,102.022812],[23.698009,102.022423],[23.698021,102.022034],[23.698021,102.021652],[23.69804,102.021271],[23.69805,102.020889],[23.698059,102.020493],[23.698071,102.020103],[23.69809,102.019676],[23.698099,102.019257],[23.698099,102.018837],[23.698099,102.018417],[23.69808,102.017982],[23.69805,102.017548],[23.698009,102.017113],[23.69796,102.01667],[23.697889,102.016228],[23.697809,102.015793],[23.697729,102.01535],[23.69763,102.014923],[23.697531,102.014503],[23.69742,102.014076],[23.697321,102.01368],[23.69721,102.013283],[23.697109,102.012894],[23.69701,102.012489],[23.696911,102.012093],[23.6968,102.011703],[23.696699,102.011307],[23.69659,102.01091],[23.696489,102.010513],[23.69639,102.010117],[23.696289,102.009727],[23.69619,102.009331],[23.696079,102.008942],[23.69598,102.008537],[23.695869,102.008148],[23.69577,102.007751],[23.695669,102.007362],[23.69557,102.006973],[23.695471,102.006577],[23.69537,102.006203],[23.695271,102.005829],[23.695169,102.005463],[23.69507,102.005089],[23.694969,102.004723],[23.69488,102.004356],[23.69478,102.00399],[23.694679,102.003616],[23.69458,102.003242],[23.694481,102.002869],[23.694389,102.002487],[23.69429,102.002121],[23.694189,102.001747],[23.69409,102.001373],[23.693991,102.000999],[23.693899,102.000633],[23.6938,102.000259],[23.693701,101.999893],[23.693609,101.999542],[23.69352,101.999191],[23.693411,101.998848],[23.693279,101.998497],[23.69315,101.998154],[23.69301,101.997803],[23.692869,101.997437],[23.692711,101.99707],[23.692539,101.996696],[23.692381,101.996323],[23.6922,101.995949],[23.692011,101.995567],[23.69183,101.995193],[23.691641,101.994797],[23.691441,101.994423],[23.69125,101.994034],[23.69105,101.993637],[23.690861,101.993248],[23.69066,101.992859],[23.69047,101.992462],[23.690281,101.992073],[23.6901,101.991653],[23.689939,101.991241],[23.689791,101.990822],[23.68964,101.990387],[23.689501,101.989967],[23.689369,101.989563],[23.689251,101.989128],[23.68915,101.988708],[23.689051,101.988281],[23.688971,101.987862],[23.68889,101.987442],[23.68882,101.987022],[23.688761,101.986603],[23.688721,101.986183],[23.688681,101.985764],[23.68865,101.985352],[23.688629,101.98494],[23.68861,101.984528],[23.688589,101.984123],[23.68858,101.983711],[23.68856,101.983307],[23.688551,101.98291],[23.68852,101.982513],[23.68849,101.982101],[23.68845,101.981697],[23.688391,101.981293],[23.688311,101.980888],[23.688219,101.980492],[23.68811,101.980087],[23.68799,101.979691],[23.687851,101.979301],[23.687691,101.978912],[23.687531,101.978523],[23.68737,101.978127],[23.68722,101.977753],[23.687059,101.977364],[23.686899,101.976967],[23.686741,101.976593],[23.68659,101.976212],[23.68643,101.97583],[23.686279,101.975456],[23.686131,101.975098],[23.685961,101.974747],[23.68578,101.974442],[23.685579,101.974136],[23.68536,101.973877],[23.68512,101.973633],[23.684879,101.973412],[23.684629,101.973221],[23.68438,101.973053],[23.684151,101.9729],[23.68383,101.972603],[23.683571,101.972458],[23.68306,101.972168],[23.682819,101.971977],[23.682501,101.971779],[23.682249,101.971626],[23.681971,101.971443],[23.681641,101.971237],[23.681391,101.971077],[23.68115,101.970932],[23.680889,101.970779],[23.68063,101.970627],[23.680349,101.970459],[23.680071,101.970284],[23.679779,101.970108],[23.679489,101.969933],[23.67918,101.969757],[23.678881,101.969597],[23.67857,101.969452],[23.678261,101.96933],[23.67794,101.969223],[23.67762,101.969131],[23.677299,101.969063],[23.67697,101.969009],[23.67663,101.968971],[23.676291,101.968933],[23.675949,101.968887],[23.6756,101.968826],[23.67527,101.968727],[23.67462,101.968483],[23.67432,101.968277],[23.67403,101.968079],[23.67374,101.967857],[23.67345,101.967644],[23.673161,101.96743],[23.672859,101.967239],[23.67255,101.967056],[23.672239,101.966927],[23.67193,101.96682],[23.671619,101.966743],[23.67131,101.966667],[23.671021,101.966621],[23.67075,101.966614],[23.670349,101.966614],[23.66995,101.966637],[23.66091,101.97168],[23.660431,101.971909],[23.66013,101.972076],[23.659809,101.972214],[23.659479,101.972313],[23.65914,101.972366],[23.658791,101.972412],[23.658449,101.97242],[23.65773,101.972427],[23.65737,101.97242],[23.657,101.972412],[23.65662,101.972397],[23.65624,101.972389],[23.655849,101.972366],[23.65547,101.972298],[23.6551,101.97216],[23.654751,101.97197],[23.65443,101.971764],[23.65411,101.971542],[23.65379,101.971336],[23.65346,101.971184],[23.65312,101.971046],[23.652769,101.970978],[23.652399,101.970947],[23.65204,101.970963],[23.651661,101.970993],[23.65127,101.971024],[23.650909,101.971001],[23.65053,101.970917],[23.650181,101.970757],[23.649851,101.970558],[23.649561,101.970299],[23.649281,101.970032],[23.64901,101.969772],[23.64875,101.969513],[23.648491,101.969261],[23.64823,101.969002],[23.64797,101.96875],[23.647699,101.968491],[23.64743,101.968231],[23.64716,101.967957],[23.646891,101.967682],[23.646641,101.967377],[23.64642,101.967056],[23.64624,101.966698],[23.646099,101.966316],[23.645969,101.965927],[23.64583,101.965553],[23.6457,101.965149],[23.645559,101.964767],[23.645399,101.964409],[23.64522,101.964088],[23.644991,101.963814],[23.644739,101.963562],[23.64447,101.963341],[23.643101,101.962318],[23.64275,101.96209],[23.64241,101.961853],[23.642071,101.961632],[23.641741,101.961411],[23.641399,101.961182],[23.641069,101.96096],[23.640751,101.960716],[23.64043,101.96048],[23.640141,101.96022],[23.63987,101.959953],[23.63962,101.959686],[23.638901,101.958862],[23.63866,101.958588],[23.638479,101.958397],[23.63728,101.957024],[23.63489,101.954277],[23.63361,101.952621],[23.633329,101.951576],[23.63299,101.948517],[23.632059,101.946426],[23.63175,101.945503],[23.632021,101.944267],[23.63216,101.943573],[23.632389,101.942902],[23.63249,101.942574],[23.632521,101.942223],[23.632259,101.93898],[23.632299,101.938667],[23.632351,101.938339],[23.63238,101.938011],[23.632401,101.937683],[23.632401,101.937332],[23.63241,101.936653],[23.632389,101.936287],[23.63237,101.935944],[23.632351,101.935593],[23.632339,101.935226],[23.63236,101.934883],[23.63245,101.934517],[23.632561,101.934174],[23.63269,101.93383],[23.63283,101.933472],[23.63298,101.933113],[23.633129,101.932747],[23.633289,101.932404],[23.633591,101.931664],[23.63368,101.931267],[23.633711,101.930862],[23.63368,101.930473],[23.633631,101.930069],[23.63357,101.929688],[23.633459,101.929329],[23.633369,101.92897],[23.63332,101.928612],[23.63331,101.928253],[23.633329,101.927528],[23.63336,101.927162],[23.633511,101.926819],[23.633711,101.926514],[23.63435,101.925613],[23.635139,101.924377],[23.635309,101.923653],[23.63538,101.923286],[23.635441,101.92292],[23.6355,101.922546],[23.635559,101.922188],[23.63562,101.921806],[23.635691,101.921448],[23.635771,101.921082],[23.635851,101.920723],[23.63595,101.920349],[23.636061,101.919983],[23.636169,101.919609],[23.63629,101.919243],[23.63641,101.918869],[23.63653,101.918503],[23.636641,101.918121],[23.636761,101.917747],[23.636869,101.917374],[23.63698,101.917],[23.63711,101.916634],[23.637251,101.916267],[23.637409,101.915909],[23.637581,101.915573],[23.637791,101.915253],[23.63802,101.914963],[23.63826,101.914673],[23.638519,101.914398],[23.638809,101.914162],[23.63909,101.913933],[23.639971,101.913269],[23.640249,101.913033],[23.640499,101.912773],[23.640751,101.912514],[23.64097,101.912216],[23.641159,101.911926],[23.641331,101.911613],[23.64147,101.911301],[23.641581,101.91098],[23.64167,101.91066],[23.641729,101.910339],[23.641781,101.910027],[23.64183,101.909714],[23.64188,101.909401],[23.64193,101.909103],[23.641979,101.908813],[23.64201,101.908386],[23.642031,101.90799],[23.64205,101.9076],[23.642071,101.907204],[23.64213,101.906799],[23.642191,101.906387],[23.64225,101.905983],[23.6423,101.905571],[23.64238,101.905151],[23.642521,101.904739],[23.642651,101.904472],[23.642799,101.904221],[23.642969,101.903976],[23.64316,101.903763],[23.64337,101.903542],[23.643591,101.903343],[23.64382,101.903152],[23.644039,101.902946],[23.64427,101.90274],[23.64447,101.902519],[23.644661,101.902283],[23.644831,101.902023],[23.645029,101.901604],[23.64513,101.901299],[23.64521,101.900993],[23.645281,101.900658],[23.64535,101.900337],[23.64542,101.900009],[23.6455,101.899681],[23.645611,101.899353],[23.645729,101.89904],[23.64588,101.898743],[23.646061,101.898438],[23.646259,101.898163],[23.646469,101.897881],[23.646681,101.897598],[23.646891,101.897301],[23.647091,101.897003],[23.647261,101.896683],[23.647421,101.896362],[23.647539,101.896019],[23.64765,101.895683],[23.64773,101.895317],[23.647791,101.894958],[23.647829,101.894592],[23.647881,101.894234],[23.647921,101.893852],[23.647961,101.893494],[23.64802,101.89312],[23.6481,101.892761],[23.648199,101.892403],[23.648319,101.892067],[23.648451,101.891739],[23.6486,101.891434],[23.64876,101.891121],[23.64893,101.890831],[23.64909,101.890533],[23.64922,101.890244],[23.649361,101.889954],[23.64949,101.889671],[23.649639,101.889397],[23.649771,101.889122],[23.64991,101.888847],[23.650049,101.888573],[23.65019,101.888298],[23.65033,101.888023],[23.650471,101.887733],[23.65062,101.887428],[23.65077,101.887123],[23.650921,101.88681],[23.65107,101.886497],[23.65123,101.886177],[23.65139,101.885849],[23.65156,101.885521],[23.65172,101.885178],[23.65189,101.884842],[23.65204,101.884499],[23.65221,101.884163],[23.65237,101.88382],[23.65254,101.883492],[23.6527,101.883179],[23.652849,101.882874],[23.653009,101.882584],[23.653151,101.882294],[23.653299,101.882019],[23.653521,101.88163],[23.65366,101.881378],[23.653799,101.881149],[23.6539,101.880768],[23.6546,101.878288],[23.65497,101.877052],[23.65519,101.876587],[23.65564,101.875954],[23.657261,101.874313],[23.657681,101.873672],[23.657881,101.873199],[23.65803,101.8722],[23.658001,101.868111],[23.65777,101.867126],[23.657431,101.866409],[23.656799,101.865631],[23.65568,101.864571],[23.65534,101.864098],[23.655069,101.863403],[23.654449,101.860573],[23.653891,101.859253],[23.65309,101.857887],[23.652849,101.857109],[23.6527,101.855202],[23.652519,101.854607],[23.652201,101.854088],[23.65103,101.852982],[23.650789,101.852661],[23.650499,101.851913],[23.65053,101.851082],[23.650631,101.85022],[23.6506,101.849571],[23.650471,101.849152],[23.650129,101.848633],[23.649679,101.848213],[23.647881,101.847023],[23.64748,101.846626],[23.647169,101.846169],[23.64691,101.845627],[23.64591,101.842331],[23.64588,101.841537],[23.646021,101.840973],[23.646509,101.839737],[23.64658,101.839371],[23.646561,101.838982],[23.646391,101.838463],[23.6462,101.838158],[23.645679,101.837677],[23.644739,101.836983],[23.64422,101.836113],[23.643431,101.833298],[23.643379,101.832687],[23.643419,101.832283],[23.643539,101.831909],[23.64373,101.831596],[23.64398,101.831306],[23.644661,101.830681],[23.645029,101.830032],[23.64509,101.829674],[23.645069,101.829277],[23.644979,101.828918],[23.64468,101.82843],[23.64443,101.828194],[23.64377,101.827888],[23.64187,101.827499],[23.641439,101.827347],[23.641121,101.827271],[23.64064,101.827003],[23.64023,101.82666],[23.6397,101.825867],[23.638741,101.824013],[23.63851,101.823723],[23.63822,101.823479],[23.63772,101.823273],[23.634621,101.822853],[23.63373,101.822456],[23.633289,101.822166],[23.63265,101.821503],[23.632271,101.820862],[23.63167,101.819717],[23.631189,101.819206],[23.630751,101.818939],[23.63028,101.818771],[23.629459,101.818718],[23.628241,101.818901],[23.627939,101.818893],[23.62748,101.818764],[23.62705,101.818542],[23.626699,101.818192],[23.62628,101.817398],[23.625401,101.815086],[23.625311,101.814537],[23.62536,101.813812],[23.62553,101.813271],[23.62578,101.812782],[23.627951,101.810028],[23.628139,101.809547],[23.628189,101.809029],[23.62818,101.808868],[23.627979,101.808357],[23.627661,101.807938],[23.627119,101.807632],[23.62405,101.80632],[23.625191,101.808884],[23.62512,101.809036],[23.625,101.80941],[23.624729,101.809753],[23.624331,101.8106],[23.623581,101.811707],[23.623159,101.811996],[23.622641,101.812172],[23.62188,101.81218],[23.619591,101.811241],[23.618839,101.811234],[23.61693,101.811867],[23.616489,101.81189],[23.616039,101.811752],[23.61566,101.81147],[23.615379,101.811073],[23.615351,101.810913],[23.615259,101.810677],[23.61528,101.810501],[23.61525,101.810333],[23.6154,101.809113],[23.61533,101.808052],[23.615101,101.807381],[23.61482,101.806931],[23.61384,101.805931],[23.61338,101.804947],[23.612089,101.804108],[23.606489,101.800911],[23.60602,101.800377],[23.605721,101.79985],[23.60515,101.798477],[23.60471,101.798012],[23.603531,101.797302],[23.602871,101.79673],[23.601749,101.795517],[23.601049,101.794998],[23.600031,101.794533],[23.59981,101.794533],[23.597759,101.793373],[23.59746,101.793297],[23.59713,101.79306],[23.596479,101.792343],[23.59548,101.790649],[23.59395,101.787376],[23.593281,101.787666],[23.593069,101.787567],[23.59271,101.787483],[23.59218,101.787453],[23.591379,101.787331],[23.591049,101.787209],[23.59067,101.786911],[23.588079,101.784103],[23.58736,101.783546],[23.583599,101.781487],[23.58288,101.780853],[23.58206,101.779671],[23.581341,101.77845],[23.579889,101.77681],[23.57777,101.773178],[23.57704,101.772392],[23.57626,101.771942],[23.574301,101.771294],[23.57362,101.770897],[23.569811,101.767776],[23.568859,101.767281],[23.56444,101.765839],[23.563801,101.765472],[23.56325,101.764969],[23.56292,101.764526],[23.56076,101.761436],[23.56049,101.761147],[23.560011,101.760841],[23.559481,101.760651],[23.55802,101.760628],[23.557501,101.760529],[23.55702,101.760277],[23.556749,101.760063],[23.556431,101.759598],[23.55628,101.759247],[23.55587,101.756828],[23.555571,101.756027],[23.55514,101.75531],[23.554581,101.754723],[23.55154,101.752617],[23.55105,101.752113],[23.55064,101.751312],[23.549629,101.747353],[23.5494,101.746819],[23.54907,101.746384],[23.54847,101.745941],[23.547041,101.74514],[23.54565,101.743851],[23.540291,101.738487],[23.52383,101.719322],[23.52364,101.719063],[23.523529,101.718758],[23.523479,101.718697],[23.52347,101.718613],[23.523279,101.718323],[23.522591,101.716637],[23.521999,101.715767],[23.52058,101.714523],[23.52,101.713913],[23.519779,101.713562],[23.51964,101.71315],[23.5196,101.712479],[23.519739,101.711777],[23.521111,101.707848],[23.52124,101.70697],[23.521231,101.706749],[23.52112,101.706306],[23.520889,101.705887],[23.52058,101.705521],[23.520399,101.70536],[23.51824,101.70433],[23.51787,101.704071],[23.51755,101.703743],[23.51734,101.703331],[23.51722,101.702873],[23.51722,101.7024],[23.517321,101.701958],[23.518999,101.698547],[23.51775,101.698097],[23.51767,101.6978],[23.517309,101.697159],[23.51687,101.69648],[23.516701,101.695976],[23.516529,101.69442],[23.51643,101.693939],[23.516211,101.693497],[23.515921,101.693123],[23.515539,101.692818],[23.515129,101.692596],[23.51243,101.691757],[23.51194,101.691704],[23.51141,101.691719],[23.51091,101.691818],[23.50996,101.692207],[23.507971,101.693314],[23.507601,101.693588],[23.50729,101.693932],[23.507059,101.694366],[23.50691,101.694847],[23.506861,101.695351],[23.507,101.696098],[23.50742,101.697243],[23.5075,101.697701],[23.507481,101.698158],[23.507339,101.698608],[23.507099,101.699013],[23.506781,101.699333],[23.506161,101.699654],[23.50526,101.700027],[23.504829,101.700287],[23.504471,101.700638],[23.50415,101.701057],[23.503901,101.701538],[23.503441,101.703049],[23.503309,101.703537],[23.50313,101.703979],[23.50301,101.704163],[23.50268,101.704491],[23.502291,101.70472],[23.501909,101.704857],[23.501499,101.704849],[23.50091,101.704697],[23.50058,101.704491],[23.500111,101.704033],[23.49843,101.701653],[23.498051,101.700943],[23.49762,101.699638],[23.497089,101.697792],[23.49687,101.697281],[23.496441,101.696579],[23.49609,101.696167],[23.493389,101.694],[23.492741,101.693573],[23.49201,101.69326],[23.491501,101.693169],[23.49099,101.693161],[23.49048,101.693253],[23.49,101.69342],[23.482491,101.698227],[23.481791,101.698517],[23.481319,101.698624],[23.47983,101.698692],[23.47933,101.698769],[23.478849,101.698921],[23.47797,101.699402],[23.476339,101.700623],[23.47547,101.701134],[23.474991,101.701286],[23.47427,101.701363],[23.473539,101.701248],[23.47261,101.70092],[23.471729,101.700432],[23.470921,101.699806],[23.4702,101.699051],[23.469601,101.698143],[23.467279,101.693512],[23.4664,101.692177],[23.46524,101.690804],[23.46394,101.689568],[23.462299,101.688393],[23.45648,101.68544],[23.45483,101.684227],[23.451571,101.679291],[23.45013,101.677612],[23.44994,101.67746],[23.449751,101.677254],[23.44949,101.677063],[23.44916,101.676651],[23.44833,101.676033],[23.44721,101.675468],[23.446461,101.675232],[23.445459,101.675049],[23.444201,101.675041],[23.44323,101.675217],[23.43902,101.67688],[23.43664,101.677452],[23.432159,101.677811],[23.43161,101.677773],[23.431431,101.677727],[23.431009,101.677711],[23.43075,101.677757],[23.430719,101.677887],[23.43041,101.678017],[23.42782,101.678543],[23.42403,101.680153],[23.423691,101.680183],[23.42275,101.680458],[23.422331,101.68055],[23.42065,101.680603],[23.41925,101.680367],[23.41754,101.679703],[23.416361,101.679008],[23.41523,101.678017],[23.41408,101.67662],[23.409769,101.67025],[23.409281,101.66922],[23.408991,101.667892],[23.408939,101.666992],[23.40909,101.665619],[23.409439,101.664513],[23.410669,101.661987],[23.4111,101.660606],[23.41157,101.658386],[23.4119,101.657417],[23.41876,101.645554],[23.422489,101.637756],[23.4282,101.62957],[23.42873,101.628517],[23.429131,101.626556],[23.42959,101.622337],[23.42943,101.621048],[23.42898,101.619904],[23.42824,101.618896],[23.427191,101.618149],[23.42573,101.617706],[23.424709,101.617783],[23.42399,101.617973],[23.421801,101.619003],[23.42082,101.619186],[23.41987,101.61908],[23.4189,101.618713],[23.418091,101.617973],[23.417589,101.617203],[23.417191,101.615929],[23.41724,101.6147],[23.41798,101.611702],[23.41794,101.610687],[23.417459,101.60936],[23.417101,101.608871],[23.416019,101.608063],[23.41116,101.606781],[23.410561,101.606598],[23.409781,101.606407],[23.408819,101.605873],[23.40723,101.604347],[23.40661,101.603989],[23.40645,101.603943],[23.40589,101.603752],[23.40432,101.603638],[23.403259,101.603188],[23.40159,101.602028],[23.393909,101.58802],[23.392799,101.586533],[23.392191,101.585709],[23.391319,101.584778],[23.390221,101.583527],[23.38945,101.582977],[23.38868,101.582642],[23.383381,101.580978],[23.382919,101.580917],[23.376631,101.581413],[23.37141,101.58181],[23.370029,101.581902],[23.365709,101.581863],[23.364161,101.581528],[23.36342,101.580582],[23.36319,101.579971],[23.363119,101.57975],[23.36302,101.578888],[23.363171,101.577911],[23.36417,101.574783],[23.36421,101.57399],[23.36409,101.572906],[23.36302,101.568893],[23.362671,101.566399],[23.36252,101.565987],[23.36227,101.565643],[23.36195,101.565338],[23.360991,101.564751],[23.36055,101.564323],[23.36034,101.563942],[23.36025,101.563507],[23.360241,101.563011],[23.36146,101.555557],[23.361481,101.555077],[23.36145,101.554817],[23.3613,101.554359],[23.361059,101.553932],[23.35988,101.552742],[23.359739,101.552559],[23.359541,101.552139],[23.35944,101.551666],[23.359461,101.551193],[23.3596,101.550743],[23.35985,101.550331],[23.360359,101.549797],[23.3624,101.548019],[23.36273,101.547653],[23.363001,101.547234],[23.363171,101.546722],[23.36323,101.546188],[23.363171,101.545624],[23.362129,101.542778],[23.36191,101.542297],[23.361429,101.541649],[23.36083,101.54113],[23.356621,101.539139],[23.355459,101.538544],[23.35391,101.537888],[23.353291,101.53775],[23.35309,101.53775],[23.35268,101.537857],[23.35231,101.538101],[23.352011,101.538452],[23.35129,101.539688],[23.351,101.539993],[23.35067,101.540222],[23.350281,101.540352],[23.349859,101.540367],[23.349211,101.54026],[23.34816,101.539841],[23.347811,101.539619],[23.34753,101.53933],[23.34734,101.538963],[23.34724,101.538513],[23.347269,101.537819],[23.347429,101.53669],[23.34742,101.536232],[23.347321,101.535797],[23.346979,101.535103],[23.346121,101.533829],[23.34573,101.533813],[23.344851,101.533127],[23.344709,101.532967],[23.34454,101.532593],[23.344469,101.532181],[23.344481,101.531754],[23.344749,101.531113],[23.345341,101.530067],[23.34547,101.52964],[23.34549,101.529419],[23.34544,101.528961],[23.345369,101.528732],[23.34515,101.528313],[23.344681,101.527786],[23.343719,101.526917],[23.34347,101.526573],[23.343281,101.526154],[23.34318,101.525703],[23.34318,101.525223],[23.343321,101.52449],[23.343639,101.523193],[23.34362,101.522339],[23.34285,101.519333],[23.34116,101.5177],[23.34013,101.517014],[23.33942,101.516563],[23.33905,101.51619],[23.335939,101.511429],[23.335501,101.510902],[23.335039,101.510536],[23.333469,101.510399],[23.3328,101.510399],[23.332359,101.510406],[23.331421,101.510529],[23.33069,101.510742],[23.33045,101.510841],[23.32917,101.511803],[23.32873,101.512032],[23.328251,101.512169],[23.327749,101.51223],[23.327009,101.512154],[23.323721,101.511398],[23.32324,101.511223],[23.322809,101.510941],[23.322451,101.510597],[23.322161,101.510147],[23.320351,101.505699],[23.32012,101.505348],[23.319851,101.505074],[23.316191,101.503098],[23.316031,101.50293],[23.315781,101.502434],[23.315651,101.501892],[23.315639,101.501511],[23.31591,101.500183],[23.31591,101.499603],[23.31584,101.499207],[23.31547,101.498512],[23.31509,101.4981],[23.313749,101.497139],[23.313049,101.4963],[23.311449,101.493736],[23.310949,101.49324],[23.310511,101.49295],[23.309811,101.492706],[23.309259,101.49263],[23.308701,101.492653],[23.30798,101.492867],[23.307329,101.493263],[23.30624,101.494263],[23.30578,101.494499],[23.30526,101.494598],[23.30475,101.494522],[23.30443,101.494408],[23.304001,101.494133],[23.30332,101.493523],[23.302679,101.493134],[23.302151,101.492973],[23.300329,101.492828],[23.29982,101.492691],[23.29936,101.492416],[23.29896,101.492058],[23.298651,101.49157],[23.29851,101.491203],[23.29841,101.490593],[23.298441,101.489937],[23.29887,101.488731],[23.29994,101.486298],[23.30003,101.485863],[23.300039,101.485397],[23.299959,101.484947],[23.29982,101.484512],[23.29916,101.483093],[23.29899,101.48246],[23.298941,101.479362],[23.29888,101.478943],[23.29845,101.477783],[23.29397,101.471352],[23.293539,101.470367],[23.293381,101.469688],[23.29336,101.469353],[23.293779,101.464844],[23.2936,101.460899],[23.29335,101.459717],[23.29188,101.454727],[23.29196,101.453789],[23.292139,101.453323],[23.29254,101.452782],[23.293091,101.452377],[23.29735,101.450317],[23.29784,101.450218],[23.298019,101.450157],[23.29837,101.45005],[23.300659,101.448982],[23.301109,101.448647],[23.301611,101.448097],[23.30344,101.445053],[23.303631,101.44455],[23.30373,101.44381],[23.303711,101.443443],[23.302691,101.440353],[23.30262,101.439346],[23.303419,101.434143],[23.30341,101.433594],[23.30246,101.428864],[23.30212,101.426933],[23.30205,101.425301],[23.30209,101.423752],[23.30225,101.423042],[23.302509,101.422371],[23.30275,101.421272],[23.30324,101.419991],[23.30357,101.418121],[23.304411,101.41581],[23.30448,101.414879],[23.3043,101.414093],[23.303921,101.412971],[23.30341,101.411713],[23.303289,101.411186],[23.302959,101.410378],[23.302151,101.407608],[23.302019,101.403557],[23.30205,101.399788],[23.301559,101.398216],[23.299601,101.394699],[23.29941,101.394173],[23.298491,101.388153],[23.29851,101.387039],[23.299,101.381798],[23.299179,101.379967],[23.299601,101.375473],[23.29952,101.37381],[23.29854,101.368073],[23.298491,101.367287],[23.298559,101.366814],[23.29862,101.366577],[23.29883,101.366158],[23.298969,101.365967],[23.299129,101.365807],[23.29973,101.365448],[23.30014,101.365318],[23.300591,101.365318],[23.300791,101.365372],[23.301411,101.365631],[23.302679,101.366463],[23.30315,101.366669],[23.305269,101.367111],[23.308611,101.368553],[23.30908,101.368668],[23.309549,101.368683],[23.30978,101.368637],[23.310221,101.368462],[23.31061,101.368179],[23.310921,101.367813],[23.311159,101.367348],[23.311291,101.366852],[23.31131,101.3666],[23.31126,101.366089],[23.31119,101.365829],[23.310949,101.365372],[23.310631,101.36496],[23.31044,101.364777],[23.308399,101.363472],[23.30801,101.363098],[23.30773,101.362648],[23.307541,101.362137],[23.30748,101.361893],[23.30747,101.361351],[23.307541,101.360817],[23.30772,101.360313],[23.30801,101.359863],[23.30838,101.359489],[23.30883,101.3592],[23.309771,101.358704],[23.310181,101.358353],[23.31049,101.357941],[23.31069,101.357468],[23.31078,101.356972],[23.310459,101.352417],[23.31035,101.351883],[23.310141,101.351357],[23.30983,101.350891],[23.309111,101.350021],[23.308661,101.349297],[23.30788,101.347549],[23.3076,101.347076],[23.30723,101.346687],[23.305611,101.345879],[23.305229,101.345596],[23.304939,101.345253],[23.30475,101.344803],[23.304661,101.344322],[23.30468,101.343826],[23.304729,101.343597],[23.30492,101.343163],[23.305201,101.342789],[23.30537,101.342644],[23.306009,101.34227],[23.308861,101.341087],[23.309299,101.340843],[23.309669,101.3405],[23.309959,101.340073],[23.310141,101.3396],[23.31019,101.339104],[23.310141,101.338593],[23.30998,101.338097],[23.309719,101.337692],[23.309549,101.337517],[23.30913,101.337242],[23.308649,101.337067],[23.30817,101.337013],[23.30768,101.337082],[23.30719,101.337273],[23.305771,101.33799],[23.301991,101.340103],[23.30154,101.340286],[23.30106,101.340393],[23.30057,101.34037],[23.29932,101.340088],[23.29855,101.34005],[23.297001,101.340271],[23.29649,101.34024],[23.29598,101.340118],[23.293831,101.339027],[23.293381,101.338768],[23.29261,101.338577],[23.29154,101.338562],[23.288971,101.338783],[23.288191,101.338737],[23.287689,101.338608],[23.287201,101.338387],[23.28404,101.335876],[23.283569,101.335587],[23.283079,101.335388],[23.28257,101.335274],[23.282049,101.335251],[23.281521,101.33532],[23.28101,101.335487],[23.28054,101.335732],[23.27841,101.337212],[23.277769,101.337517],[23.277321,101.337593],[23.27689,101.337547],[23.27648,101.33741],[23.2761,101.337143],[23.27562,101.336594],[23.27515,101.335983],[23.27478,101.335617],[23.274361,101.335373],[23.274139,101.335289],[23.273899,101.335243],[23.273439,101.335251],[23.272051,101.335579],[23.27157,101.335564],[23.27112,101.335403],[23.27072,101.335167],[23.27021,101.334663],[23.26919,101.333076],[23.269051,101.332809],[23.26845,101.332222],[23.267771,101.331757],[23.267241,101.331573],[23.266479,101.33149],[23.265961,101.331558],[23.265221,101.331787],[23.263969,101.332336],[23.263201,101.332497],[23.261641,101.332603],[23.261129,101.332733],[23.260651,101.332947],[23.260201,101.333229],[23.26,101.333397],[23.259661,101.333832],[23.259109,101.334793],[23.259041,101.334999],[23.257879,101.336838],[23.25754,101.337242],[23.256929,101.337769],[23.25646,101.33802],[23.25596,101.338181],[23.255699,101.338219],[23.255159,101.338188],[23.25489,101.338142],[23.24906,101.335602],[23.248369,101.335197],[23.24132,101.329826],[23.24147,101.328873],[23.24135,101.32872],[23.24053,101.327087],[23.24011,101.326118],[23.2397,101.325417],[23.239361,101.325027],[23.23761,101.323486],[23.23728,101.323082],[23.23691,101.322357],[23.236731,101.321823],[23.236641,101.321274],[23.236641,101.320442],[23.23761,101.314987],[23.23786,101.314232],[23.238091,101.313751],[23.23838,101.313309],[23.238939,101.312729],[23.239361,101.312393],[23.240049,101.312019],[23.24082,101.311768],[23.241579,101.311661],[23.24288,101.311569],[23.24366,101.311401],[23.244169,101.311203],[23.24485,101.310791],[23.24724,101.308578],[23.249371,101.306458],[23.25046,101.305717],[23.2514,101.305183],[23.252029,101.304672],[23.25238,101.30426],[23.253401,101.302597],[23.25375,101.3022],[23.254169,101.301857],[23.25576,101.300957],[23.256809,101.300117],[23.25803,101.298683],[23.259621,101.296432],[23.26001,101.295692],[23.260309,101.294907],[23.260509,101.293823],[23.260599,101.28904],[23.260759,101.28791],[23.26182,101.283836],[23.26189,101.283279],[23.261841,101.282417],[23.26166,101.281563],[23.2612,101.280502],[23.25816,101.275703],[23.25787,101.27494],[23.25729,101.272781],[23.25692,101.271729],[23.256861,101.271446],[23.25684,101.270866],[23.25701,101.269768],[23.2575,101.267838],[23.257601,101.266983],[23.257561,101.265312],[23.25761,101.264763],[23.25774,101.264198],[23.25815,101.263153],[23.258499,101.261742],[23.259399,101.259422],[23.26021,101.255463],[23.2605,101.254677],[23.261391,101.253326],[23.26161,101.252808],[23.261709,101.252228],[23.26173,101.251953],[23.26165,101.251404],[23.26148,101.2509],[23.261221,101.25042],[23.257629,101.245293],[23.25453,101.24102],[23.25424,101.240463],[23.25411,101.240051],[23.25407,101.239372],[23.254141,101.238907],[23.25489,101.237106],[23.255079,101.236382],[23.255131,101.235603],[23.25507,101.234787],[23.25494,101.234009],[23.254641,101.232986],[23.253679,101.230522],[23.253099,101.228249],[23.25218,101.224899],[23.252119,101.224251],[23.252159,101.223793],[23.25227,101.223343],[23.25267,101.222473],[23.255369,101.21814],[23.25563,101.217392],[23.255819,101.216293],[23.255989,101.211189],[23.25593,101.210632],[23.255699,101.209801],[23.25515,101.208397],[23.255079,101.207947],[23.255119,101.207291],[23.25556,101.205559],[23.25559,101.204849],[23.255541,101.204369],[23.253651,101.197647],[23.25321,101.190193],[23.253139,101.189636],[23.252899,101.18885],[23.25223,101.187347],[23.252081,101.186821],[23.252029,101.186028],[23.252029,101.184959],[23.251909,101.184181],[23.251471,101.182693],[23.251419,101.182167],[23.251471,101.181671],[23.251711,101.180946],[23.25214,101.179993],[23.252359,101.179207],[23.25268,101.176117],[23.253679,101.172638],[23.253969,101.17189],[23.25404,101.171608],[23.25423,101.17112],[23.25482,101.170181],[23.255159,101.169746],[23.259211,101.165756],[23.259529,101.165337],[23.25967,101.165108],[23.2598,101.164597],[23.25979,101.164093],[23.258751,101.160049],[23.25845,101.159592],[23.258369,101.15921],[23.258289,101.158447],[23.258169,101.158096],[23.257179,101.156563],[23.25629,101.155159],[23.255951,101.154793],[23.255541,101.154503],[23.25308,101.15316],[23.24979,101.150223],[23.247089,101.148514],[23.246321,101.147751],[23.244961,101.146111],[23.244539,101.145798],[23.244101,101.145569],[23.243641,101.145447],[23.243139,101.145439],[23.237881,101.146713],[23.23527,101.146896],[23.23027,101.148399],[23.227171,101.148933],[23.226601,101.149139],[23.226101,101.149513],[23.225031,101.150719],[23.22471,101.150948],[23.22401,101.151237],[23.223459,101.151314],[23.2229,101.151283],[23.21833,101.149529],[23.217529,101.149437],[23.21492,101.150093],[23.214319,101.150146],[23.21393,101.150101],[23.213551,101.149986],[23.212259,101.149292],[23.211651,101.149101],[23.20582,101.149193],[23.20516,101.149101],[23.20451,101.148857],[23.20013,101.146408],[23.197161,101.144211],[23.196699,101.14399],[23.196171,101.143883],[23.19566,101.143867],[23.18998,101.145264],[23.18713,101.146263],[23.182751,101.14782],[23.18214,101.147957],[23.18144,101.147972],[23.17918,101.148079],[23.176701,101.148148],[23.176439,101.148087],[23.1756,101.147591],[23.173691,101.145157],[23.173109,101.144783],[23.17226,101.144508],[23.17214,101.144493],[23.171379,101.144051],[23.17091,101.143517],[23.17028,101.14193],[23.17,101.14164],[23.16972,101.141602],[23.169439,101.141708],[23.168489,101.142616],[23.168249,101.142776],[23.167931,101.142853],[23.16761,101.14283],[23.167219,101.142616],[23.166941,101.142342],[23.165541,101.140137],[23.165371,101.139969],[23.165131,101.139893],[23.1649,101.1399],[23.16469,101.140007],[23.164539,101.140213],[23.16445,101.14048],[23.16448,101.140793],[23.16538,101.143227],[23.16543,101.14357],[23.16539,101.143867],[23.165239,101.144112],[23.16502,101.14431],[23.16489,101.144363],[23.16461,101.144333],[23.16432,101.144157],[23.163019,101.142433],[23.16272,101.142174],[23.162319,101.142067],[23.16206,101.142113],[23.16169,101.142326],[23.16151,101.142563],[23.16139,101.143013],[23.161699,101.14537],[23.161659,101.145683],[23.161551,101.14595],[23.16135,101.146149],[23.16123,101.146217],[23.161091,101.14624],[23.16082,101.146202],[23.16057,101.146072],[23.160259,101.145714],[23.159731,101.144867],[23.159531,101.144707],[23.159149,101.144577],[23.157949,101.144608],[23.157829,101.144577],[23.15764,101.144417],[23.15748,101.144173],[23.15741,101.14389],[23.15745,101.143623],[23.157551,101.143349],[23.159639,101.140259],[23.159769,101.139923],[23.15979,101.139557],[23.159719,101.139076],[23.159531,101.138649],[23.15921,101.138329],[23.156639,101.137047],[23.156389,101.136993],[23.156059,101.137062],[23.1558,101.137283],[23.155689,101.137459],[23.1556,101.137772],[23.155609,101.138649],[23.155491,101.139977],[23.15535,101.140266],[23.15517,101.140411],[23.154699,101.140518],[23.153589,101.140503],[23.15336,101.140556],[23.153191,101.140694],[23.15309,101.140862],[23.152969,101.14135],[23.15296,101.141541],[23.152849,101.141853],[23.152651,101.142036],[23.15243,101.142143],[23.15204,101.142143],[23.15184,101.142113],[23.151449,101.142242],[23.1513,101.14238],[23.15011,101.145851],[23.149879,101.146141],[23.149561,101.146332],[23.149179,101.146339],[23.148781,101.146133],[23.14868,101.146019],[23.14852,101.145737],[23.148199,101.14447],[23.14818,101.144096],[23.148239,101.143761],[23.148491,101.14312],[23.148529,101.142517],[23.14846,101.142067],[23.147579,101.140503],[23.14716,101.139427],[23.146629,101.138603],[23.1465,101.13829],[23.146351,101.137589],[23.146191,101.137383],[23.1458,101.137131],[23.1457,101.137131],[23.14535,101.136864],[23.145149,101.136597],[23.14497,101.136078],[23.145,101.135048],[23.144831,101.134483],[23.144569,101.134003],[23.14341,101.13269],[23.14303,101.131958],[23.14296,101.131317],[23.142981,101.130791],[23.143021,101.13031],[23.14278,101.12957],[23.142031,101.128441],[23.14192,101.12812],[23.14188,101.127731],[23.14192,101.127457],[23.14204,101.12693],[23.141991,101.126511],[23.141701,101.125992],[23.140921,101.124786],[23.140791,101.124329],[23.140751,101.123627],[23.140591,101.123238],[23.13983,101.122459],[23.139219,101.122047],[23.13895,101.121941],[23.13866,101.12191],[23.137951,101.122078],[23.13674,101.122704],[23.135241,101.123283],[23.13401,101.123489],[23.133511,101.123459],[23.13283,101.123253],[23.13246,101.123253],[23.130779,101.123734],[23.130409,101.123901],[23.12991,101.124283],[23.12949,101.124657],[23.129351,101.124763],[23.128851,101.12487],[23.12851,101.124863],[23.126789,101.12442],[23.126419,101.124367],[23.12533,101.124573],[23.12499,101.124588],[23.12468,101.124496],[23.124411,101.124329],[23.124189,101.124077],[23.123911,101.123688],[23.123671,101.123543],[23.1227,101.12326],[23.12211,101.122917],[23.120399,101.121613],[23.119591,101.120728],[23.11902,101.120232],[23.117861,101.119186],[23.11676,101.118294],[23.11643,101.117828],[23.11591,101.116852],[23.115431,101.116112],[23.113951,101.11451],[23.113501,101.114166],[23.112789,101.11393],[23.112261,101.113762],[23.11195,101.113548],[23.111401,101.112953],[23.111071,101.112709],[23.110701,101.112541],[23.110331,101.112419],[23.11002,101.112228],[23.10965,101.111816],[23.10878,101.110573],[23.107849,101.109497],[23.107559,101.1091],[23.10708,101.108177],[23.10644,101.106758],[23.10614,101.105141],[23.106171,101.104942],[23.106541,101.103653],[23.10606,101.099571],[23.10594,101.099129],[23.105619,101.098534],[23.102871,101.095078],[23.102421,101.094269],[23.10216,101.093369],[23.10181,101.091087],[23.10194,101.087334],[23.101749,101.084717],[23.101681,101.084343],[23.10136,101.08358],[23.095289,101.071663],[23.092871,101.062553],[23.09272,101.062317],[23.092489,101.062149],[23.088921,101.061073],[23.08243,101.056297],[23.0809,101.055191],[23.080441,101.055038],[23.078341,101.055092],[23.07649,101.055237],[23.07522,101.055809],[23.074841,101.05587],[23.074341,101.055779],[23.073879,101.055496],[23.073151,101.054863],[23.07061,101.053688],[23.070391,101.053497],[23.07021,101.053238],[23.069651,101.050728],[23.069481,101.050293],[23.06922,101.050041],[23.06679,101.048531],[23.066,101.048271],[23.06559,101.048264],[23.065319,101.048363],[23.0651,101.048523],[23.06461,101.048958],[23.06423,101.049133],[23.063789,101.049156],[23.063459,101.049057],[23.062389,101.048508],[23.059759,101.048233],[23.058189,101.048424],[23.057249,101.048233],[23.05648,101.047813],[23.055799,101.047012],[23.05534,101.046501],[23.055099,101.046356],[23.05422,101.046242],[23.04863,101.048233],[23.04837,101.04837],[23.047871,101.048431],[23.02458,101.048302],[23.024071,101.048157],[23.02363,101.047836],[23.02182,101.045883],[23.01825,101.044289],[23.017651,101.044228],[23.010521,101.045853],[23.01018,101.045998],[23.009899,101.046257],[23.009689,101.0466],[23.00923,101.047546],[23.00905,101.047729],[23.008829,101.047852],[23.008591,101.047897],[23.008221,101.047829],[23.0072,101.047447],[23.00699,101.04744],[23.00671,101.047546],[23.00486,101.049133],[23.004459,101.049347],[23.004141,101.049469],[23.003429,101.049538],[23.002609,101.049538],[23.001209,101.0495],[22.99102,101.050056],[22.990601,101.050232],[22.988979,101.051308],[22.986931,101.052177],[22.983101,101.053596],[22.98258,101.053596],[22.98111,101.053093],[22.980881,101.052917],[22.98064,101.052544],[22.98027,101.051727],[22.980181,101.051598],[22.979851,101.051323],[22.977791,101.050697],[22.977329,101.050682],[22.97683,101.050743],[22.97641,101.05069],[22.976101,101.050507],[22.97517,101.049477],[22.975031,101.049393],[22.97488,101.049339],[22.97471,101.049347],[22.97455,101.049408],[22.974409,101.049507],[22.974291,101.049789],[22.974131,101.051559],[22.973989,101.051819],[22.9736,101.052063],[22.97324,101.052071],[22.97154,101.051743],[22.97117,101.05188],[22.97064,101.052979],[22.9704,101.053261],[22.9699,101.053467],[22.969589,101.053482],[22.96904,101.053253],[22.967541,101.051788],[22.96735,101.051491],[22.967199,101.050926],[22.96707,101.050056],[22.966869,101.04985],[22.96673,101.049789],[22.966591,101.049767],[22.966249,101.049873],[22.96386,101.051697],[22.9636,101.05175],[22.963301,101.051643],[22.959089,101.045609],[22.956141,101.043243],[22.95582,101.042763],[22.95554,101.041786],[22.955561,101.041611],[22.955469,101.041199],[22.95533,101.040993],[22.955111,101.040871],[22.95499,101.04084],[22.95459,101.040916],[22.95439,101.041054],[22.95409,101.041618],[22.95377,101.042618],[22.953621,101.0429],[22.9533,101.043198],[22.95293,101.043343],[22.952551,101.043373],[22.95105,101.043114],[22.94944,101.042679],[22.94734,101.042618],[22.945259,101.041969],[22.943899,101.041206],[22.9433,101.0411],[22.94108,101.041023],[22.940371,101.040817],[22.93914,101.040337],[22.938881,101.040291],[22.937981,101.040459],[22.937111,101.040733],[22.936819,101.040688],[22.93659,101.040581],[22.9363,101.040291],[22.935471,101.038452],[22.934389,101.037483],[22.93408,101.036903],[22.933861,101.03627],[22.93358,101.035828],[22.930759,101.033897],[22.928329,101.0327],[22.92807,101.032654],[22.92779,101.032707],[22.925079,101.034653],[22.923201,101.035942],[22.92071,101.03714],[22.91906,101.038437],[22.918779,101.038589],[22.91832,101.038673],[22.913601,101.038834],[22.90958,101.038292],[22.909451,101.0383],[22.907591,101.039146],[22.90667,101.039864],[22.906139,101.040077],[22.903391,101.040199],[22.9011,101.039917],[22.899839,101.04007],[22.898951,101.040367],[22.894341,101.042671],[22.892481,101.043266],[22.89069,101.044769],[22.890381,101.04493],[22.89023,101.044968],[22.89006,101.044968],[22.88994,101.044899],[22.88973,101.04493],[22.885571,101.044243],[22.885229,101.044144],[22.884729,101.044144],[22.883869,101.044243],[22.882971,101.044228],[22.88155,101.043968],[22.879829,101.044067],[22.87952,101.044228],[22.87929,101.044434],[22.879181,101.044807],[22.87919,101.045258],[22.87907,101.045502],[22.878929,101.045624],[22.878759,101.045647],[22.87855,101.045624],[22.87825,101.045418],[22.87788,101.044594],[22.877769,101.044441],[22.87748,101.044289],[22.87735,101.044273],[22.87706,101.044327],[22.87561,101.045067],[22.87435,101.045563],[22.874069,101.045738],[22.873659,101.046143],[22.87348,101.046463],[22.873461,101.046783],[22.87372,101.047661],[22.873671,101.048126],[22.873381,101.048607],[22.8731,101.049057],[22.87294,101.049553],[22.872959,101.049843],[22.87299,101.051071],[22.873091,101.051468],[22.87307,101.051727],[22.872841,101.052048],[22.87248,101.052231],[22.872129,101.052238],[22.871901,101.052139],[22.871731,101.05201],[22.87158,101.051781],[22.87137,101.051331],[22.870871,101.050537],[22.87031,101.050301],[22.87015,101.050247],[22.86977,101.050247],[22.868971,101.05014],[22.868629,101.050194],[22.86834,101.050377],[22.86783,101.051132],[22.867571,101.051727],[22.86725,101.052254],[22.86702,101.052406],[22.866871,101.052437],[22.86664,101.052406],[22.8664,101.052299],[22.86628,101.0522],[22.86537,101.051041],[22.864679,101.049889],[22.864491,101.049759],[22.86417,101.04966],[22.863911,101.049744],[22.863689,101.049896],[22.86302,101.050751],[22.862921,101.050842],[22.8627,101.050903],[22.862459,101.050858],[22.862341,101.050789],[22.862141,101.050583],[22.86179,101.049911],[22.86162,101.049759],[22.861549,101.049652],[22.861429,101.049568],[22.861179,101.04953],[22.860901,101.049637],[22.86054,101.050079],[22.860201,101.050247],[22.85998,101.050201],[22.859751,101.050087],[22.85951,101.049782],[22.85891,101.049133],[22.858801,101.048973],[22.85874,101.048752],[22.85858,101.04847],[22.85841,101.047997],[22.858,101.047462],[22.857731,101.047256],[22.85655,101.046967],[22.8563,101.046959],[22.855829,101.046768],[22.85537,101.04673],[22.854799,101.046623],[22.85006,101.045921],[22.845831,101.044746],[22.84557,101.044601],[22.84523,101.044167],[22.84511,101.043877],[22.845091,101.043388],[22.845209,101.042717],[22.84556,101.04084],[22.84547,101.039772],[22.84502,101.038681],[22.84433,101.037338],[22.844259,101.03698],[22.84441,101.03569],[22.84409,101.032707],[22.843941,101.032372],[22.84374,101.032219],[22.843361,101.032143],[22.84267,101.032249],[22.842449,101.032204],[22.84227,101.032082],[22.84207,101.03154],[22.84198,101.029114],[22.842051,101.028877],[22.842239,101.02861],[22.84289,101.028084],[22.843069,101.027802],[22.843121,101.027473],[22.842661,101.025063],[22.84259,101.023514],[22.8423,101.022087],[22.842039,101.021744],[22.841921,101.021637],[22.840469,101.021187],[22.83992,101.020882],[22.839251,101.020699],[22.83877,101.020607],[22.83643,101.020943],[22.83602,101.020882],[22.83543,101.020538],[22.835251,101.02018],[22.835159,101.019417],[22.835239,101.019051],[22.835609,101.018333],[22.835791,101.017487],[22.83559,101.016022],[22.835461,101.015701],[22.835409,101.015404],[22.83482,101.014267],[22.83457,101.014038],[22.83433,101.013992],[22.833139,101.014503],[22.83259,101.014458],[22.831869,101.014343],[22.83053,101.014374],[22.830259,101.014282],[22.83005,101.014122],[22.82991,101.013893],[22.82984,101.013634],[22.829969,101.011917],[22.829901,101.011574],[22.829679,101.011261],[22.82835,101.010513],[22.82818,101.01033],[22.82806,101.010017],[22.828091,101.009712],[22.82819,101.009499],[22.828621,101.008827],[22.82872,101.008507],[22.828699,101.008148],[22.828489,101.007767],[22.828329,101.007561],[22.828199,101.007271],[22.82818,101.006958],[22.828251,101.006508],[22.82892,101.004562],[22.828939,101.004387],[22.82892,101.004211],[22.82877,101.003937],[22.828609,101.00386],[22.82851,101.003838],[22.827129,101.004417],[22.82692,101.004593],[22.8267,101.004982],[22.82649,101.006523],[22.82633,101.00679],[22.82616,101.006943],[22.82592,101.007004],[22.825689,101.006958],[22.82403,101.006088],[22.823681,101.00605],[22.82346,101.006119],[22.82337,101.006187],[22.82324,101.006432],[22.823219,101.006813],[22.82399,101.008453],[22.82399,101.008774],[22.823879,101.008957],[22.823681,101.009087],[22.82329,101.009109],[22.822479,101.008789],[22.8221,101.00872],[22.82177,101.008583],[22.821529,101.008583],[22.820789,101.008713],[22.81996,101.008583],[22.81974,101.008629],[22.81953,101.008781],[22.81933,101.009148],[22.819201,101.009819],[22.818939,101.010223],[22.81875,101.01033],[22.81855,101.010323],[22.81834,101.010223],[22.81811,101.009933],[22.81785,101.008659],[22.817579,101.008057],[22.817181,101.007607],[22.81698,101.007149],[22.816971,101.006393],[22.817101,101.005531],[22.81698,101.004761],[22.81669,101.004066],[22.81662,101.003967],[22.816351,101.003433],[22.816111,101.00322],[22.8158,101.003128],[22.815439,101.003159],[22.81422,101.003883],[22.813881,101.003998],[22.81366,101.004013],[22.813259,101.003754],[22.81312,101.00354],[22.813089,101.003281],[22.813181,101.002853],[22.813629,101.002243],[22.81424,101.001587],[22.814421,101.00119],[22.81451,100.999588],[22.81435,100.99884],[22.813931,100.997803],[22.81389,100.997131],[22.8141,100.995453],[22.81406,100.995247],[22.813869,100.99498],[22.81354,100.994713],[22.812071,100.994713],[22.811621,100.994812],[22.811399,100.994797],[22.811131,100.994667],[22.811001,100.994537],[22.810301,100.993599],[22.810169,100.99321],[22.809681,100.992577],[22.808121,100.991653],[22.80743,100.990997],[22.80442,100.986687],[22.803289,100.985558],[22.800989,100.9842],[22.79668,100.982613],[22.79608,100.982559],[22.795641,100.98262],[22.79413,100.983139],[22.79402,100.983147],[22.78949,100.984673],[22.78833,100.984734],[22.78718,100.984337],[22.786381,100.98378],[22.785009,100.982468],[22.783701,100.981873],[22.78307,100.981773],[22.778049,100.982323],[22.775881,100.981888],[22.773491,100.98156],[22.77161,100.981628],[22.770651,100.981438],[22.76981,100.98101],[22.769211,100.980476],[22.76837,100.979477],[22.76026,100.960899],[22.757999,100.955803],[22.757441,100.955391],[22.75708,100.955048],[22.75721,100.954697],[22.757549,100.954514],[22.75704,100.954567],[22.755301,100.954819],[22.75485,100.955139],[22.7547,100.95517],[22.75456,100.955002],[22.75416,100.954086],[22.7537,100.952957],[22.75363,100.952232],[22.753639,100.951859],[22.753731,100.95031],[22.75379,100.949226],[22.75386,100.948143],[22.753901,100.947762],[22.754181,100.947342],[22.754499,100.947273],[22.75466,100.947357],[22.75481,100.947609],[22.754841,100.947906],[22.754721,100.948082],[22.75465,100.948151],[22.75444,100.948288],[22.75411,100.948311],[22.753559,100.948311],[22.751921,100.947998],[22.75135,100.947693],[22.74992,100.946747],[22.74894,100.945709],[22.74827,100.944641],[22.74794,100.943817],[22.747869,100.943604],[22.747629,100.942703],[22.74728,100.940529],[22.747,100.939323],[22.746799,100.938171],[22.74645,100.937271],[22.74609,100.936653],[22.74593,100.936523],[22.74559,100.936256],[22.745041,100.935921],[22.744431,100.935699],[22.743589,100.935547],[22.74295,100.935478],[22.742531,100.935432],[22.742319,100.93541],[22.74148,100.935318],[22.740669,100.935219],[22.73987,100.935173],[22.73967,100.935181],[22.738371,100.935532],[22.737089,100.935951],[22.737221,100.937561],[22.736879,100.938103],[22.736759,100.93824],[22.736469,100.938568],[22.735411,100.939491],[22.735109,100.939758],[22.73385,100.938789],[22.73255,100.937866],[22.73188,100.937424],[22.7313,100.937263],[22.73031,100.937019],[22.72901,100.936897],[22.72834,100.93692],[22.727659,100.936996],[22.726971,100.937157],[22.72587,100.937553],[22.725189,100.937759],[22.72473,100.937843],[22.72377,100.937927],[22.723061,100.937889],[22.72282,100.937859],[22.72212,100.937721],[22.721439,100.937607],[22.72052,100.937538],[22.71982,100.937569],[22.718861,100.937721],[22.71837,100.937798],[22.71788,100.937851],[22.71763,100.937859],[22.716881,100.937851],[22.716391,100.937813],[22.715691,100.937683],[22.714161,100.937149],[22.71335,100.936859],[22.70923,100.935532],[22.706129,100.935272],[22.7059,100.935303],[22.70228,100.935913],[22.698429,100.936508],[22.697969,100.936501],[22.695841,100.935799],[22.69434,100.934319],[22.693859,100.933487],[22.692881,100.931847],[22.692579,100.931488],[22.69058,100.929947],[22.688129,100.929352],[22.687429,100.929367],[22.686251,100.929581],[22.68441,100.93026],[22.684179,100.930351],[22.6835,100.930618],[22.68281,100.93087],[22.681641,100.931152],[22.680941,100.93116],[22.68004,100.930992],[22.678801,100.930367],[22.67804,100.92984],[22.677851,100.92971],[22.675659,100.928902],[22.67326,100.929527],[22.673059,100.929657],[22.672211,100.930489],[22.671471,100.931808],[22.67083,100.933502],[22.67029,100.934967],[22.66975,100.936409],[22.669571,100.936882],[22.668791,100.938911],[22.668209,100.940453],[22.667789,100.941566],[22.667259,100.942947],[22.666759,100.944099],[22.666229,100.944946],[22.66468,100.94651],[22.664499,100.946678],[22.663601,100.9478],[22.6632,100.94841],[22.66169,100.949921],[22.661079,100.950256],[22.65884,100.951897],[22.65867,100.952042],[22.65498,100.95533],[22.652889,100.957962],[22.650261,100.962303],[22.649429,100.963142],[22.646749,100.965019],[22.64267,100.968117],[22.637991,100.972588],[22.635099,100.975403],[22.634501,100.975807],[22.63336,100.976723],[22.632851,100.977272],[22.63204,100.97821],[22.630671,100.979149],[22.62907,100.979347],[22.626699,100.979889],[22.62571,100.98082],[22.625561,100.981003],[22.625271,100.981339],[22.624451,100.982117],[22.621981,100.983459],[22.621571,100.983727],[22.62063,100.984596],[22.62031,100.985008],[22.619671,100.986153],[22.619551,100.986382],[22.61792,100.989319],[22.617081,100.990868],[22.616619,100.99173],[22.615801,100.99321],[22.615339,100.994034],[22.613991,100.99749],[22.61388,100.99794],[22.613501,101.000053],[22.613371,101.000763],[22.612659,101.004387],[22.612049,101.00573],[22.611759,101.006104],[22.610201,101.00721],[22.609751,101.007362],[22.607679,101.007797],[22.606541,101.008034],[22.605619,101.008209],[22.604639,101.006989],[22.60265,101.008003],[22.602079,101.008499],[22.601891,101.008682],[22.600941,101.009567],[22.60054,101.009903],[22.599701,101.010483],[22.599489,101.010628],[22.598221,101.011467],[22.59697,101.012291],[22.595961,101.013023],[22.5944,101.014282],[22.5931,101.015518],[22.59235,101.016289],[22.591801,101.016899],[22.591261,101.017517],[22.590919,101.01796],[22.59057,101.018387],[22.59005,101.01902],[22.589531,101.019653],[22.58902,101.020264],[22.58886,101.020462],[22.58802,101.021461],[22.58716,101.0224],[22.5863,101.023323],[22.5856,101.024063],[22.58543,101.024239],[22.58489,101.024803],[22.583969,101.025703],[22.583059,101.026604],[22.582319,101.027351],[22.58213,101.027542],[22.58135,101.02832],[22.580959,101.028717],[22.58037,101.029327],[22.579769,101.02993],[22.579161,101.03051],[22.578529,101.031021],[22.577629,101.031601],[22.576929,101.031967],[22.57407,101.032806],[22.57268,101.033127],[22.569481,101.033974],[22.566851,101.035629],[22.564631,101.038254],[22.562571,101.04084],[22.561569,101.042],[22.56105,101.042549],[22.55653,101.046677],[22.551979,101.050056],[22.549089,101.051498],[22.54871,101.051857],[22.547211,101.054031],[22.545851,101.055611],[22.54336,101.057426],[22.538851,101.060677],[22.536671,101.062241],[22.535339,101.063202],[22.53406,101.064117],[22.53334,101.064636],[22.533159,101.064774],[22.532261,101.065422],[22.530951,101.066353],[22.53075,101.06649],[22.52914,101.067642],[22.527901,101.068542],[22.52706,101.069153],[22.525999,101.069908],[22.52557,101.070213],[22.524731,101.070824],[22.523899,101.071411],[22.523279,101.071854],[22.52087,101.073593],[22.519039,101.074821],[22.515511,101.076576],[22.51333,101.077263],[22.51284,101.077393],[22.507811,101.078346],[22.502991,101.079971],[22.4993,101.081062],[22.49831,101.081284],[22.497311,101.081467],[22.49608,101.081688],[22.4951,101.081871],[22.49365,101.082123],[22.49098,101.082588],[22.49074,101.082626],[22.48781,101.08316],[22.48311,101.084023],[22.479179,101.084732],[22.47846,101.084869],[22.47751,101.085037],[22.47727,101.085091],[22.474871,101.085403],[22.472151,101.084801],[22.47193,101.084686],[22.469971,101.083214],[22.46851,101.081123],[22.46838,101.080887],[22.46525,101.076134],[22.46405,101.075218],[22.46118,101.073936],[22.46097,101.07383],[22.46055,101.073578],[22.46015,101.073303],[22.45813,101.071114],[22.454941,101.066788],[22.45241,101.063629],[22.451441,101.062912],[22.450809,101.062576],[22.450399,101.062378],[22.449249,101.061684],[22.44907,101.061531],[22.448311,101.060661],[22.44747,101.058617],[22.44726,101.057877],[22.447041,101.057114],[22.446621,101.055618],[22.44656,101.055382],[22.44626,101.054199],[22.446159,101.053268],[22.44618,101.052567],[22.446199,101.052338],[22.44644,101.051201],[22.44669,101.050537],[22.446791,101.050323],[22.44743,101.049301],[22.44944,101.047501],[22.45256,101.045052],[22.45421,101.043716],[22.45508,101.042671],[22.455469,101.041603],[22.45558,101.040413],[22.455441,101.039482],[22.455299,101.039047],[22.454571,101.037857],[22.453421,101.036743],[22.452419,101.035797],[22.451059,101.034531],[22.44902,101.032204],[22.448139,101.03109],[22.448,101.030907],[22.447321,101.030052],[22.446791,101.029404],[22.446239,101.028793],[22.445601,101.028267],[22.445089,101.027977],[22.44455,101.027733],[22.44379,101.027473],[22.442869,101.027039],[22.44202,101.026077],[22.441919,101.025887],[22.440689,101.022301],[22.439899,101.018692],[22.43993,101.01844],[22.44076,101.016403],[22.441521,101.014671],[22.441589,101.013519],[22.441429,101.012611],[22.441191,101.011757],[22.440969,101.010933],[22.44091,101.010727],[22.440741,101.010117],[22.44063,101.009697],[22.44046,101.009087],[22.440399,101.008888],[22.44026,101.008293],[22.43997,101.007103],[22.43926,101.005013],[22.438971,101.004204],[22.43878,101.003777],[22.43825,101.003036],[22.43762,101.002419],[22.437071,101.002037],[22.435881,101.001503],[22.43569,101.001411],[22.43453,101.000877],[22.432699,101.00032],[22.431379,100.999817],[22.429871,100.999237],[22.429649,100.999161],[22.42835,100.998688],[22.42729,100.998253],[22.425751,100.997887],[22.425079,100.997864],[22.424191,100.99781],[22.422859,100.997726],[22.42264,100.997711],[22.42198,100.997673],[22.42152,100.996429],[22.421169,100.995857],[22.420839,100.995033],[22.420691,100.994614],[22.420389,100.993767],[22.42004,100.992973],[22.41968,100.992416],[22.41955,100.992264],[22.41909,100.991814],[22.418539,100.991493],[22.41814,100.991341],[22.417721,100.991249],[22.416821,100.99128],[22.41659,100.991333],[22.414579,100.991943],[22.413879,100.992104],[22.41272,100.992363],[22.412491,100.992409],[22.412029,100.992523],[22.411489,100.99173],[22.410629,100.991402],[22.409349,100.990982],[22.408449,100.990921],[22.40686,100.991699],[22.406151,100.992973],[22.406,100.993713],[22.40591,100.994217],[22.40572,100.995506],[22.405109,100.997917],[22.40416,100.998901],[22.403561,100.999229],[22.40292,100.999512],[22.40205,100.999962],[22.40163,101.000214],[22.401421,101.000351],[22.400829,101.000778],[22.40065,101.000923],[22.399929,101.001457],[22.398781,101.001991],[22.39797,101.001999],[22.39777,101.001953],[22.39657,101.001633],[22.396379,101.001579],[22.39558,101.001373],[22.39538,101.001312],[22.39526,100.999611],[22.394581,100.999031],[22.39352,100.99868],[22.39287,100.998627],[22.39201,100.998672],[22.391159,100.998779],[22.390329,100.998871],[22.389509,100.99894],[22.38932,100.998947],[22.38833,100.999069],[22.38817,100.999077],[22.38769,100.999107],[22.386909,100.999184],[22.386049,100.999191],[22.385309,100.99913],[22.38492,100.999077],[22.384109,100.998894],[22.38331,100.998627],[22.38269,100.998428],[22.382271,100.998299],[22.38162,100.9981],[22.381399,100.998016],[22.379789,100.997589],[22.37746,100.997719],[22.37701,100.997803],[22.37565,100.99794],[22.374069,100.997757],[22.371149,100.996773],[22.36879,100.996872],[22.36677,100.998077],[22.36544,100.998917],[22.363939,100.999222],[22.36371,100.999207],[22.361771,100.998497],[22.361561,100.998383],[22.36068,100.997917],[22.35667,100.996277],[22.355659,100.996132],[22.35545,100.996094],[22.3552,100.996048],[22.35351,100.995506],[22.352989,100.995354],[22.35206,100.994911],[22.351191,100.9944],[22.350361,100.99382],[22.349239,100.992828],[22.3489,100.992477],[22.347679,100.990936],[22.34753,100.990723],[22.347231,100.990303],[22.3466,100.989418],[22.346451,100.989197],[22.345881,100.988319],[22.3456,100.987877],[22.344879,100.987053],[22.34469,100.986832],[22.3444,100.986397],[22.343929,100.985764],[22.34325,100.984917],[22.342899,100.98452],[22.34236,100.983963],[22.341551,100.983261],[22.341339,100.983093],[22.340931,100.982758],[22.340309,100.982277],[22.33968,100.98185],[22.33882,100.981354],[22.337931,100.980911],[22.337259,100.980621],[22.33658,100.980331],[22.335899,100.980011],[22.335011,100.979507],[22.334351,100.979088],[22.333929,100.978783],[22.333309,100.978302],[22.33271,100.977814],[22.332319,100.97747],[22.33115,100.976021],[22.33066,100.975357],[22.33033,100.974922],[22.32984,100.974281],[22.32935,100.97364],[22.328871,100.973007],[22.328541,100.972603],[22.328211,100.972168],[22.327511,100.971367],[22.32696,100.970787],[22.32638,100.970261],[22.325781,100.969727],[22.32449,100.968719],[22.323839,100.968231],[22.322981,100.967537],[22.32235,100.966988],[22.32173,100.966423],[22.32111,100.965813],[22.320511,100.965157],[22.31974,100.964256],[22.319361,100.963791],[22.319,100.963318],[22.31883,100.963081],[22.318489,100.962601],[22.318001,100.961853],[22.317539,100.961113],[22.31683,100.959846],[22.3167,100.959587],[22.316441,100.959053],[22.31583,100.95768],[22.315411,100.956596],[22.31521,100.956093],[22.314989,100.955597],[22.314751,100.955116],[22.31435,100.954437],[22.31389,100.953796],[22.31356,100.953377],[22.3132,100.953003],[22.313021,100.952812],[22.312639,100.952461],[22.312241,100.952141],[22.31143,100.951508],[22.310619,100.950844],[22.309799,100.950172],[22.30938,100.949837],[22.30875,100.949333],[22.30834,100.948967],[22.30776,100.948433],[22.307011,100.947678],[22.30665,100.947304],[22.30629,100.94693],[22.305771,100.946358],[22.30448,100.944847],[22.302361,100.942863],[22.30135,100.942192],[22.300039,100.941544],[22.29891,100.941139],[22.298679,100.941078],[22.29401,100.939636],[22.29364,100.939407],[22.29315,100.939018],[22.292601,100.938454],[22.292191,100.937828],[22.291941,100.937363],[22.29166,100.936699],[22.29142,100.936028],[22.291241,100.935516],[22.291,100.934837],[22.290689,100.933968],[22.29043,100.933243],[22.290171,100.932518],[22.289909,100.931793],[22.28965,100.931053],[22.28944,100.930489],[22.289181,100.929733],[22.288919,100.92897],[22.288719,100.928398],[22.288429,100.927658],[22.288191,100.927109],[22.28772,100.926224],[22.28751,100.925888],[22.28701,100.925056],[22.286711,100.924561],[22.286501,100.924217],[22.2857,100.922897],[22.283091,100.922768],[22.2829,100.922638],[22.282551,100.92234],[22.282061,100.921547],[22.28171,100.920723],[22.281401,100.919838],[22.28109,100.919243],[22.280649,100.918709],[22.280479,100.918556],[22.279711,100.918083],[22.27906,100.917793],[22.27845,100.917397],[22.27788,100.916908],[22.27706,100.91597],[22.276711,100.915627],[22.27635,100.915314],[22.275961,100.915047],[22.275339,100.914749],[22.274691,100.91449],[22.27426,100.914291],[22.273479,100.913727],[22.27298,100.913193],[22.27249,100.912582],[22.271811,100.911751],[22.271299,100.911133],[22.2708,100.9105],[22.270121,100.909691],[22.269621,100.909081],[22.26911,100.908478],[22.2686,100.907867],[22.267941,100.907059],[22.26745,100.906471],[22.26729,100.906281],[22.266529,100.905327],[22.26638,100.905159],[22.266109,100.904793],[22.265181,100.903084],[22.26512,100.902878],[22.26486,100.901817],[22.264759,100.901176],[22.264681,100.900543],[22.26461,100.900162],[22.264441,100.899437],[22.264219,100.898758],[22.264151,100.89859],[22.263769,100.897781],[22.262951,100.896568],[22.26133,100.89476],[22.25939,100.892632],[22.257799,100.890877],[22.25618,100.889526],[22.254049,100.888847],[22.252899,100.888924],[22.249889,100.889832],[22.24725,100.890663],[22.24247,100.892181],[22.24225,100.89225],[22.241619,100.892464],[22.240801,100.892723],[22.240601,100.892776],[22.239651,100.893082],[22.23909,100.89325],[22.237379,100.893532],[22.23546,100.892883],[22.233191,100.891357],[22.23279,100.891243],[22.229931,100.891037],[22.227671,100.891037],[22.22744,100.891037],[22.22624,100.890999],[22.226,100.890961],[22.22529,100.890846],[22.224819,100.890739],[22.222071,100.889473],[22.221689,100.889198],[22.220579,100.88842],[22.217211,100.886803],[22.216749,100.886673],[22.21537,100.886177],[22.215151,100.88607],[22.213539,100.884918],[22.21335,100.884743],[22.21269,100.883972],[22.211559,100.88224],[22.21076,100.881287],[22.209181,100.880188],[22.20785,100.879623],[22.20566,100.878441],[22.20363,100.876953],[22.20343,100.876793],[22.20179,100.875679],[22.20072,100.875061],[22.199169,100.874298],[22.19618,100.873253],[22.19453,100.872864],[22.192659,100.872551],[22.191271,100.872337],[22.189659,100.872108],[22.18873,100.872002],[22.18466,100.871529],[22.184441,100.871552],[22.18379,100.871658],[22.18276,100.872009],[22.18195,100.872292],[22.181749,100.872353],[22.18115,100.872498],[22.18075,100.872551],[22.17971,100.872528],[22.1782,100.872253],[22.17522,100.871643],[22.17458,100.871513],[22.1733,100.871239],[22.172661,100.871101],[22.17029,100.87149],[22.168579,100.872566],[22.16478,100.875488],[22.164101,100.877136],[22.164101,100.878738],[22.16431,100.880547],[22.163891,100.882553],[22.162741,100.884567],[22.16111,100.888344],[22.15967,100.889977],[22.15947,100.890106],[22.15798,100.8908],[22.156429,100.891068],[22.154831,100.890587],[22.15423,100.890297],[22.15365,100.889992],[22.15346,100.889893],[22.15308,100.889687],[22.1521,100.889374],[22.1511,100.889267],[22.1509,100.889297],[22.15032,100.889381],[22.149731,100.889503],[22.1486,100.889763],[22.147829,100.889931],[22.146811,100.890137],[22.146601,100.890182],[22.1453,100.890213],[22.1434,100.889481],[22.141661,100.88871],[22.14024,100.888573],[22.13888,100.88858],[22.13842,100.888573],[22.136339,100.888329],[22.13586,100.888229],[22.13463,100.888077],[22.133619,100.88813],[22.133141,100.88826],[22.132429,100.888542],[22.13179,100.888947],[22.13122,100.889442],[22.13084,100.889793],[22.130289,100.890343],[22.13011,100.890518],[22.129749,100.890877],[22.12937,100.891243],[22.12919,100.891434],[22.128811,100.891777],[22.128059,100.892509],[22.12748,100.893066],[22.127279,100.893272],[22.12668,100.893837],[22.125839,100.894562],[22.125389,100.894897],[22.124491,100.895523],[22.12426,100.895668],[22.123569,100.896049],[22.12311,100.896271],[22.122881,100.896378],[22.121969,100.896767],[22.12151,100.896927],[22.121059,100.897087],[22.120359,100.897293],[22.1199,100.8974],[22.119209,100.897537],[22.118031,100.897697],[22.117319,100.897758],[22.117081,100.897774],[22.116381,100.897797],[22.115919,100.897781],[22.115219,100.897751],[22.114771,100.897697],[22.11454,100.897667],[22.113411,100.897438],[22.113171,100.897377],[22.112221,100.897087],[22.1113,100.896767],[22.109541,100.896072],[22.109329,100.896004],[22.108931,100.895844],[22.107821,100.895363],[22.10671,100.894867],[22.1063,100.894707],[22.105659,100.894447],[22.104509,100.894028],[22.10401,100.893913],[22.102751,100.893784],[22.102249,100.893806],[22.10034,100.894386],[22.09577,100.896683],[22.09535,100.896889],[22.09514,100.897003],[22.091,100.899063],[22.09016,100.899467],[22.08934,100.899872],[22.0875,100.90078],[22.086281,100.901398],[22.086069,100.901497],[22.084459,100.90229],[22.082359,100.903587],[22.08218,100.90374],[22.080879,100.904747],[22.08029,100.905144],[22.079691,100.905487],[22.07802,100.906349],[22.076559,100.907097],[22.074671,100.908073],[22.074459,100.90818],[22.07284,100.909088],[22.072651,100.909233],[22.071779,100.910347],[22.07155,100.911049],[22.07114,100.91275],[22.07007,100.914352],[22.06971,100.914612],[22.06798,100.915222],[22.06732,100.915314],[22.06707,100.915398],[22.067011,100.915398],[22.066839,100.915367],[22.06671,100.915428],[22.06671,100.915428],[22.066191,100.915527],[22.065809,100.915627],[22.065701,100.915657],[22.0648,100.915863],[22.064171,100.915993],[22.06389,100.916054],[22.063181,100.916206],[22.06303,100.916252],[22.06241,100.916389],[22.06175,100.916527],[22.061239,100.916649],[22.059919,100.916832],[22.05904,100.916962],[22.05825,100.916946],[22.05735,100.916603],[22.05529,100.916061],[22.052691,100.91539],[22.043591,100.899223],[22.04199,100.896301],[22.040911,100.894302],[22.04068,100.893753],[22.04048,100.893158],[22.040251,100.892387],[22.04018,100.892197],[22.03977,100.891548],[22.039471,100.891258],[22.03857,100.890778],[22.03838,100.890678],[22.037889,100.890312],[22.037439,100.889587],[22.037371,100.889359],[22.03727,100.888687],[22.03849,100.887321],[22.038231,100.886932],[22.03797,100.886543],[22.03784,100.886353],[22.037319,100.885567],[22.03694,100.884987],[22.0368,100.884804],[22.03665,100.884613],[22.03618,100.885109],[22.035931,100.885269],[22.03573,100.885452],[22.035629,100.886169],[22.035851,100.886627],[22.036329,100.887131],[22.03694,100.887589],[22.037371,100.887947],[22.037769,100.888542],[22.038059,100.889397],[22.038601,100.890022],[22.038759,100.890091],[22.03908,100.890213],[22.039551,100.890381],[22.039709,100.890427],[22.040171,100.890617],[22.04055,100.890907],[22.04085,100.891487],[22.04088,100.891983],[22.040859,100.892303],[22.041019,100.893082],[22.04133,100.893448],[22.04187,100.893829],[22.042009,100.893929],[22.04236,100.894287],[22.042669,100.894897],[22.042761,100.895416],[22.04281,100.89608],[22.04302,100.896843],[22.043171,100.8974],[22.043329,100.897919],[22.04336,100.898033],[22.04343,100.898308],[22.043329,100.898941],[22.043221,100.899231],[22.04311,100.89959],[22.04307,100.899696],[22.042959,100.900017],[22.042801,100.900459],[22.04266,100.901329],[22.04273,100.901848],[22.042891,100.902496],[22.043011,100.903023],[22.04307,100.90329],[22.0431,100.903831],[22.04306,100.904114],[22.04298,100.904373],[22.042709,100.904846],[22.0425,100.905212],[22.042471,100.90583],[22.042601,100.906067],[22.042801,100.906258],[22.043329,100.906708],[22.04343,100.906807],[22.0436,100.907654],[22.04347,100.907928],[22.0432,100.908363],[22.042931,100.908813],[22.042509,100.909538],[22.042471,100.910461],[22.0427,100.910889],[22.042801,100.911018],[22.04372,100.911949],[22.043859,100.912079],[22.044359,100.912582],[22.04472,100.913528],[22.04451,100.913986],[22.04413,100.91433],[22.043119,100.915154],[22.04287,100.915573],[22.04269,100.916199],[22.04266,100.916359],[22.042521,100.917137],[22.04232,100.917717],[22.042139,100.918114],[22.04208,100.918228],[22.041771,100.919312],[22.041821,100.920036],[22.041901,100.920273],[22.04212,100.920998],[22.041929,100.921722],[22.041439,100.922592],[22.04129,100.924171],[22.04126,100.92466],[22.04137,100.925926],[22.041439,100.926308],[22.0415,100.928253],[22.041519,100.929138],[22.04121,100.929947],[22.0408,100.930191],[22.038839,100.931381],[22.03824,100.932617],[22.03816,100.932838],[22.03783,100.933723],[22.0376,100.93438],[22.03727,100.935242],[22.037001,100.935867],[22.03648,100.936867],[22.035589,100.938187],[22.03503,100.938904],[22.03474,100.939247],[22.03359,100.940689],[22.03301,100.941406],[22.032301,100.942299],[22.031099,100.943787],[22.03026,100.94487],[22.029539,100.945839],[22.029261,100.946281],[22.029091,100.946602],[22.02861,100.94767],[22.028391,100.948227],[22.02833,100.948433],[22.02803,100.949387],[22.02774,100.950394],[22.027679,100.950592],[22.02737,100.95163],[22.027,100.952888],[22.026939,100.953102],[22.0266,100.954163],[22.026011,100.955406],[22.02549,100.956146],[22.02519,100.956497],[22.02504,100.956673],[22.02302,100.958931],[22.02248,100.959717],[22.02177,100.960983],[22.021351,100.961884],[22.021231,100.962097],[22.020651,100.963203],[22.019051,100.965302],[22.01857,100.965767],[22.017229,100.967117],[22.016939,100.967453],[22.01679,100.967613],[22.016109,100.968483],[22.01552,100.96946],[22.015409,100.969658],[22.015011,100.970444],[22.01482,100.970802],[22.014271,100.971931],[22.014071,100.972328],[22.013821,100.972816],[22.013639,100.97316],[22.01335,100.973732],[22.01317,100.974136],[22.01281,100.974823],[22.011311,100.976913],[22.011169,100.977074],[22.010731,100.977562],[22.01045,100.97789],[22.010059,100.978409],[22.00983,100.978767],[22.00942,100.979523],[22.00905,100.980263],[22.0086,100.981056],[22.008369,100.981331],[22.00786,100.981812],[22.007601,100.982002],[22.007469,100.982094],[22.00699,100.982437],[22.006559,100.982841],[22.00647,100.982948],[22.005951,100.983681],[22.005751,100.9841],[22.005449,100.985153],[22.005381,100.985611],[22.00523,100.986397],[22.0049,100.987267],[22.00474,100.987556],[22.00428,100.98819],[22.00396,100.988487],[22.003151,100.989082],[22.00243,100.989517],[22.001011,100.990921],[22.000919,100.991051],[22.000191,100.992073],[21.99983,100.992554],[21.99975,100.992683],[21.999149,100.993523],[21.99906,100.993629],[21.998871,100.993843],[21.99811,100.994507],[21.99707,100.995071],[21.99651,100.995293],[21.995951,100.995506],[21.995399,100.995743],[21.99486,100.995956],[21.99436,100.996239],[21.992809,100.99765],[21.992701,100.99781],[21.99198,100.998779],[21.99185,100.998947],[21.99131,100.999641],[21.99102,100.999992],[21.990459,101.000717],[21.9888,101.00293],[21.98838,101.003487],[21.98786,101.003998],[21.987049,101.004883],[21.98671,101.005211],[21.986349,101.005539],[21.986179,101.005699],[21.98562,101.006172],[21.98525,101.006493],[21.984249,101.007271],[21.983841,101.007568],[21.98321,101.008003],[21.98258,101.008438],[21.98197,101.008873],[21.98177,101.009018],[21.98078,101.009811],[21.97967,101.010818],[21.976709,101.013283],[21.97607,101.013962],[21.975679,101.014252],[21.97489,101.014801],[21.97427,101.015198],[21.973869,101.015503],[21.973471,101.015793],[21.973101,101.016113],[21.97262,101.016701],[21.97249,101.016899],[21.97216,101.017563],[21.972071,101.017776],[21.971621,101.01918],[21.97146,101.019653],[21.971149,101.020576],[21.970921,101.021278],[21.97084,101.021507],[21.9706,101.022209],[21.97053,101.022453],[21.970289,101.02314],[21.970209,101.023376],[21.96982,101.024544],[21.969509,101.025467],[21.96785,101.026176],[21.967251,101.026573],[21.96661,101.026871],[21.966169,101.027061],[21.965309,101.027412],[21.96509,101.027496],[21.96422,101.027847],[21.964001,101.027946],[21.96335,101.028214],[21.9627,101.028503],[21.96207,101.028816],[21.961081,101.02951],[21.959749,101.030479],[21.95956,101.030617],[21.95937,101.031616],[21.95859,101.033081],[21.95812,101.034248],[21.95792,101.034698],[21.957279,101.035843],[21.956381,101.037048],[21.95595,101.037666],[21.95558,101.038307],[21.955469,101.038544],[21.955259,101.038979],[21.95509,101.039436],[21.954941,101.039902],[21.954729,101.040619],[21.95439,101.041817],[21.95418,101.042542],[21.95396,101.043243],[21.953409,101.044312],[21.953291,101.04451],[21.95188,101.046097],[21.95171,101.046272],[21.950581,101.047478],[21.95042,101.047653],[21.94935,101.048798],[21.94685,101.05146],[21.946529,101.051804],[21.94636,101.051964],[21.94483,101.053726],[21.94429,101.054443],[21.943529,101.055481],[21.943279,101.055817],[21.942329,101.057137],[21.942209,101.057312],[21.941851,101.0578],[21.941481,101.058273],[21.94095,101.058861],[21.940399,101.059402],[21.940269,101.05954],[21.939581,101.060219],[21.93902,101.060753],[21.93784,101.061127],[21.936701,101.061577],[21.93651,101.061684],[21.935301,101.062218],[21.933491,101.063057],[21.933109,101.063278],[21.930639,101.065109],[21.929501,101.066231],[21.92934,101.066391],[21.92901,101.066727],[21.92783,101.067917],[21.926649,101.069092],[21.925051,101.07045],[21.923241,101.071693],[21.921989,101.072533],[21.92062,101.073593],[21.92009,101.074112],[21.919189,101.075279],[21.917681,101.078453],[21.91642,101.081444],[21.916321,101.081673],[21.91571,101.083008],[21.915051,101.084587],[21.914379,101.087097],[21.914391,101.08876],[21.91444,101.089287],[21.914471,101.089722],[21.91452,101.090286],[21.914539,101.090439],[21.914579,101.091003],[21.914721,101.092216],[21.91493,101.095016],[21.91506,101.097748],[21.915051,101.103523],[21.914909,101.107643],[21.9149,101.107872],[21.914909,101.109596],[21.91526,101.113564],[21.91547,101.115044],[21.915751,101.11705],[21.915939,101.118347],[21.915991,101.118874],[21.916019,101.119141],[21.916071,101.119949],[21.91601,101.121269],[21.9158,101.122299],[21.915449,101.123268],[21.91511,101.123947],[21.914339,101.125504],[21.913811,101.127823],[21.91431,101.129951],[21.9146,101.13063],[21.91634,101.134247],[21.91654,101.134712],[21.91663,101.134933],[21.91839,101.139374],[21.918449,101.139603],[21.918631,101.140579],[21.91876,101.14238],[21.918859,101.14476],[21.9189,101.145813],[21.91894,101.146584],[21.918949,101.147102],[21.91897,101.147614],[21.91897,101.147873],[21.918949,101.148628],[21.91885,101.149399],[21.91869,101.150139],[21.918539,101.150879],[21.918449,101.151123],[21.91787,101.151672],[21.91713,101.152397],[21.914841,101.154327],[21.914499,101.154694],[21.914339,101.154877],[21.91366,101.155952],[21.913231,101.156891],[21.912741,101.158127],[21.91255,101.158638],[21.912081,101.159897],[21.911791,101.160652],[21.911501,101.1614],[21.911221,101.16214],[21.910749,101.163353],[21.910561,101.163811],[21.91011,101.164993],[21.909559,101.166382],[21.90947,101.166618],[21.90922,101.167343],[21.908661,101.170502],[21.908001,101.175049],[21.90786,101.175529],[21.907351,101.177269],[21.9072,101.177757],[21.90691,101.178757],[21.90649,101.180817],[21.906509,101.182121],[21.906549,101.182381],[21.90708,101.184097],[21.90826,101.186363],[21.90966,101.189034],[21.909769,101.189247],[21.911289,101.191254],[21.91147,101.191406],[21.912081,101.191833],[21.91445,101.193123],[21.91466,101.193253],[21.91526,101.193687],[21.916121,101.194618],[21.91687,101.195992],[21.91704,101.196457],[21.91711,101.196709],[21.91733,101.197769],[21.9175,101.198914],[21.917601,101.199783],[21.91777,101.200951],[21.91785,101.201508],[21.917971,101.202339],[21.918619,101.205002],[21.918949,101.20575],[21.92004,101.207611],[21.92045,101.208313],[21.920891,101.209213],[21.92137,101.210838],[21.92153,101.212631],[21.92156,101.213158],[21.921659,101.215263],[21.922371,101.219688],[21.922689,101.220886],[21.922979,101.221992],[21.92321,101.222763],[21.92333,101.223259],[21.923441,101.223701],[21.92392,101.226082],[21.92395,101.22644],[21.923969,101.226624],[21.923981,101.227013],[21.923981,101.227837],[21.923941,101.228706],[21.92392,101.228943],[21.9238,101.23037],[21.92371,101.231903],[21.923519,101.233963],[21.92304,101.239906],[21.92206,101.242363],[21.920389,101.244179],[21.920219,101.24437],[21.91906,101.246536],[21.918921,101.247253],[21.918831,101.249329],[21.918831,101.250221],[21.91881,101.250877],[21.91881,101.251099],[21.91873,101.252403],[21.918659,101.252838],[21.917749,101.255157],[21.91548,101.257736],[21.9149,101.258217],[21.9147,101.258377],[21.913401,101.259087],[21.912701,101.259354],[21.91222,101.259483],[21.910749,101.259811],[21.909769,101.26001],[21.90855,101.260277],[21.904751,101.261467],[21.904381,101.261726],[21.90402,101.262016],[21.902321,101.264214],[21.90143,101.265541],[21.90106,101.26609],[21.90019,101.267357],[21.89957,101.26825],[21.899309,101.26857],[21.898569,101.269302],[21.897261,101.269974],[21.89506,101.26992],[21.89484,101.269852],[21.89373,101.269432],[21.89328,101.269257],[21.89189,101.268799],[21.889059,101.268402],[21.88468,101.268173],[21.88446,101.26815],[21.880329,101.268433],[21.87883,101.269524],[21.87771,101.271393],[21.87731,101.273888],[21.87648,101.276787],[21.874929,101.278214],[21.8743,101.278458],[21.87303,101.278679],[21.872,101.278687],[21.871189,101.278717],[21.870171,101.278763],[21.868931,101.278839],[21.868509,101.278893],[21.86767,101.279099],[21.86746,101.279167],[21.86684,101.279404],[21.866631,101.279488],[21.864929,101.280167],[21.86426,101.280296],[21.86335,101.280312],[21.86289,101.280228],[21.86204,101.279892],[21.861469,101.279503],[21.860571,101.278488],[21.85997,101.277496],[21.85952,101.276718],[21.859289,101.276337],[21.85895,101.275749],[21.858391,101.274803],[21.85804,101.274223],[21.857809,101.273827],[21.857309,101.273087],[21.85689,101.272568],[21.856409,101.272102],[21.855659,101.271606],[21.855261,101.271423],[21.85461,101.271233],[21.854389,101.271179],[21.853291,101.271133],[21.852421,101.27121],[21.851561,101.271378],[21.851351,101.271423],[21.85051,101.271637],[21.849689,101.27195],[21.84889,101.272293],[21.8487,101.272392],[21.848129,101.272713],[21.847771,101.272957],[21.847429,101.273247],[21.84683,101.273911],[21.84646,101.274467],[21.846029,101.275543],[21.84589,101.276451],[21.845881,101.276939],[21.845921,101.277412],[21.84621,101.278847],[21.84626,101.279083],[21.846439,101.280022],[21.846581,101.280724],[21.84668,101.281174],[21.846979,101.282547],[21.847031,101.282784],[21.84713,101.283241],[21.847349,101.284653],[21.847349,101.285362],[21.8473,101.285828],[21.847019,101.286682],[21.84655,101.287537],[21.846081,101.288116],[21.84572,101.288437],[21.844709,101.288986],[21.844259,101.28907],[21.84314,101.2892],[21.842449,101.289177],[21.84178,101.289192],[21.840891,101.289299],[21.840441,101.289413],[21.83959,101.289742],[21.838961,101.290031],[21.838329,101.290314],[21.83728,101.290787],[21.83707,101.290894],[21.836439,101.291168],[21.83539,101.291641],[21.83518,101.291733],[21.837179,101.294617],[21.83725,101.295601],[21.837299,101.296066],[21.837339,101.296532],[21.83736,101.296997],[21.837311,101.297943],[21.83708,101.298828],[21.836729,101.299622],[21.836349,101.300133],[21.835699,101.300697],[21.83474,101.301224],[21.833679,101.301613],[21.832809,101.301918],[21.832371,101.302078],[21.83148,101.302383],[21.83082,101.302612],[21.829941,101.302917],[21.82951,101.303078],[21.82864,101.303383],[21.82777,101.303688],[21.827339,101.303841],[21.827129,101.303917],[21.82626,101.304222],[21.825411,101.304497],[21.82457,101.304688],[21.82436,101.304718],[21.823521,101.304771],[21.822651,101.304733],[21.822201,101.30468],[21.821079,101.304573],[21.82085,101.304527],[21.819771,101.304443],[21.81955,101.304428],[21.81811,101.304497],[21.81752,101.30468],[21.816549,101.305153],[21.81568,101.305801],[21.815121,101.306473],[21.81469,101.307243],[21.81444,101.307861],[21.81424,101.308502],[21.81418,101.308723],[21.81395,101.309578],[21.8139,101.309792],[21.81373,101.310448],[21.81356,101.311096],[21.81325,101.31218],[21.81319,101.312401],[21.81284,101.313881],[21.81263,101.31456],[21.8123,101.315376],[21.81167,101.316238],[21.81151,101.316383],[21.81098,101.31675],[21.810591,101.316917],[21.80978,101.317047],[21.808729,101.316933],[21.808331,101.316833],[21.80751,101.316612],[21.80731,101.316551],[21.806709,101.316383],[21.806101,101.316223],[21.8053,101.316002],[21.804489,101.315781],[21.804079,101.315666],[21.80308,101.315407],[21.802679,101.315308],[21.80188,101.315117],[21.801279,101.31498],[21.80068,101.314873],[21.79945,101.314781],[21.79841,101.314857],[21.798201,101.314888],[21.797569,101.315033],[21.795139,101.316109],[21.793831,101.316849],[21.792339,101.317703],[21.79178,101.318008],[21.789539,101.319283],[21.78265,101.342934],[21.78219,101.344131],[21.781931,101.34478],[21.781851,101.344978],[21.781731,101.345337],[21.781601,101.345802],[21.781321,101.347321],[21.781321,101.348717],[21.78134,101.348991],[21.78142,101.349808],[21.781549,101.350937],[21.78159,101.351227],[21.781731,101.352409],[21.78182,101.353279],[21.781839,101.353569],[21.781839,101.354141],[21.781771,101.35498],[21.78137,101.356293],[21.78125,101.356529],[21.780661,101.357407],[21.780331,101.357803],[21.780149,101.357986],[21.779631,101.35849],[21.77928,101.35881],[21.778761,101.359261],[21.778431,101.359573],[21.77767,101.360451],[21.77689,101.361717],[21.77639,101.362892],[21.776091,101.363632],[21.7756,101.364861],[21.77527,101.365578],[21.77515,101.365807],[21.774731,101.366463],[21.77421,101.367027],[21.77383,101.36734],[21.773621,101.36747],[21.77272,101.367897],[21.77083,101.368332],[21.770361,101.368439],[21.768511,101.368843],[21.76614,101.369759],[21.765829,101.370018],[21.765699,101.370163],[21.7647,101.371513],[21.764299,101.372093],[21.763041,101.37394],[21.76263,101.374557],[21.762211,101.375183],[21.76193,101.375603],[21.7612,101.375648],[21.75919,101.376251],[21.757509,101.376091],[21.7568,101.375893],[21.75511,101.375412],[21.754869,101.375359],[21.75362,101.375191],[21.752081,101.375168],[21.75131,101.375191],[21.750299,101.375198],[21.749281,101.375198],[21.748529,101.375168],[21.74777,101.37513],[21.74675,101.375053],[21.745741,101.374924],[21.745489,101.374878],[21.744989,101.374809],[21.74449,101.374741],[21.74399,101.37468],[21.74349,101.374619],[21.74324,101.374588],[21.74173,101.374428],[21.74098,101.374313],[21.73995,101.374153],[21.738661,101.373993],[21.73815,101.373947],[21.737619,101.373917],[21.736851,101.373947],[21.73633,101.374008],[21.735069,101.374283],[21.73406,101.37468],[21.73381,101.374786],[21.73307,101.375107],[21.73283,101.375229],[21.73185,101.375648],[21.7311,101.375923],[21.730591,101.376083],[21.7293,101.376266],[21.728769,101.376282],[21.727711,101.376221],[21.72718,101.37619],[21.72665,101.376152],[21.72613,101.376167],[21.725349,101.376213],[21.724819,101.376312],[21.72456,101.376373],[21.72378,101.376556],[21.723,101.376747],[21.72221,101.3769],[21.720619,101.37709],[21.71957,101.377083],[21.718781,101.377083],[21.718,101.37706],[21.71748,101.377029],[21.71697,101.377022],[21.715139,101.376961],[21.71434,101.37693],[21.713289,101.376907],[21.712761,101.376877],[21.712231,101.376862],[21.71196,101.376839],[21.71143,101.376793],[21.71064,101.376678],[21.710131,101.376579],[21.709869,101.376511],[21.708151,101.375938],[21.707439,101.375671],[21.70673,101.375397],[21.70648,101.375298],[21.705759,101.375038],[21.70479,101.374771],[21.70454,101.374733],[21.703791,101.374649],[21.703541,101.374641],[21.70084,101.374786],[21.699369,101.374687],[21.696461,101.374207],[21.69548,101.374046],[21.694759,101.373917],[21.69404,101.373779],[21.692101,101.373558],[21.68832,101.373627],[21.68716,101.373703],[21.68671,101.373718],[21.68626,101.373734],[21.68581,101.373756],[21.684259,101.373848],[21.68294,101.373917],[21.68227,101.373962],[21.68181,101.373993],[21.677691,101.374207],[21.6772,101.374252],[21.67627,101.37429],[21.67564,101.374329],[21.675261,101.374352],[21.674931,101.374367],[21.674431,101.374397],[21.674231,101.374382],[21.67403,101.374367],[21.673719,101.374367],[21.67363,101.374397],[21.67362,101.374397],[21.673281,101.374443],[21.672291,101.374519],[21.672041,101.374527],[21.669769,101.374817],[21.668909,101.374962],[21.66818,101.375053],[21.667589,101.375069],[21.66655,101.374992],[21.66567,101.37484],[21.66522,101.374733],[21.66452,101.374573],[21.66358,101.374336],[21.662609,101.374107],[21.660681,101.37365],[21.66044,101.373596],[21.65901,101.37326],[21.658279,101.373192],[21.65803,101.373199],[21.65778,101.37323],[21.65707,101.373413],[21.656429,101.373741],[21.65411,101.375397],[21.65262,101.376442],[21.651871,101.376961],[21.651131,101.37748],[21.649639,101.378517],[21.64854,101.379333],[21.648359,101.379478],[21.647209,101.38092],[21.64658,101.382469],[21.646481,101.382919],[21.646391,101.383598],[21.64636,101.384529],[21.64633,101.385681],[21.646311,101.386139],[21.646299,101.386581],[21.64628,101.387253],[21.64625,101.388138],[21.64624,101.38858],[21.646231,101.389023],[21.646259,101.389893],[21.646299,101.390961],[21.64636,101.391586],[21.646391,101.392227],[21.64641,101.392662],[21.646429,101.392883],[21.646481,101.394188],[21.646429,101.395058],[21.646339,101.395477],[21.646061,101.396561],[21.645821,101.3974],[21.64576,101.397614],[21.645651,101.398033],[21.64547,101.398666],[21.64535,101.399094],[21.64529,101.3993],[21.645109,101.399933],[21.64506,101.400139],[21.643129,101.399544],[21.64254,101.399788],[21.6415,101.400208],[21.640881,101.400436],[21.639811,101.400787],[21.639601,101.400864],[21.639179,101.400993],[21.638599,101.401253],[21.63805,101.401588],[21.637421,101.402153],[21.63689,101.402802],[21.636669,101.403191],[21.63641,101.40377],[21.63624,101.404167],[21.63607,101.404556],[21.63582,101.405159],[21.635731,101.405357],[21.635389,101.406151],[21.635139,101.406754],[21.6348,101.407539],[21.63463,101.407944],[21.63438,101.408531],[21.634041,101.409317],[21.633869,101.409721],[21.638929,101.41069],[21.6392,101.411049],[21.63945,101.411423],[21.639811,101.411957],[21.64032,101.412682],[21.64068,101.413223],[21.641041,101.41375],[21.641399,101.414284],[21.641649,101.414627],[21.641899,101.414993],[21.64266,101.416107],[21.643089,101.416939],[21.64325,101.417381],[21.643419,101.418068],[21.643499,101.418533],[21.6436,101.419006],[21.64378,101.41996],[21.64397,101.420914],[21.64411,101.421623],[21.644251,101.42234],[21.64114,101.423126],[21.640671,101.423347],[21.64003,101.423569],[21.63954,101.423698],[21.63903,101.423843],[21.6387,101.423912],[21.638,101.424049],[21.6373,101.424187],[21.63678,101.424309],[21.63625,101.424438],[21.634991,101.424744],[21.63446,101.424873],[21.63378,101.425079],[21.63345,101.425209],[21.632799,101.425537],[21.632339,101.42585],[21.631901,101.426201],[21.63147,101.426613],[21.631081,101.42704],[21.630831,101.427322],[21.630569,101.427612],[21.63015,101.427834],[21.62956,101.42836],[21.62854,101.429283],[21.628099,101.42968],[21.62752,101.430206],[21.62678,101.430862],[21.618349,101.454582],[21.618311,101.454857],[21.61771,101.456886],[21.616671,101.45816],[21.61628,101.458443],[21.615459,101.458977],[21.61483,101.459373],[21.613991,101.459908],[21.61311,101.46048],[21.61268,101.460747],[21.61224,101.460999],[21.61179,101.461197],[21.610849,101.461502],[21.6096,101.461723],[21.60911,101.4618],[21.60862,101.461884],[21.60788,101.462013],[21.606421,101.462273],[21.6057,101.462334],[21.60523,101.462303],[21.60499,101.46225],[21.604521,101.46212],[21.60429,101.462029],[21.603821,101.461838],[21.60358,101.461731],[21.6031,101.461517],[21.60235,101.461327],[21.601851,101.461273],[21.601089,101.461357],[21.599911,101.461807],[21.59948,101.462097],[21.598249,101.463051],[21.597851,101.463371],[21.597231,101.463837],[21.597031,101.463997],[21.596621,101.46431],[21.59622,101.464577],[21.595289,101.465027],[21.594259,101.465149],[21.593731,101.465141],[21.592951,101.46508],[21.59244,101.465012],[21.59144,101.464943],[21.59119,101.464928],[21.5907,101.464928],[21.59045,101.464943],[21.588699,101.465279],[21.58823,101.465553],[21.58778,101.465813],[21.586901,101.466393],[21.585779,101.467117],[21.5851,101.467484],[21.58486,101.46759],[21.58313,101.467796],[21.581961,101.467537],[21.58009,101.467323],[21.57918,101.467537],[21.57896,101.467628],[21.578751,101.467743],[21.57708,101.469528],[21.57564,101.471237],[21.573721,101.47213],[21.57185,101.47226],[21.571609,101.472267],[21.570921,101.47242],[21.5707,101.472504],[21.56967,101.473106],[21.56683,101.474373],[21.56468,101.474983],[21.564091,101.475304],[21.563181,101.47596],[21.562389,101.476761],[21.56115,101.478378],[21.561001,101.478561],[21.55938,101.480637],[21.559231,101.480827],[21.55831,101.481956],[21.5578,101.482483],[21.55722,101.48291],[21.556589,101.483231],[21.556141,101.483383],[21.554979,101.483566],[21.55451,101.483582],[21.554279,101.483589],[21.552191,101.48365],[21.551279,101.483681],[21.55061,101.483704],[21.548849,101.483757],[21.547979,101.483788],[21.54689,101.483841],[21.546671,101.483856],[21.546049,101.483971],[21.54414,101.484978],[21.54397,101.48513],[21.54348,101.485657],[21.542891,101.48642],[21.54274,101.48661],[21.542,101.487556],[21.541861,101.487747],[21.540859,101.489021],[21.54043,101.48954],[21.540291,101.489708],[21.539841,101.490173],[21.5392,101.4907],[21.53886,101.490921],[21.538691,101.49102],[21.538151,101.491287],[21.537781,101.491432],[21.537041,101.491669],[21.536671,101.491783],[21.5347,101.492409],[21.53422,101.492554],[21.533739,101.492706],[21.533421,101.492813],[21.53117,101.493507],[21.52005,101.497276],[21.51823,101.497932],[21.516729,101.498421],[21.516121,101.498749],[21.515369,101.499313],[21.51487,101.499863],[21.5142,101.500954],[21.51395,101.501404],[21.51309,101.502617],[21.512489,101.50341],[21.5119,101.504204],[21.51145,101.504799],[21.51115,101.505203],[21.509859,101.505867],[21.50952,101.506233],[21.508989,101.506767],[21.508471,101.507317],[21.508301,101.5075],[21.50812,101.507683],[21.50765,101.508568],[21.50758,101.508743],[21.50746,101.509407],[21.507481,101.510117],[21.507641,101.511124],[21.50786,101.512627],[21.507959,101.513397],[21.507151,101.514633],[21.50692,101.515289],[21.506491,101.516243],[21.5063,101.516731],[21.506149,101.517258],[21.506001,101.518044],[21.50596,101.518547],[21.50596,101.518784],[21.50597,101.518982],[21.505989,101.519333],[21.506029,101.519653],[21.506069,101.519997],[21.50596,101.522263],[21.50559,101.523567],[21.50539,101.524117],[21.505199,101.524643],[21.50493,101.525421],[21.504669,101.526169],[21.504499,101.526657],[21.50436,101.527168],[21.50421,101.527679],[21.50399,101.528442],[21.503691,101.529457],[21.50388,101.531113],[21.503839,101.531891],[21.50375,101.532417],[21.503469,101.53344],[21.503189,101.534187],[21.502741,101.535393],[21.502649,101.535629],[21.50247,101.536118],[21.50219,101.53685],[21.502001,101.537354],[21.50169,101.538101],[21.50135,101.539108],[21.50128,101.540138],[21.50182,101.541763],[21.502119,101.54213],[21.502279,101.542297],[21.502819,101.542686],[21.50433,101.543671],[21.505131,101.544182],[21.50856,101.546333],[21.50975,101.547249],[21.51009,101.547607],[21.51037,101.548019],[21.510691,101.548714],[21.51091,101.549713],[21.51087,101.550743],[21.510019,101.552643],[21.50943,101.553497],[21.507971,101.555656],[21.507099,101.556976],[21.50695,101.55722],[21.506689,101.557663],[21.50597,101.558723],[21.5054,101.55957],[21.50499,101.560188],[21.504021,101.561607],[21.50321,101.562866],[21.501711,101.565132],[21.500299,101.567253],[21.49931,101.568764],[21.498329,101.570236],[21.496941,101.572327],[21.49625,101.573372],[21.49472,101.575684],[21.491819,101.579353],[21.48933,101.58075],[21.48888,101.580887],[21.486139,101.581078],[21.48407,101.580566],[21.481621,101.579582],[21.481171,101.579399],[21.480721,101.579224],[21.47644,101.57753],[21.474199,101.57666],[21.47193,101.57579],[21.467951,101.574188],[21.46373,101.572517],[21.46306,101.572258],[21.46283,101.572166],[21.461531,101.571663],[21.45727,101.570129],[21.45557,101.56974],[21.450569,101.568871],[21.450121,101.568939],[21.449129,101.569443],[21.448389,101.570358],[21.447821,101.571732],[21.44714,101.573059],[21.447001,101.573257],[21.44635,101.573936],[21.44599,101.574226],[21.44524,101.574738],[21.44451,101.575249],[21.44367,101.576317],[21.443371,101.57695],[21.44311,101.577583],[21.44302,101.577797],[21.44268,101.578644],[21.442419,101.579277],[21.442169,101.579933],[21.442089,101.580139],[21.441589,101.581169],[21.441469,101.581367],[21.439939,101.583168],[21.43919,101.583748],[21.43844,101.584328],[21.43825,101.584473],[21.43788,101.584763],[21.437309,101.58519],[21.43712,101.585327],[21.43615,101.584167],[21.43479,101.583832],[21.4333,101.582962],[21.43273,101.582451],[21.432541,101.582253],[21.431669,101.581284],[21.430969,101.580513],[21.430269,101.57975],[21.43008,101.579567],[21.429501,101.579071],[21.428391,101.578491],[21.427919,101.578346],[21.427429,101.578247],[21.425461,101.578407],[21.424049,101.579048],[21.420389,101.581108],[21.419979,101.581337],[21.41571,101.583321],[21.41457,101.583511],[21.41366,101.583542],[21.41206,101.583427],[21.408621,101.583557],[21.40716,101.584686],[21.4049,101.588074],[21.403959,101.589478],[21.40303,101.590919],[21.402679,101.592781],[21.403009,101.593674],[21.40378,101.594841],[21.40402,101.595253],[21.40432,101.595886],[21.404461,101.596336],[21.404591,101.597549],[21.40451,101.598282],[21.40427,101.599258],[21.404169,101.599762],[21.40451,101.601669],[21.406111,101.604439],[21.40613,101.605873],[21.4058,101.606552],[21.404699,101.607536],[21.404261,101.607697],[21.403339,101.607971],[21.402929,101.608177],[21.402559,101.608459],[21.401739,101.610237],[21.401871,101.611267],[21.40221,101.612251],[21.402809,101.613823],[21.40299,101.614487],[21.40303,101.614967],[21.40284,101.616112],[21.401939,101.618828],[21.40192,101.619072],[21.40217,101.620598],[21.40247,101.621201],[21.40373,101.623901],[21.40465,101.626793],[21.40407,101.628906],[21.40324,101.63076],[21.403139,101.630989],[21.40155,101.634537],[21.40093,101.636017],[21.40012,101.637909],[21.399981,101.638763],[21.400181,101.639793],[21.400709,101.640717],[21.40102,101.641144],[21.401131,101.641296],[21.40196,101.642464],[21.402081,101.642639],[21.402981,101.643921],[21.404921,101.645638],[21.40534,101.645882],[21.406879,101.646599],[21.407089,101.646721],[21.40806,101.647476],[21.40929,101.649406],[21.40995,101.651413],[21.410191,101.652168],[21.412201,101.65831],[21.412661,101.659714],[21.413031,101.660873],[21.41342,101.661987],[21.413731,101.66288],[21.414021,101.663788],[21.4142,101.664726],[21.4142,101.665672],[21.414061,101.666344],[21.41399,101.66655],[21.41383,101.666992],[21.413389,101.66777],[21.41296,101.668297],[21.41247,101.668762],[21.411989,101.669197],[21.411329,101.669762],[21.410851,101.670174],[21.409861,101.671089],[21.409519,101.671387],[21.40654,101.674118],[21.40633,101.674179],[21.405331,101.675163],[21.40472,101.675667],[21.403,101.676773],[21.402309,101.677094],[21.402069,101.677193],[21.401581,101.677368],[21.40037,101.677727],[21.39938,101.678017],[21.397619,101.678543],[21.39686,101.678772],[21.39661,101.678848],[21.39558,101.679153],[21.393749,101.679703],[21.39349,101.679787],[21.39068,101.680634],[21.3897,101.680923],[21.388531,101.681267],[21.3883,101.681343],[21.38497,101.681824],[21.38472,101.681793],[21.38423,101.681709],[21.383301,101.681473],[21.38283,101.681328],[21.381849,101.681137],[21.3811,101.681099],[21.37989,101.681252],[21.374399,101.682503],[21.371639,101.683113],[21.37097,101.683243],[21.370119,101.683434],[21.369711,101.683517],[21.36779,101.683937],[21.366369,101.684273],[21.363689,101.684883],[21.358419,101.68605],[21.355499,101.686691],[21.35397,101.687172],[21.351471,101.688713],[21.34923,101.689758],[21.34716,101.689621],[21.346491,101.689499],[21.34627,101.689461],[21.3445,101.68914],[21.34428,101.68911],[21.34269,101.688812],[21.340111,101.68895],[21.33828,101.689888],[21.337641,101.690331],[21.334961,101.692108],[21.332781,101.692627],[21.3321,101.692612],[21.331181,101.692581],[21.330429,101.692551],[21.330179,101.692528],[21.326281,101.692917],[21.324341,101.693268],[21.324089,101.693314],[21.32147,101.693352],[21.31986,101.693321],[21.317921,101.694153],[21.317711,101.69426],[21.31728,101.694427],[21.316139,101.69445],[21.314119,101.693893],[21.3139,101.693832],[21.31188,101.693459],[21.30991,101.693947],[21.308069,101.69548],[21.30736,101.696136],[21.306259,101.697166],[21.30348,101.699059],[21.30176,101.699493],[21.29907,101.699257],[21.293909,101.698067],[21.292749,101.697807],[21.289789,101.697159],[21.289129,101.697006],[21.28742,101.696632],[21.286369,101.696388],[21.28471,101.696053],[21.28323,101.696136],[21.281811,101.696793],[21.28023,101.698433],[21.27973,101.699074],[21.279221,101.699722],[21.27784,101.701424],[21.27766,101.70163],[21.276819,101.70269],[21.276661,101.702904],[21.275181,101.70472],[21.27319,101.706131],[21.271839,101.706734],[21.271469,101.707047],[21.270941,101.70787],[21.26981,101.711739],[21.26972,101.711983],[21.2689,101.713188],[21.2665,101.715477],[21.26597,101.715958],[21.265369,101.716316],[21.26404,101.716522],[21.263161,101.716293],[21.260771,101.714844],[21.25922,101.713852],[21.257099,101.712517],[21.25647,101.712128],[21.256081,101.711884],[21.255791,101.711723],[21.25561,101.711571],[21.25526,101.711327],[21.25515,101.711273],[21.2542,101.710693],[21.253139,101.710037],[21.253019,101.709969],[21.252831,101.709846],[21.251011,101.708702],[21.250351,101.708321],[21.249781,101.70813],[21.24929,101.707947],[21.24873,101.70787],[21.24799,101.707802],[21.246639,101.707718],[21.24645,101.707703],[21.24424,101.707573],[21.24391,101.707512],[21.24243,101.707199],[21.23983,101.706123],[21.237459,101.705139],[21.232361,101.703072],[21.232071,101.702988],[21.229389,101.702309],[21.229059,101.702217],[21.22883,101.702263],[21.22781,101.702744],[21.227631,101.702858],[21.226589,101.703712],[21.22473,101.704857],[21.22368,101.705063],[21.221531,101.704613],[21.22003,101.704063],[21.217899,101.703362],[21.21722,101.703201],[21.21579,101.703049],[21.21278,101.70285],[21.209311,101.702278],[21.207649,101.701683],[21.20392,101.700203],[21.202351,101.699127],[21.200911,101.696533],[21.1991,101.693657],[21.19673,101.692017],[21.194309,101.690483],[21.19376,101.690102],[21.193081,101.689651],[21.1917,101.688637],[21.190769,101.687233],[21.19038,101.68663],[21.190069,101.686272],[21.189859,101.686096],[21.18948,101.685799],[21.188499,101.68512],[21.18718,101.684097],[21.18701,101.683723],[21.186689,101.683517],[21.186279,101.683693],[21.18615,101.683632],[21.185841,101.683296],[21.18573,101.682793],[21.18601,101.681519],[21.18609,101.680992],[21.18647,101.680603],[21.186871,101.680237],[21.187,101.679932],[21.18693,101.678787],[21.18714,101.678131],[21.187559,101.677711],[21.18775,101.677139],[21.18775,101.676033],[21.187361,101.675491],[21.18634,101.67466],[21.186001,101.674156],[21.185749,101.673912],[21.18507,101.673508],[21.184771,101.673378],[21.184389,101.673187],[21.18375,101.672913],[21.182159,101.67215],[21.180889,101.671158],[21.179991,101.670067],[21.17861,101.669197],[21.17667,101.668991],[21.17417,101.668457],[21.173349,101.668541],[21.17028,101.669739],[21.16925,101.670959],[21.1682,101.672523],[21.16785,101.672813],[21.166189,101.673027],[21.16534,101.672256],[21.16515,101.671768],[21.16436,101.671318],[21.164221,101.671341],[21.162239,101.671417],[21.15913,101.672249],[21.158449,101.672173],[21.157101,101.671822],[21.156509,101.671494],[21.15626,101.671288],[21.155239,101.671181],[21.15383,101.6716],[21.153191,101.672234],[21.15299,101.67263],[21.152439,101.67305],[21.151421,101.673592],[21.150631,101.67337],[21.15029,101.672989],[21.15037,101.672081],[21.150669,101.671257],[21.150391,101.670158],[21.15033,101.670067],[21.14954,101.669273],[21.14859,101.668411],[21.14756,101.668449],[21.14698,101.668678],[21.145809,101.668266],[21.14555,101.667824],[21.14522,101.666992],[21.14439,101.666809],[21.14426,101.666893],[21.14325,101.666779],[21.141621,101.665131],[21.140881,101.664749],[21.139521,101.664429],[21.138849,101.664528],[21.13736,101.665062],[21.1367,101.665047],[21.133381,101.664391],[21.13324,101.66433],[21.132509,101.663429],[21.13204,101.662064],[21.13155,101.661484],[21.12817,101.657883],[21.12644,101.656097],[21.124781,101.654663],[21.123831,101.654449],[21.122801,101.654503],[21.121611,101.653748],[21.12063,101.65239],[21.119909,101.652184],[21.119591,101.652199],[21.118719,101.651787],[21.116011,101.64978],[21.114189,101.648827],[21.11272,101.647827],[21.11216,101.647171],[21.11198,101.646858],[21.110399,101.645432],[21.10799,101.643784],[21.1066,101.642517],[21.105141,101.642128],[21.10467,101.642021],[21.10405,101.641533],[21.10235,101.639343],[21.10084,101.638039],[21.10059,101.637817],[21.099581,101.637688],[21.098789,101.637917],[21.097651,101.637497],[21.09745,101.636864],[21.097389,101.636368],[21.0968,101.635696],[21.09623,101.635429],[21.095579,101.635422],[21.094721,101.635567],[21.093611,101.635033],[21.0937,101.634087],[21.093571,101.633324],[21.093201,101.633339],[21.09173,101.633362],[21.091311,101.634033],[21.091339,101.634407],[21.090811,101.634972],[21.090679,101.634956],[21.090429,101.634933],[21.09004,101.63427],[21.090031,101.633827],[21.08955,101.633232],[21.08824,101.63266],[21.08761,101.631882],[21.08699,101.629753],[21.086281,101.629288],[21.085979,101.629883],[21.085951,101.630363],[21.085409,101.631233],[21.08371,101.633232],[21.08346,101.633499],[21.08213,101.634163],[21.081591,101.634033],[21.08135,101.633919],[21.08079,101.63427],[21.08078,101.634552],[21.080839,101.635437],[21.08036,101.63588],[21.08003,101.635902],[21.07967,101.636673],[21.079691,101.638252],[21.079399,101.639343],[21.078541,101.639977],[21.077511,101.640182],[21.07645,101.639679],[21.076229,101.639442],[21.075251,101.639282],[21.0749,101.639587],[21.074249,101.640633],[21.0742,101.641724],[21.074301,101.642326],[21.073811,101.642967],[21.07135,101.643784],[21.06925,101.644409],[21.06815,101.643997],[21.06529,101.641731],[21.06399,101.64122],[21.063589,101.640419],[21.06303,101.6399],[21.062799,101.640053],[21.06217,101.640602],[21.061819,101.641602],[21.061831,101.641678],[21.061939,101.64257],[21.061939,101.643494],[21.06189,101.64373],[21.06179,101.644058],[21.061331,101.644096],[21.060949,101.644112],[21.060551,101.64415],[21.058901,101.644211],[21.05814,101.644142],[21.057421,101.643707],[21.0557,101.641777],[21.054649,101.639397],[21.054371,101.637123],[21.05472,101.636192],[21.05496,101.635902],[21.055201,101.634933],[21.05521,101.633789],[21.05562,101.633133],[21.056,101.632858],[21.056259,101.632507],[21.056231,101.631889],[21.056009,101.631126],[21.056009,101.63031],[21.055611,101.629601],[21.05542,101.629463],[21.055229,101.629066],[21.05549,101.628708],[21.055759,101.628609],[21.056959,101.628326],[21.05728,101.628036],[21.057211,101.627663],[21.05706,101.627472],[21.056881,101.627289],[21.056749,101.626503],[21.056881,101.625992],[21.056391,101.625427],[21.056259,101.62542],[21.055861,101.625381],[21.055531,101.624649],[21.05567,101.624107],[21.05521,101.623482],[21.055071,101.623451],[21.054529,101.623337],[21.053841,101.623421],[21.05345,101.623573],[21.05257,101.623238],[21.052481,101.623108],[21.05212,101.622597],[21.05159,101.622292],[21.05098,101.622124],[21.05027,101.621071],[21.04999,101.617973],[21.050171,101.617203],[21.0518,101.614067],[21.053329,101.611893],[21.05361,101.610832],[21.054119,101.609283],[21.05393,101.608627],[21.05303,101.606812],[21.05307,101.605743],[21.053431,101.604851],[21.05352,101.60408],[21.05327,101.602287],[21.05216,101.599876],[21.052219,101.598587],[21.052691,101.596916],[21.052589,101.596092],[21.051649,101.59243],[21.05213,101.591179],[21.054859,101.588188],[21.055071,101.586418],[21.055019,101.58622],[21.053671,101.583351],[21.053471,101.583023],[21.05316,101.581673],[21.05213,101.580551],[21.05195,101.580467],[21.048651,101.579102],[21.047661,101.577583],[21.047159,101.575447],[21.04752,101.574654],[21.047939,101.574249],[21.047831,101.573502],[21.04771,101.573387],[21.045891,101.571762],[21.04542,101.57132],[21.044941,101.570572],[21.043739,101.569817],[21.043119,101.569893],[21.040911,101.57045],[21.039921,101.570267],[21.03924,101.569939],[21.038771,101.569153],[21.038679,101.568779],[21.03887,101.567871],[21.03911,101.56739],[21.038759,101.56649],[21.03618,101.56472],[21.034491,101.564079],[21.03421,101.563957],[21.033649,101.563393],[21.033291,101.562782],[21.03249,101.562347],[21.03064,101.561867],[21.02869,101.56057],[21.027941,101.558998],[21.028431,101.557823],[21.02883,101.557358],[21.0292,101.556396],[21.02948,101.554993],[21.03001,101.553947],[21.030121,101.553062],[21.03009,101.55275],[21.02957,101.552261],[21.0285,101.551842],[21.02776,101.551918],[21.02747,101.551987],[21.02669,101.551743],[21.025669,101.550957],[21.02426,101.549026],[21.024151,101.548843],[21.02359,101.546783],[21.022961,101.546013],[21.022449,101.545723],[21.02191,101.545181],[21.02103,101.544579],[21.01865,101.544144],[21.01754,101.543259],[21.017481,101.543068],[21.01631,101.540771],[21.01417,101.53756],[21.01343,101.536171],[21.01198,101.534866],[21.01107,101.533409],[21.01088,101.532593],[21.01087,101.53167],[21.01041,101.530777],[21.00898,101.529266],[21.00782,101.526787],[21.00745,101.525253],[21.00626,101.522858],[21.00585,101.522148],[21.005159,101.521637],[21.0049,101.521523],[21.004641,101.520668],[21.00502,101.518944],[21.00486,101.518288],[21.004499,101.517731],[21.003889,101.517303],[21.003651,101.517212],[21.003281,101.516609],[21.00312,101.515732],[21.002621,101.515251],[21.001989,101.514832],[21.00145,101.514183],[21.000019,101.513237],[20.99921,101.513107],[20.99798,101.513229],[20.997299,101.513573],[20.995371,101.514557],[20.99423,101.514267],[20.99411,101.514107],[20.993151,101.51326],[20.99276,101.512451],[20.99169,101.509193],[20.99136,101.508392],[20.99144,101.507004],[20.99139,101.506577],[20.99114,101.505531],[20.990749,101.504936],[20.990391,101.50457],[20.9893,101.504051],[20.988171,101.503937],[20.987301,101.503036],[20.986629,101.502098],[20.986059,101.501862],[20.98563,101.501823],[20.985189,101.501129],[20.98535,101.5009],[20.98554,101.500671],[20.985479,101.499657],[20.985201,101.499428],[20.984381,101.498848],[20.9841,101.4981],[20.98411,101.497597],[20.983919,101.496964],[20.982651,101.493713],[20.982571,101.49353],[20.98209,101.492943],[20.98139,101.492027],[20.98027,101.491493],[20.979931,101.491463],[20.97905,101.490608],[20.978979,101.490211],[20.97872,101.486893],[20.97826,101.484161],[20.977501,101.481491],[20.977671,101.480797],[20.97838,101.479523],[20.978571,101.478737],[20.97826,101.477966],[20.97625,101.475441],[20.975889,101.474953],[20.97571,101.474243],[20.97571,101.473801],[20.975189,101.473083],[20.974569,101.472763],[20.971781,101.472397],[20.971319,101.472343],[20.97085,101.471573],[20.9708,101.470627],[20.970989,101.469879],[20.97171,101.468323],[20.9718,101.46756],[20.97176,101.466614],[20.97085,101.464706],[20.96999,101.464142],[20.96937,101.463982],[20.968889,101.463127],[20.969021,101.462761],[20.96921,101.462219],[20.969311,101.459877],[20.96875,101.458588],[20.96818,101.458328],[20.967899,101.458344],[20.96715,101.457619],[20.966829,101.456596],[20.96603,101.456177],[20.964979,101.456093],[20.964399,101.455673],[20.96394,101.455139],[20.96306,101.454193],[20.96171,101.452744],[20.96068,101.451591],[20.956091,101.446877],[20.95311,101.443123],[20.94928,101.435982],[20.947901,101.432739],[20.947109,101.430893],[20.944679,101.423531],[20.94459,101.423302],[20.94437,101.422813],[20.94393,101.422318],[20.94335,101.421989],[20.940571,101.421303],[20.937679,101.420601],[20.93697,101.42028],[20.934799,101.41803],[20.934759,101.417976],[20.933929,101.41713],[20.931311,101.414238],[20.930401,101.411774],[20.928591,101.406677],[20.92713,101.402611],[20.926319,101.400558],[20.9261,101.400032],[20.92557,101.399147],[20.924749,101.397987],[20.92362,101.397202],[20.92201,101.396652],[20.919701,101.396263],[20.916941,101.396027],[20.91567,101.396103],[20.91518,101.396057],[20.91395,101.395683],[20.912701,101.395607],[20.912001,101.395248],[20.91086,101.393898],[20.91008,101.392738],[20.90941,101.39241],[20.908859,101.392418],[20.908319,101.392258],[20.907619,101.391838],[20.90641,101.391373],[20.90514,101.390343],[20.90481,101.390007],[20.90452,101.389236],[20.904369,101.387253],[20.90424,101.386543],[20.90419,101.385681],[20.904249,101.385193],[20.903959,101.384361],[20.902889,101.383614],[20.902361,101.382896],[20.901699,101.381378],[20.901421,101.38102],[20.90081,101.380478],[20.900419,101.379936],[20.89982,101.378464],[20.89942,101.377693],[20.89913,101.376877],[20.898861,101.375717],[20.89913,101.374657],[20.899389,101.373901],[20.899771,101.373192],[20.900129,101.372658],[20.900181,101.371742],[20.89929,101.370667],[20.899111,101.369743],[20.89933,101.36908],[20.89933,101.368187],[20.89893,101.366798],[20.898621,101.365959],[20.897791,101.364807],[20.89596,101.363327],[20.89566,101.363159],[20.894501,101.362846],[20.893221,101.362282],[20.89233,101.362289],[20.891911,101.362503],[20.89109,101.362419],[20.890869,101.361862],[20.890989,101.361412],[20.891991,101.359993],[20.892191,101.359543],[20.892321,101.359039],[20.892361,101.357803],[20.891979,101.356918],[20.89134,101.356422],[20.89098,101.355713],[20.89085,101.354797],[20.890739,101.354477],[20.890169,101.353882],[20.88908,101.35334],[20.887831,101.352203],[20.887449,101.351532],[20.887051,101.350227],[20.886459,101.347748],[20.88616,101.345627],[20.885771,101.344566],[20.885139,101.343468],[20.88505,101.342644],[20.885099,101.342339],[20.884859,101.341637],[20.88353,101.339973],[20.882351,101.338768],[20.880859,101.3377],[20.87953,101.335678],[20.878099,101.334183],[20.87734,101.333168],[20.876961,101.332138],[20.87657,101.331589],[20.87565,101.330719],[20.875271,101.329689],[20.875191,101.328537],[20.874901,101.327873],[20.87468,101.327583],[20.874399,101.326897],[20.87429,101.325577],[20.87417,101.325081],[20.87361,101.324387],[20.87336,101.323647],[20.87372,101.323196],[20.8745,101.322937],[20.87533,101.322411],[20.876341,101.321587],[20.87653,101.320892],[20.876419,101.320633],[20.87587,101.319832],[20.8755,101.319199],[20.874941,101.31871],[20.8743,101.318604],[20.87339,101.318153],[20.87311,101.317917],[20.872601,101.317039],[20.87215,101.316429],[20.87092,101.316002],[20.87092,101.315643],[20.87122,101.314941],[20.871281,101.314583],[20.871241,101.314484],[20.87109,101.314323],[20.870701,101.314133],[20.87014,101.313477],[20.869671,101.313187],[20.869301,101.312759],[20.86846,101.312218],[20.86771,101.311951],[20.8671,101.311447],[20.86688,101.311409],[20.866301,101.3116],[20.86607,101.311523],[20.865959,101.311409],[20.865801,101.310837],[20.86561,101.31041],[20.865049,101.309357],[20.86484,101.309067],[20.86454,101.308907],[20.86376,101.309387],[20.86334,101.309227],[20.86293,101.308487],[20.862379,101.308144],[20.86187,101.308067],[20.86134,101.307678],[20.86109,101.307343],[20.86058,101.307114],[20.859579,101.306999],[20.859261,101.307022],[20.858521,101.306557],[20.85837,101.306557],[20.85812,101.306839],[20.857849,101.307281],[20.85762,101.307373],[20.85746,101.307266],[20.85737,101.306808],[20.85758,101.304932],[20.85774,101.304482],[20.857809,101.303909],[20.85762,101.303467],[20.857031,101.302849],[20.85684,101.302551],[20.856741,101.301697],[20.85685,101.301376],[20.857031,101.301117],[20.857401,101.300873],[20.8578,101.300407],[20.857809,101.299911],[20.85775,101.299751],[20.85659,101.298553],[20.85626,101.298347],[20.85582,101.297791],[20.8554,101.297028],[20.8552,101.296783],[20.85458,101.296593],[20.854441,101.296631],[20.85359,101.296577],[20.85334,101.296173],[20.853201,101.295738],[20.852631,101.295326],[20.85215,101.295288],[20.85099,101.294746],[20.849661,101.293571],[20.84874,101.292473],[20.84767,101.291672],[20.845869,101.291008],[20.845289,101.290916],[20.84473,101.290749],[20.8437,101.289886],[20.84339,101.289398],[20.842211,101.288437],[20.842039,101.288353],[20.84111,101.288147],[20.839911,101.287758],[20.839411,101.287682],[20.837811,101.286537],[20.836929,101.2864],[20.83576,101.286842],[20.83511,101.28685],[20.834379,101.286758],[20.83363,101.286812],[20.83313,101.286972],[20.832451,101.28698],[20.83209,101.286903],[20.83136,101.286858],[20.8307,101.286659],[20.82987,101.286171],[20.827419,101.284218],[20.82687,101.283821],[20.826639,101.2836],[20.826469,101.282822],[20.827129,101.280853],[20.827259,101.280098],[20.827181,101.279358],[20.827009,101.278397],[20.82641,101.276901],[20.82559,101.276009],[20.823879,101.273521],[20.823151,101.272568],[20.82159,101.269386],[20.82069,101.2687],[20.81974,101.268578],[20.81888,101.268013],[20.818501,101.26712],[20.818159,101.266602],[20.81764,101.265961],[20.8174,101.265213],[20.817101,101.263397],[20.81666,101.26268],[20.81521,101.260689],[20.81455,101.2593],[20.81427,101.257919],[20.813629,101.256981],[20.812321,101.256058],[20.81144,101.255783],[20.81056,101.255829],[20.80987,101.255524],[20.809561,101.254936],[20.809259,101.254532],[20.808781,101.25428],[20.80657,101.253616],[20.8057,101.252892],[20.805111,101.25174],[20.804529,101.251251],[20.804199,101.25116],[20.80361,101.250793],[20.803249,101.25042],[20.802361,101.250076],[20.80204,101.250076],[20.80131,101.249603],[20.801081,101.248833],[20.800421,101.248154],[20.799601,101.24794],[20.79903,101.247581],[20.79871,101.247009],[20.79841,101.246651],[20.798059,101.246368],[20.797729,101.245918],[20.79738,101.245552],[20.796869,101.245453],[20.796061,101.245071],[20.795691,101.244034],[20.79571,101.24337],[20.79591,101.242928],[20.79604,101.242363],[20.79582,101.242012],[20.79541,101.241859],[20.79455,101.241829],[20.79377,101.241577],[20.79318,101.241508],[20.792471,101.241676],[20.791559,101.241417],[20.79118,101.241043],[20.79059,101.240044],[20.79001,101.239571],[20.78912,101.239166],[20.788349,101.238457],[20.78746,101.23822],[20.787109,101.238312],[20.7859,101.238449],[20.78516,101.238167],[20.784611,101.237091],[20.78401,101.236816],[20.783689,101.236809],[20.78311,101.236382],[20.782841,101.235779],[20.78194,101.234947],[20.78125,101.234741],[20.780479,101.234016],[20.780319,101.233017],[20.7799,101.232117],[20.77844,101.230377],[20.778259,101.229301],[20.778521,101.22863],[20.778641,101.228104],[20.77836,101.227226],[20.77755,101.225906],[20.77619,101.222702],[20.775499,101.221542],[20.775351,101.220627],[20.775431,101.219948],[20.775299,101.21936],[20.774981,101.219063],[20.774429,101.218277],[20.77429,101.217552],[20.774059,101.21685],[20.77401,101.21595],[20.7736,101.214958],[20.77289,101.214157],[20.772711,101.213707],[20.77206,101.213028],[20.77157,101.212852],[20.77067,101.212082],[20.769079,101.211403],[20.76856,101.210831],[20.7684,101.210358],[20.76782,101.209717],[20.766581,101.208923],[20.766041,101.208389],[20.76475,101.206596],[20.7642,101.20533],[20.763359,101.204628],[20.76206,101.204338],[20.76133,101.203827],[20.760889,101.203232],[20.76026,101.202133],[20.75979,101.201714],[20.75909,101.201591],[20.758789,101.201103],[20.758659,101.200577],[20.758289,101.199913],[20.756969,101.198578],[20.75625,101.197777],[20.75568,101.197388],[20.754919,101.196739],[20.754379,101.196007],[20.753799,101.194603],[20.753019,101.193871],[20.752131,101.193619],[20.75107,101.192886],[20.75004,101.191017],[20.749201,101.190369],[20.74798,101.190247],[20.747049,101.189789],[20.746679,101.189377],[20.74592,101.18782],[20.744631,101.186089],[20.744249,101.185173],[20.743811,101.18457],[20.742531,101.18351],[20.74172,101.181969],[20.740219,101.179893],[20.739519,101.178558],[20.73938,101.178192],[20.73859,101.177406],[20.73609,101.17572],[20.735571,101.175194],[20.735161,101.174278],[20.734949,101.173271],[20.73436,101.171417],[20.73366,101.16983],[20.733391,101.168877],[20.73332,101.167488],[20.73292,101.166161],[20.732599,101.165382],[20.7318,101.164146],[20.730471,101.162468],[20.729731,101.161346],[20.728519,101.158813],[20.727631,101.157448],[20.727249,101.156227],[20.72673,101.155281],[20.72649,101.154922],[20.72521,101.153793],[20.72459,101.152687],[20.724159,101.150543],[20.723579,101.148811],[20.722309,101.14669],[20.721519,101.145203],[20.72089,101.142311],[20.72014,101.139526],[20.719931,101.138321],[20.71986,101.13755],[20.71986,101.135567],[20.71977,101.135147],[20.71953,101.134521],[20.719139,101.133034],[20.719021,101.131973],[20.71859,101.131027],[20.716841,101.128883],[20.715891,101.127151],[20.71361,101.123306],[20.713131,101.122078],[20.71228,101.120903],[20.71139,101.119331],[20.71073,101.116898],[20.71067,101.116501],[20.71023,101.115593],[20.70933,101.11425],[20.70879,101.112427],[20.70808,101.111382],[20.70723,101.10994],[20.70668,101.108551],[20.706181,101.106972],[20.70561,101.10614],[20.70388,101.104538],[20.70244,101.102783],[20.70118,101.09993],[20.70072,101.09906],[20.6994,101.097847],[20.69784,101.095589],[20.69607,101.093971],[20.69558,101.093132],[20.69499,101.0914],[20.69352,101.089119],[20.689859,101.084457],[20.68833,101.082237],[20.68816,101.081863],[20.68788,101.079727],[20.68796,101.077667],[20.688219,101.076057],[20.688129,101.075287],[20.68651,101.071457],[20.686211,101.070671],[20.68609,101.069862],[20.68597,101.068253],[20.685909,101.066559],[20.68614,101.0644],[20.686119,101.062973],[20.686029,101.062637],[20.685539,101.061783],[20.68491,101.061203],[20.68383,101.060493],[20.68259,101.059792],[20.68153,101.059624],[20.68082,101.059608],[20.67993,101.059982],[20.67845,101.061462],[20.67696,101.063042],[20.676001,101.063911],[20.67528,101.064041],[20.67485,101.063957],[20.674549,101.06398],[20.67375,101.06414],[20.672791,101.063828],[20.67153,101.063164],[20.67119,101.063087],[20.670349,101.06321],[20.66991,101.063431],[20.669331,101.063477],[20.66877,101.063271],[20.66786,101.063087],[20.667271,101.062637],[20.66712,101.06237],[20.666519,101.061897],[20.666201,101.061867],[20.664379,101.061996],[20.663731,101.062233],[20.6633,101.0625],[20.66238,101.0625],[20.662001,101.061981],[20.661909,101.061668],[20.661579,101.061172],[20.66132,101.061043],[20.660379,101.060806],[20.659349,101.060799],[20.658239,101.06041],[20.657511,101.060318],[20.656771,101.060303],[20.656139,101.060768],[20.65538,101.064034],[20.654011,101.066132],[20.653879,101.06678],[20.65395,101.067062],[20.653839,101.067787],[20.65346,101.068527],[20.65251,101.069458],[20.65188,101.069992],[20.65143,101.070847],[20.651449,101.073021],[20.65098,101.073807],[20.650551,101.073967],[20.647909,101.074493],[20.647511,101.07473],[20.647209,101.075127],[20.647039,101.076431],[20.64661,101.077271],[20.646231,101.07766],[20.645269,101.078148],[20.64476,101.078644],[20.644279,101.07943],[20.64299,101.080406],[20.64089,101.081017],[20.640221,101.081093],[20.639441,101.081612],[20.638889,101.082474],[20.63821,101.082863],[20.63739,101.082977],[20.63587,101.08374],[20.63508,101.083847],[20.633369,101.083763],[20.63271,101.083946],[20.632099,101.084244],[20.631451,101.084351],[20.629339,101.083977],[20.628559,101.083351],[20.628071,101.082176],[20.62792,101.081711],[20.627359,101.080887],[20.626101,101.079613],[20.62479,101.078598],[20.622829,101.077782],[20.62022,101.076309],[20.61867,101.07502],[20.617029,101.073868],[20.616859,101.073776],[20.615549,101.073547],[20.614929,101.073242],[20.61466,101.072731],[20.61433,101.071564],[20.61392,101.070877],[20.61338,101.069649],[20.612909,101.069092],[20.611031,101.068062],[20.6094,101.067436],[20.608749,101.067139],[20.607571,101.066399],[20.60638,101.065758],[20.605659,101.065567],[20.604589,101.065857],[20.60412,101.066147],[20.6033,101.0662],[20.602989,101.066032],[20.60177,101.064842],[20.601231,101.064377],[20.60047,101.063942],[20.59808,101.063057],[20.597231,101.062599],[20.596189,101.06221],[20.59548,101.061638],[20.59498,101.060852],[20.59428,101.060387],[20.59376,101.060303],[20.593109,101.059952],[20.591631,101.058723],[20.59132,101.058113],[20.590731,101.055931],[20.589729,101.053772],[20.58914,101.051903],[20.588221,101.050682],[20.586269,101.048897],[20.585609,101.048561],[20.584181,101.048302],[20.58263,101.048203],[20.58144,101.047684],[20.579809,101.047829],[20.578791,101.046982],[20.578609,101.046478],[20.578621,101.045578],[20.578329,101.045082],[20.57781,101.04483],[20.576771,101.043968],[20.575359,101.04261],[20.57526,101.042007],[20.57534,101.041771],[20.5756,101.041321],[20.57601,101.040932],[20.57641,101.04068],[20.57692,101.040031],[20.57786,101.038063],[20.57855,101.037613],[20.57943,101.037949],[20.579651,101.0382],[20.580391,101.039436],[20.58083,101.039673],[20.58103,101.039307],[20.58106,101.03894],[20.58148,101.0383],[20.581739,101.038254],[20.582291,101.037956],[20.58223,101.037659],[20.582001,101.03701],[20.582211,101.036247],[20.582529,101.036034],[20.58309,101.035378],[20.583151,101.034973],[20.58288,101.034416],[20.582211,101.03434],[20.581659,101.03476],[20.58082,101.034737],[20.58021,101.033791],[20.58004,101.033241],[20.58007,101.032333],[20.579781,101.031731],[20.577749,101.029953],[20.57756,101.029602],[20.577141,101.029343],[20.57696,101.029427],[20.57642,101.029877],[20.57612,101.02993],[20.575781,101.0299],[20.57556,101.029831],[20.57505,101.028816],[20.574751,101.028816],[20.57456,101.028908],[20.57383,101.028847],[20.572729,101.028511],[20.57069,101.028091],[20.5688,101.027817],[20.56827,101.027237],[20.568291,101.026779],[20.568439,101.026031],[20.56822,101.025513],[20.567841,101.025352],[20.567329,101.02552],[20.566971,101.025757],[20.56641,101.025757],[20.564489,101.024986],[20.564039,101.02459],[20.56389,101.024231],[20.563801,101.02388],[20.563551,101.023453],[20.563129,101.023178],[20.562531,101.023003],[20.562229,101.022728],[20.56225,101.02198],[20.56193,101.021362],[20.561541,101.021072],[20.56139,101.020493],[20.561449,101.020393],[20.56163,101.019592],[20.561159,101.019112],[20.560499,101.018959],[20.55938,101.019341],[20.558701,101.01915],[20.55862,101.019051],[20.55801,101.018784],[20.5574,101.01857],[20.55698,101.01754],[20.556499,101.01696],[20.55608,101.016747],[20.555599,101.016113],[20.55518,101.014618],[20.554899,101.013847],[20.55479,101.012917],[20.555,101.012421],[20.555349,101.011757],[20.555389,101.011497],[20.55579,101.011002],[20.55604,101.01088],[20.55661,101.01004],[20.556971,101.008743],[20.557289,101.008118],[20.557541,101.007347],[20.55731,101.006798],[20.55694,101.006767],[20.556709,101.006798],[20.55617,101.006683],[20.555639,101.006241],[20.55555,101.005898],[20.555599,101.005508],[20.555901,101.004578],[20.555861,101.00415],[20.555599,101.003983],[20.55525,101.003532],[20.555149,101.003014],[20.55477,101.002808],[20.554411,101.002403],[20.554399,101.002052],[20.55467,101.000832],[20.55497,101.000343],[20.555241,101.000122],[20.5555,100.999748],[20.555519,100.99926],[20.555429,100.996834],[20.554729,100.995697],[20.55479,100.995163],[20.55497,100.994797],[20.55489,100.994133],[20.55426,100.993599],[20.55397,100.993568],[20.55353,100.993156],[20.55308,100.992416],[20.552521,100.992332],[20.55209,100.992523],[20.551741,100.99231],[20.551531,100.991898],[20.55085,100.990868],[20.55032,100.990334],[20.549789,100.990082],[20.549299,100.989761],[20.54896,100.989288],[20.54842,100.988937],[20.547911,100.989052],[20.547541,100.989052],[20.54726,100.988808],[20.547199,100.988564],[20.547291,100.988129],[20.54792,100.987732],[20.548281,100.987221],[20.54855,100.986969],[20.54892,100.98597],[20.549141,100.985703],[20.54917,100.985458],[20.549219,100.984077],[20.548691,100.982964],[20.54842,100.981506],[20.548479,100.980377],[20.5481,100.978722],[20.54752,100.978149],[20.54685,100.977989],[20.54624,100.97744],[20.5457,100.976273],[20.5452,100.975906],[20.544399,100.975807],[20.54377,100.975662],[20.542471,100.975243],[20.54208,100.974892],[20.54159,100.974548],[20.539921,100.973717],[20.53916,100.973557],[20.538691,100.973351],[20.538179,100.973351],[20.5369,100.974091],[20.536739,100.974319],[20.536341,100.974571],[20.535971,100.974487],[20.535299,100.974068],[20.53492,100.973717],[20.534109,100.973328],[20.53293,100.973343],[20.531759,100.97274],[20.53125,100.972107],[20.53051,100.970657],[20.53039,100.969528],[20.5303,100.969162],[20.53018,100.968811],[20.5298,100.968231],[20.52944,100.967308],[20.529369,100.966843],[20.528959,100.966469],[20.528351,100.966072],[20.528219,100.965103],[20.527941,100.963737],[20.527439,100.963303],[20.526911,100.962936],[20.526951,100.962593],[20.526859,100.962067],[20.526461,100.961693],[20.526291,100.961227],[20.526251,100.960648],[20.525999,100.960114],[20.525721,100.959808],[20.525379,100.959648],[20.52515,100.95961],[20.52487,100.959358],[20.524879,100.959],[20.52479,100.958633],[20.524349,100.957977],[20.52438,100.957527],[20.52458,100.956757],[20.524401,100.956306],[20.523899,100.955887],[20.52313,100.955688],[20.521749,100.955513],[20.52129,100.955353],[20.520531,100.955307],[20.519991,100.955101],[20.51984,100.954948],[20.51955,100.954887],[20.51899,100.954674],[20.51889,100.954483],[20.518459,100.954193],[20.517891,100.954369],[20.51753,100.954918],[20.517229,100.955589],[20.516911,100.955673],[20.516781,100.955406],[20.51675,100.955177],[20.516399,100.95488],[20.516001,100.955002],[20.51556,100.954964],[20.515129,100.955009],[20.51465,100.954941],[20.514441,100.954613],[20.514151,100.954613],[20.513359,100.954933],[20.512911,100.955147],[20.512659,100.955383],[20.512381,100.955353],[20.512211,100.955177],[20.511669,100.954857],[20.510799,100.954773],[20.51033,100.95462],[20.509859,100.95462],[20.509159,100.954979],[20.508619,100.95491],[20.508591,100.954819],[20.50824,100.954483],[20.507959,100.954536],[20.50754,100.954376],[20.50742,100.953873],[20.5072,100.953484],[20.506941,100.953117],[20.506491,100.952904],[20.50629,100.95295],[20.50569,100.952927],[20.505541,100.952667],[20.505461,100.95208],[20.505541,100.951523],[20.50552,100.951027],[20.50514,100.95005],[20.504801,100.949707],[20.5047,100.949722],[20.504009,100.949532],[20.50391,100.949249],[20.50391,100.948463],[20.504061,100.94799],[20.50411,100.947418],[20.50355,100.946037],[20.503401,100.945763],[20.503059,100.945679],[20.502661,100.945686],[20.50226,100.945457],[20.501881,100.945129],[20.50157,100.945236],[20.501011,100.945084],[20.500731,100.944633],[20.500641,100.944183],[20.49922,100.941566],[20.499359,100.940933],[20.499519,100.94046],[20.499371,100.940048],[20.499241,100.93988],[20.498859,100.93972],[20.498159,100.939621],[20.4972,100.939293],[20.496759,100.939034],[20.495871,100.938087],[20.49571,100.937851],[20.49563,100.937263],[20.495661,100.93663],[20.495871,100.936119],[20.49629,100.935638],[20.496309,100.935127],[20.496031,100.934868],[20.49571,100.934036],[20.49589,100.933388],[20.495741,100.932892],[20.49498,100.932777],[20.49445,100.932426],[20.49431,100.931923],[20.494341,100.931267],[20.49431,100.931099],[20.494011,100.930893],[20.49321,100.930763],[20.492571,100.930313],[20.49185,100.928413],[20.491751,100.927803],[20.49176,100.927254],[20.49139,100.92659],[20.49098,100.926178],[20.490841,100.925911],[20.490829,100.925552],[20.491171,100.924057],[20.49114,100.923424],[20.49077,100.92276],[20.489731,100.921677],[20.48945,100.921021],[20.489349,100.920464],[20.489,100.919884],[20.4884,100.919647],[20.48777,100.919579],[20.487341,100.919411],[20.487,100.918861],[20.486811,100.918312],[20.485781,100.918266],[20.48568,100.918182],[20.485201,100.917587],[20.48465,100.916412],[20.484159,100.91584],[20.482771,100.914902],[20.4821,100.914253],[20.48135,100.912987],[20.480671,100.912178],[20.480471,100.911392],[20.480471,100.91098],[20.480089,100.910461],[20.479731,100.910301],[20.479071,100.90979],[20.47794,100.909103],[20.477369,100.908531],[20.476601,100.906883],[20.47571,100.90554],[20.474541,100.904732],[20.473881,100.904083],[20.472811,100.903282],[20.47242,100.903183],[20.472,100.903503],[20.471279,100.904449],[20.470301,100.904877],[20.469681,100.904831],[20.46957,100.904793],[20.46909,100.904823],[20.46899,100.9049],[20.468519,100.905083],[20.468321,100.904953],[20.467649,100.904373],[20.46719,100.904243],[20.466841,100.904373],[20.46665,100.904541],[20.4662,100.90477],[20.466,100.904678],[20.46546,100.903999],[20.465309,100.903397],[20.465151,100.902946],[20.464861,100.902763],[20.464399,100.902634],[20.464001,100.902367],[20.463751,100.901993],[20.463631,100.901466],[20.46343,100.901207],[20.463039,100.901466],[20.46282,100.90168],[20.462469,100.901588],[20.46212,100.900787],[20.46162,100.900551],[20.46133,100.900681],[20.46069,100.900719],[20.45845,100.899513],[20.457861,100.899582],[20.45747,100.899841],[20.456659,100.900284],[20.456261,100.900414],[20.455641,100.900398],[20.455151,100.900307],[20.455021,100.900269],[20.454729,100.900047],[20.45451,100.899963],[20.45429,100.899986],[20.45396,100.900497],[20.45385,100.901176],[20.453739,100.90139],[20.453609,100.901497],[20.452829,100.901802],[20.452379,100.902184],[20.452061,100.902313],[20.451651,100.902046],[20.451401,100.902023],[20.451059,100.902046],[20.450279,100.902458],[20.45005,100.902367],[20.449881,100.902206],[20.44982,100.902008],[20.4499,100.901688],[20.45009,100.90136],[20.45014,100.900932],[20.449961,100.900688],[20.449631,100.900429],[20.44912,100.900352],[20.448231,100.900642],[20.447929,100.900574],[20.44776,100.900124],[20.447121,100.899727],[20.446989,100.89901],[20.446911,100.898842],[20.44643,100.898232],[20.44639,100.897873],[20.446119,100.897621],[20.445709,100.897324],[20.44548,100.897087],[20.44516,100.896988],[20.44486,100.896957],[20.44445,100.896759],[20.443979,100.896339],[20.44319,100.89537],[20.44272,100.895103],[20.44248,100.894997],[20.44202,100.894943],[20.441351,100.894531],[20.441059,100.893669],[20.44046,100.892189],[20.43977,100.890793],[20.43943,100.890282],[20.438919,100.889763],[20.43788,100.889023],[20.43775,100.888542],[20.437759,100.888077],[20.43762,100.887833],[20.43714,100.887604],[20.43623,100.887047],[20.43495,100.886482],[20.43429,100.886368],[20.433781,100.886124],[20.433281,100.885551],[20.432489,100.884438],[20.43186,100.883698],[20.431721,100.883377],[20.43148,100.882393],[20.43161,100.881477],[20.431881,100.880569],[20.432011,100.879272],[20.432039,100.878532],[20.4324,100.877853],[20.43273,100.877502],[20.432911,100.877068],[20.43289,100.876793],[20.4321,100.875381],[20.43191,100.874802],[20.43194,100.87458],[20.432581,100.872719],[20.432581,100.872276],[20.43252,100.872063],[20.43162,100.870483],[20.431311,100.870262],[20.430981,100.870163],[20.43005,100.869987],[20.429199,100.869553],[20.428631,100.869164],[20.42746,100.868912],[20.42679,100.868423],[20.425791,100.865967],[20.425171,100.865547],[20.42388,100.865791],[20.42346,100.865646],[20.422541,100.865097],[20.42201,100.865021],[20.42149,100.86512],[20.421021,100.865021],[20.42034,100.864563],[20.41993,100.86441],[20.418819,100.864616],[20.4179,100.864693],[20.417549,100.864601],[20.417191,100.864342],[20.416691,100.863647],[20.41651,100.863052],[20.416361,100.862183],[20.41654,100.86145],[20.417061,100.861153],[20.417681,100.86113],[20.418091,100.860687],[20.41827,100.859192],[20.418051,100.858353],[20.41744,100.857529],[20.41696,100.856644],[20.41647,100.855377],[20.416161,100.854729],[20.41585,100.853371],[20.41531,100.852493],[20.414829,100.851921],[20.41411,100.851807],[20.413851,100.851913],[20.41334,100.851891],[20.41227,100.851173],[20.411011,100.850693],[20.41024,100.850456],[20.409161,100.850647],[20.4083,100.851181],[20.40797,100.851501],[20.407829,100.85173],[20.407471,100.851898],[20.40719,100.851692],[20.406799,100.851608],[20.406441,100.85186],[20.40589,100.851952],[20.405939,100.851692],[20.40617,100.851547],[20.406401,100.851303],[20.406481,100.850723],[20.4063,100.850304],[20.4062,100.849747],[20.406031,100.849426],[20.40575,100.84903],[20.405689,100.848663],[20.405701,100.848289],[20.4056,100.848053],[20.405199,100.847672],[20.404961,100.847282],[20.4039,100.844551],[20.40336,100.84343],[20.40317,100.84256],[20.402519,100.841721],[20.40229,100.841179],[20.402269,100.840698],[20.40242,100.840233],[20.40267,100.839737],[20.402769,100.838913],[20.40255,100.838364],[20.402349,100.838127],[20.401461,100.837593],[20.401011,100.837212],[20.40053,100.836159],[20.400261,100.835037],[20.39954,100.833992],[20.399269,100.83374],[20.398939,100.83287],[20.398991,100.832283],[20.39875,100.83165],[20.398331,100.83136],[20.3974,100.83091],[20.39673,100.83007],[20.396311,100.829826],[20.3958,100.829758],[20.395069,100.82946],[20.39382,100.828629],[20.39279,100.828011],[20.392191,100.827499],[20.391821,100.826736],[20.391741,100.825974],[20.39159,100.8255],[20.391411,100.825127],[20.38825,100.819542],[20.38793,100.819183],[20.387569,100.818626],[20.387489,100.818451],[20.387341,100.817963],[20.38714,100.816818],[20.386801,100.815941],[20.386749,100.815369],[20.38707,100.81385],[20.387199,100.813408],[20.387409,100.813042],[20.387449,100.81279],[20.38743,100.812622],[20.387119,100.812263],[20.386539,100.81205],[20.386061,100.811661],[20.385509,100.811409],[20.38489,100.811539],[20.3846,100.811523],[20.38423,100.811234],[20.383739,100.810417],[20.38348,100.810173],[20.38299,100.809921],[20.382561,100.809387],[20.38196,100.807297],[20.38113,100.805763],[20.380911,100.804916],[20.38061,100.804077],[20.38055,100.803352],[20.38064,100.802711],[20.3804,100.801903],[20.379869,100.801193],[20.3792,100.8004],[20.378929,100.799477],[20.378759,100.798393],[20.37841,100.797707],[20.377251,100.796219],[20.376989,100.795158],[20.376949,100.793961],[20.37689,100.793716],[20.375931,100.79213],[20.37571,100.791107],[20.375681,100.789543],[20.375401,100.788361],[20.374701,100.786774],[20.374371,100.785843],[20.372959,100.782387],[20.372789,100.781883],[20.3727,100.781303],[20.37212,100.780533],[20.37154,100.779892],[20.371189,100.779694],[20.37081,100.779663],[20.37048,100.7798],[20.36981,100.780281],[20.368521,100.780807],[20.368019,100.780952],[20.367649,100.780861],[20.367491,100.780609],[20.367319,100.780083],[20.367041,100.779579],[20.36451,100.776817],[20.364189,100.776627],[20.363819,100.776787],[20.363609,100.777168],[20.3634,100.777367],[20.362921,100.777603],[20.3626,100.777847],[20.36236,100.777977],[20.362089,100.77774],[20.362089,100.777489],[20.362631,100.776283],[20.36305,100.774963],[20.363199,100.7743],[20.36344,100.773872],[20.363831,100.773392],[20.363911,100.77298],[20.363729,100.772507],[20.363569,100.772301],[20.36347,100.771698],[20.363581,100.771027],[20.36319,100.770531],[20.36265,100.769958],[20.36215,100.769112],[20.36161,100.768837],[20.36137,100.768867],[20.36116,100.768822],[20.36088,100.768646],[20.360689,100.768097],[20.360809,100.767242],[20.360649,100.766617],[20.36017,100.765137],[20.36006,100.764549],[20.360109,100.763947],[20.360519,100.763573],[20.36062,100.763557],[20.36084,100.76339],[20.360979,100.762657],[20.361469,100.762306],[20.36165,100.762062],[20.361641,100.761658],[20.361,100.760948],[20.36079,100.760422],[20.36071,100.76001],[20.3608,100.759506],[20.360941,100.759323],[20.361179,100.759109],[20.36128,100.758728],[20.361179,100.758553],[20.36101,100.757988],[20.361059,100.757187],[20.361031,100.756912],[20.36109,100.756393],[20.360991,100.75592],[20.360701,100.755699],[20.360519,100.755363],[20.3605,100.755219],[20.360491,100.754608],[20.3606,100.754219],[20.36092,100.753792],[20.36104,100.752907],[20.360901,100.752434],[20.36084,100.750587],[20.36058,100.749977],[20.360451,100.749313],[20.3603,100.748833],[20.360041,100.748421],[20.359171,100.747307],[20.35895,100.746758],[20.358841,100.745842],[20.358509,100.744392],[20.358709,100.743652],[20.35891,100.743362],[20.35898,100.742538],[20.3589,100.742188],[20.35845,100.741653],[20.357941,100.741547],[20.35754,100.741432],[20.356831,100.740913],[20.356331,100.740807],[20.35593,100.740837],[20.35537,100.740517],[20.355209,100.740196],[20.354429,100.738113],[20.35376,100.736107],[20.353001,100.734627],[20.352421,100.733772],[20.352209,100.733543],[20.351999,100.733192],[20.351879,100.73275],[20.351839,100.732262],[20.351891,100.731537],[20.35169,100.730789],[20.351521,100.730362],[20.35149,100.729736],[20.35153,100.729507],[20.35186,100.729012],[20.353081,100.727547],[20.355471,100.725609],[20.355841,100.724991],[20.35594,100.724503],[20.35598,100.721733],[20.355761,100.721252],[20.354799,100.7202],[20.354271,100.719833],[20.35388,100.719398],[20.35384,100.718674],[20.35331,100.717789],[20.35264,100.717194],[20.35252,100.71669],[20.35284,100.715897],[20.35318,100.715599],[20.353701,100.715561],[20.35397,100.715111],[20.35391,100.714462],[20.354231,100.713768],[20.35479,100.713478],[20.35507,100.71312],[20.355579,100.712921],[20.35626,100.713051],[20.357,100.71286],[20.35745,100.712578],[20.358089,100.711929],[20.35874,100.711441],[20.35887,100.711403],[20.35931,100.711357],[20.35961,100.711456],[20.36083,100.712143],[20.36128,100.71212],[20.36129,100.711639],[20.36125,100.71096],[20.36128,100.710663],[20.361561,100.710159],[20.36167,100.709839],[20.361679,100.709351],[20.36149,100.708809],[20.3615,100.70829],[20.36186,100.707458],[20.361879,100.706818],[20.36179,100.705933],[20.361799,100.704933],[20.361879,100.704659],[20.36215,100.704163],[20.36253,100.703773],[20.36327,100.703308],[20.36344,100.70314],[20.363621,100.702858],[20.363569,100.7024],[20.363199,100.701279],[20.36265,100.700531],[20.362511,100.700272],[20.3627,100.698997],[20.363359,100.69799],[20.363741,100.696861],[20.364189,100.695938],[20.365049,100.694862],[20.36602,100.693771],[20.367121,100.692047],[20.367201,100.691879],[20.36727,100.690613],[20.36672,100.689194],[20.366659,100.688438],[20.366449,100.687683],[20.366079,100.687073],[20.365471,100.686607],[20.36454,100.686203],[20.364031,100.685371],[20.364111,100.684464],[20.36484,100.682533],[20.36484,100.682167],[20.364559,100.680946],[20.364309,100.680222],[20.364389,100.679558],[20.36446,100.679359],[20.364479,100.678917],[20.364429,100.678467],[20.364491,100.678032],[20.364611,100.677727],[20.364639,100.677147],[20.36442,100.676842],[20.36405,100.676666],[20.3631,100.676376],[20.36293,100.676277],[20.362341,100.675774],[20.36183,100.675163],[20.36145,100.674423],[20.361349,100.674026],[20.361389,100.672523],[20.36096,100.670631],[20.36039,100.66877],[20.36035,100.667908],[20.3601,100.667038],[20.359289,100.665192],[20.358999,100.664146],[20.35878,100.663017],[20.35887,100.662514],[20.358971,100.662277],[20.35936,100.661819],[20.359591,100.661163],[20.359501,100.660599],[20.359249,100.659683],[20.35911,100.657623],[20.358919,100.657127],[20.35828,100.656113],[20.358061,100.655678],[20.358009,100.654892],[20.3578,100.65432],[20.356991,100.653603],[20.356319,100.652359],[20.35602,100.651573],[20.355881,100.650909],[20.355579,100.648392],[20.355459,100.647987],[20.355089,100.647163],[20.355061,100.646568],[20.35541,100.646088],[20.3556,100.6455],[20.35557,100.644867],[20.355499,100.644569],[20.35507,100.643646],[20.35486,100.642967],[20.35471,100.642616],[20.354441,100.642212],[20.354469,100.641777],[20.355169,100.641617],[20.35548,100.641289],[20.355471,100.641037],[20.35537,100.640633],[20.35556,100.640099],[20.35564,100.639603],[20.35552,100.639214],[20.35527,100.638763],[20.35511,100.637718],[20.35515,100.637253],[20.355499,100.636238],[20.355551,100.635612],[20.35533,100.634941],[20.355101,100.634422],[20.355089,100.633911],[20.35535,100.633087],[20.355749,100.632797],[20.356001,100.632721],[20.35652,100.632339],[20.35663,100.632118],[20.357059,100.631897],[20.357349,100.632187],[20.35779,100.633057],[20.35833,100.633522],[20.359249,100.633881],[20.35972,100.633789],[20.3606,100.633453],[20.36109,100.63372],[20.36145,100.633698],[20.36198,100.633423],[20.36241,100.6325],[20.36285,100.631653],[20.36348,100.631264],[20.36356,100.630981],[20.36334,100.629883],[20.363649,100.629463],[20.363951,100.629417],[20.364241,100.629646],[20.36475,100.630089],[20.366261,100.630089],[20.36676,100.630257],[20.36722,100.630241],[20.367359,100.630096],[20.367661,100.62915],[20.36801,100.628601],[20.36879,100.628143],[20.369249,100.627342],[20.36919,100.6269],[20.368679,100.626373],[20.36817,100.624977],[20.36775,100.62352],[20.36764,100.622238],[20.36821,100.621208],[20.368561,100.620399],[20.36894,100.617233],[20.36931,100.615646],[20.369789,100.614014],[20.370131,100.613327],[20.37133,100.612297],[20.371679,100.611603],[20.37171,100.611191],[20.371889,100.610779],[20.37208,100.610573],[20.372219,100.610008],[20.371969,100.609047],[20.372511,100.607971],[20.374069,100.606483],[20.374969,100.605927],[20.376051,100.606056],[20.38036,100.602577],[20.38096,100.601677],[20.381519,100.600143],[20.38242,100.598907],[20.382891,100.596527],[20.383659,100.594353],[20.385059,100.59182],[20.38669,100.590233],[20.387131,100.587471],[20.387171,100.586563],[20.38603,100.583878],[20.380939,100.576797],[20.380171,100.575996],[20.36994,100.571991],[20.36841,100.570488],[20.3664,100.568863],[20.36528,100.567017],[20.364679,100.564987],[20.360701,100.554718],[20.358471,100.553917],[20.35429,100.54924],[20.35074,100.543022],[20.349541,100.541199],[20.348101,100.539291],[20.347191,100.538368],[20.342621,100.534698],[20.341419,100.533577],[20.340731,100.532547],[20.338511,100.530228],[20.337061,100.528732],[20.336281,100.528328],[20.33316,100.527657],[20.33197,100.526894],[20.33049,100.525299],[20.329559,100.524841],[20.32822,100.524857],[20.32708,100.524368],[20.32666,100.523468],[20.326349,100.5215],[20.325621,100.518784],[20.324909,100.518204],[20.324181,100.518158],[20.323641,100.518646],[20.321939,100.520767],[20.321239,100.521683],[20.320419,100.522118],[20.319901,100.522209],[20.318251,100.522148],[20.317381,100.522507],[20.316191,100.523354],[20.31547,100.523369],[20.31489,100.522926],[20.314529,100.52272],[20.313761,100.522552],[20.311609,100.520554],[20.310949,100.519928],[20.30965,100.518463],[20.30732,100.516968],[20.306,100.516747],[20.30275,100.517471],[20.300171,100.516441],[20.29899,100.51564],[20.29772,100.514442],[20.29727,100.512657],[20.297359,100.511261],[20.29715,100.510277],[20.296301,100.509506],[20.29497,100.509071],[20.29368,100.509033],[20.29195,100.506844],[20.2903,100.50457],[20.285521,100.502708],[20.283449,100.498299],[20.283251,100.496407],[20.280399,100.493027],[20.27717,100.491127],[20.27722,100.485771],[20.27581,100.479683],[20.274639,100.478523],[20.276501,100.473183],[20.27618,100.469414],[20.274891,100.467171],[20.273279,100.463387],[20.26845,100.46254],[20.26667,100.463539],[20.264891,100.464142],[20.263081,100.463921],[20.261669,100.464081],[20.26067,100.463333],[20.25362,100.451843],[20.251631,100.44397],[20.249929,100.44194],[20.24954,100.441002],[20.24959,100.439781],[20.249439,100.438667],[20.24979,100.437653],[20.250509,100.43676],[20.251249,100.436211],[20.251579,100.435791],[20.2516,100.434952],[20.25148,100.434082],[20.251381,100.433037],[20.25115,100.432297],[20.250879,100.431953],[20.25086,100.43148],[20.251381,100.430908],[20.25153,100.430489],[20.25128,100.430344],[20.25071,100.430359],[20.25016,100.430138],[20.25004,100.429741],[20.24996,100.428307],[20.25029,100.426987],[20.2505,100.426437],[20.25102,100.425758],[20.251671,100.425217],[20.252331,100.42408],[20.25292,100.42347],[20.25317,100.422729],[20.25334,100.422363],[20.254629,100.420921],[20.25526,100.420212],[20.25573,100.419533],[20.256161,100.418854],[20.2575,100.418037],[20.26022,100.416687],[20.26158,100.416077],[20.26276,100.415337],[20.263371,100.415131],[20.264509,100.415283],[20.26535,100.415337],[20.26556,100.415237],[20.26605,100.414757],[20.26685,100.414177],[20.267191,100.414017],[20.26763,100.413971],[20.26852,100.413879],[20.269581,100.413933],[20.270361,100.413727],[20.27227,100.413208],[20.27359,100.412773],[20.274349,100.412514],[20.27471,100.412376],[20.27606,100.411873],[20.276831,100.411552],[20.276409,100.410561],[20.276279,100.410294],[20.27615,100.409988],[20.27606,100.409683],[20.27594,100.409302],[20.275141,100.406822],[20.27511,100.40654],[20.275169,100.406197],[20.275311,100.406013],[20.275841,100.405251],[20.27589,100.404793],[20.275749,100.404839],[20.27441,100.405243],[20.27425,100.403351],[20.27413,100.402611],[20.27413,100.401932],[20.27434,100.401443],[20.274639,100.401062],[20.274851,100.400742],[20.274929,100.400337],[20.27487,100.399857],[20.27471,100.399567],[20.27459,100.399223],[20.274679,100.398827],[20.27494,100.398552],[20.27527,100.398163],[20.275551,100.397858],[20.275881,100.397522],[20.276079,100.397163],[20.276199,100.396843],[20.27632,100.396652],[20.27663,100.396622],[20.276911,100.396667],[20.27717,100.396584],[20.277411,100.396347],[20.27774,100.396149],[20.278099,100.39595],[20.27853,100.395973],[20.27895,100.396049],[20.279409,100.396217],[20.279831,100.396118],[20.280199,100.395813],[20.28047,100.3955],[20.280781,100.395203],[20.281601,100.394882],[20.282761,100.394447],[20.28368,100.394043],[20.28441,100.393593],[20.28524,100.393028],[20.28595,100.392647],[20.28698,100.391853],[20.28813,100.390877],[20.288759,100.390312],[20.289141,100.390083],[20.289619,100.389954],[20.289841,100.389992],[20.290581,100.390106],[20.291149,100.390129],[20.291599,100.390091],[20.29217,100.389877],[20.292589,100.389542],[20.292999,100.389359],[20.293369,100.389374],[20.293961,100.389542],[20.29447,100.389641],[20.294821,100.38961],[20.295271,100.38929],[20.295679,100.388977],[20.296261,100.388687],[20.296801,100.388641],[20.29731,100.388573],[20.29837,100.388542],[20.30019,100.388527],[20.30183,100.388512],[20.302429,100.388474],[20.30319,100.38829],[20.303801,100.388153],[20.3043,100.388008],[20.304621,100.387787],[20.304831,100.387444],[20.30509,100.386993],[20.30526,100.386574],[20.305479,100.386139],[20.30575,100.385818],[20.30608,100.385567],[20.306459,100.385223],[20.30687,100.38485],[20.307541,100.384323],[20.308189,100.383972],[20.30883,100.383537],[20.309139,100.383232],[20.309401,100.382782],[20.309681,100.382477],[20.31003,100.382294],[20.31057,100.382057],[20.31098,100.381866],[20.31156,100.381599],[20.31197,100.381378],[20.3123,100.381279],[20.312639,100.381027],[20.312889,100.380707],[20.313,100.380417],[20.313311,100.380112],[20.313641,100.379959],[20.31443,100.380043],[20.314791,100.380081],[20.315161,100.380127],[20.315491,100.379982],[20.31592,100.379784],[20.31637,100.379608],[20.31674,100.379433],[20.317169,100.379242],[20.3176,100.379158],[20.318119,100.379059],[20.31848,100.378937],[20.31889,100.37886],[20.319321,100.37886],[20.319889,100.37899],[20.3204,100.379143],[20.3209,100.379341],[20.321369,100.379547],[20.3218,100.379631],[20.322241,100.379623],[20.322611,100.379562],[20.32299,100.379532],[20.323339,100.379608],[20.323641,100.379692],[20.32411,100.379707],[20.32449,100.379662],[20.324921,100.379608],[20.32535,100.379517],[20.325729,100.379341],[20.326059,100.379143],[20.326441,100.379028],[20.32682,100.378967],[20.327221,100.37899],[20.32765,100.37886],[20.328011,100.378616],[20.32826,100.378326],[20.32863,100.377823],[20.328859,100.377487],[20.329109,100.377243],[20.32934,100.37706],[20.32963,100.376953],[20.329941,100.37664],[20.330299,100.376266],[20.330561,100.376167],[20.330811,100.376137],[20.331169,100.37616],[20.33145,100.376137],[20.331779,100.37606],[20.33213,100.375977],[20.332411,100.375961],[20.33263,100.376106],[20.332979,100.376221],[20.33329,100.376259],[20.33354,100.376228],[20.3339,100.37606],[20.3342,100.375877],[20.334539,100.375771],[20.334829,100.375763],[20.335251,100.37574],[20.335541,100.375763],[20.336029,100.375687],[20.33626,100.375671],[20.33643,100.375603],[20.3367,100.375473],[20.33703,100.37532],[20.337179,100.375252],[20.33742,100.375221],[20.337721,100.375191],[20.33802,100.375168],[20.338261,100.375038],[20.3384,100.37484],[20.33847,100.374542],[20.338579,100.374367],[20.33876,100.374283],[20.33905,100.374123],[20.339331,100.37397],[20.33963,100.373917],[20.33988,100.373917],[20.340219,100.37394],[20.34067,100.374039],[20.34096,100.374138],[20.34128,100.374191],[20.341631,100.374268],[20.34194,100.374222],[20.342171,100.374153],[20.34252,100.373993],[20.342779,100.373787],[20.342979,100.373619],[20.343149,100.37355],[20.343321,100.373573],[20.343439,100.373718],[20.343571,100.373993],[20.343639,100.374237],[20.343809,100.374451],[20.343969,100.374527],[20.3442,100.374588],[20.34449,100.374496],[20.34466,100.374367],[20.34499,100.374252],[20.345261,100.374168],[20.34564,100.373993],[20.3459,100.373756],[20.346201,100.373489],[20.346491,100.373222],[20.346901,100.372871],[20.34734,100.372421],[20.347401,100.372139],[20.347389,100.371803],[20.34742,100.371429],[20.34758,100.371147],[20.347691,100.370857],[20.347719,100.370499],[20.34775,100.370102],[20.34761,100.369751],[20.34746,100.369431],[20.347361,100.369164],[20.347429,100.368942],[20.34758,100.368767],[20.347799,100.368683],[20.348209,100.368736],[20.34856,100.368912],[20.34897,100.36911],[20.34931,100.369164],[20.349791,100.369118],[20.349871,100.368912],[20.34984,100.368584],[20.349751,100.368134],[20.34972,100.367828],[20.349819,100.367561],[20.35001,100.367409],[20.35022,100.367233],[20.3503,100.367058],[20.35021,100.366707],[20.34993,100.366386],[20.349001,100.365578],[20.34866,100.365158],[20.34852,100.364922],[20.34848,100.364563],[20.348579,100.364326],[20.34877,100.36412],[20.34897,100.363853],[20.348961,100.363533],[20.348801,100.363327],[20.348669,100.362938],[20.34873,100.362701],[20.348989,100.362427],[20.349251,100.362289],[20.34955,100.362137],[20.349911,100.362083],[20.35025,100.362068],[20.350719,100.361977],[20.351009,100.361893],[20.35121,100.361671],[20.35161,100.361397],[20.35191,100.361214],[20.35211,100.360901],[20.352079,100.360527],[20.35183,100.360138],[20.35158,100.359779],[20.35137,100.359253],[20.351299,100.358719],[20.351219,100.358002],[20.351151,100.357384],[20.35108,100.356857],[20.35088,100.356483],[20.3505,100.35611],[20.350109,100.355629],[20.349871,100.355217],[20.349701,100.354683],[20.349489,100.353912],[20.3491,100.352753],[20.348801,100.351936],[20.347561,100.350304],[20.346901,100.349297],[20.34656,100.348129],[20.34656,100.346901],[20.34639,100.345123],[20.34589,100.342987],[20.34516,100.339973],[20.344601,100.337914],[20.34466,100.335854],[20.344879,100.334167],[20.345329,100.333328],[20.34606,100.332893],[20.346901,100.333107],[20.34745,100.332718],[20.34734,100.3321],[20.34667,100.3321],[20.34568,100.33152],[20.34479,100.33123],[20.344589,100.330742],[20.34436,100.330368],[20.3437,100.330139],[20.34333,100.329803],[20.343019,100.32917],[20.342899,100.328369],[20.342899,100.32785],[20.343189,100.327393],[20.34322,100.326973],[20.34284,100.326714],[20.341669,100.326073],[20.341101,100.325531],[20.34067,100.325218],[20.339979,100.325218],[20.33952,100.325363],[20.338831,100.325241],[20.337999,100.324783],[20.33737,100.324211],[20.336769,100.323593],[20.335369,100.321274],[20.33522,100.320747],[20.334881,100.320259],[20.334339,100.319633],[20.334311,100.319199],[20.334391,100.318741],[20.33345,100.317093],[20.33288,100.317253],[20.332331,100.317337],[20.332081,100.317047],[20.33202,100.316566],[20.331619,100.316277],[20.32967,100.315422],[20.328091,100.314957],[20.32715,100.314362],[20.32658,100.313927],[20.326229,100.313393],[20.32612,100.312607],[20.32629,100.311546],[20.326151,100.310982],[20.325741,100.310516],[20.325371,100.310013],[20.325371,100.30941],[20.325689,100.307892],[20.32563,100.307426],[20.32514,100.306969],[20.324711,100.306427],[20.324051,100.305222],[20.323879,100.304573],[20.32357,100.303909],[20.32328,100.302879],[20.32291,100.301643],[20.322769,100.299751],[20.322571,100.298439],[20.32239,100.298073],[20.32202,100.297722],[20.32185,100.297348],[20.32165,100.296204],[20.321079,100.29483],[20.32073,100.293877],[20.32056,100.293022],[20.320789,100.290817],[20.320669,100.290329],[20.32053,100.289558],[20.31967,100.287437],[20.319361,100.287117],[20.31864,100.287163],[20.31818,100.28672],[20.31793,100.286179],[20.317381,100.284973],[20.31695,100.284317],[20.31624,100.283859],[20.31472,100.282997],[20.31423,100.2826],[20.313431,100.281357],[20.311621,100.277206],[20.31111,100.275887],[20.31082,100.275146],[20.30908,100.273827],[20.308451,100.273232],[20.307671,100.27137],[20.306641,100.269279],[20.306499,100.268623],[20.306499,100.265617],[20.306391,100.264183],[20.306129,100.263184],[20.305241,100.259972],[20.304871,100.258171],[20.304581,100.256622],[20.304291,100.253304],[20.30401,100.252586],[20.30341,100.252007],[20.302691,100.251839],[20.30192,100.251839],[20.301399,100.251747],[20.301121,100.251442],[20.300911,100.250214],[20.301001,100.247398],[20.30077,100.24614],[20.30043,100.245506],[20.29974,100.243019],[20.29954,100.240044],[20.29954,100.239563],[20.2992,100.239067],[20.29874,100.23864],[20.29825,100.238319],[20.29814,100.238037],[20.298161,100.234253],[20.29882,100.231483],[20.29908,100.229813],[20.299391,100.228607],[20.29949,100.227859],[20.299549,100.227211],[20.299721,100.226501],[20.299419,100.226082],[20.29817,100.224533],[20.29698,100.223846],[20.29533,100.22316],[20.29389,100.222473],[20.29315,100.222061],[20.292789,100.22155],[20.29199,100.221207],[20.29141,100.220932],[20.29093,100.220421],[20.29035,100.220078],[20.289249,100.219971],[20.288321,100.219727],[20.28706,100.219116],[20.28581,100.218048],[20.28484,100.217056],[20.283461,100.215637],[20.28233,100.214523],[20.280979,100.213013],[20.280149,100.211906],[20.27915,100.210457],[20.27844,100.209396],[20.278021,100.208717],[20.27783,100.207817],[20.27783,100.206902],[20.277571,100.205872],[20.27689,100.204773],[20.27615,100.203918],[20.27496,100.202103],[20.27429,100.200829],[20.27364,100.199516],[20.27281,100.19873],[20.271811,100.197639],[20.27062,100.196159],[20.27001,100.195267],[20.26927,100.194267],[20.26849,100.193413],[20.266081,100.191048],[20.265209,100.190262],[20.264339,100.189812],[20.26322,100.188988],[20.262699,100.188507],[20.26235,100.187859],[20.26174,100.186447],[20.260771,100.184647],[20.26021,100.182938],[20.26037,100.181908],[20.260679,100.180908],[20.2579,100.180527],[20.25491,100.17997],[20.253241,100.179314],[20.25135,100.179642],[20.249689,100.178421],[20.24847,100.17775],[20.247311,100.177437],[20.24621,100.177254],[20.2451,100.176331],[20.2435,100.174347],[20.242241,100.171883],[20.24194,100.171043],[20.24098,100.169128],[20.240601,100.167412],[20.24003,100.166458],[20.23889,100.165314],[20.238159,100.16391],[20.2374,100.161568],[20.237129,100.160439],[20.23694,100.157692],[20.23774,100.155632],[20.240351,100.150452],[20.24041,100.149551],[20.24004,100.149002],[20.238899,100.148613],[20.230089,100.145058],[20.227119,100.143799],[20.2234,100.144203],[20.22238,100.144028],[20.22163,100.14357],[20.22163,100.142311],[20.221689,100.136833],[20.22123,100.135452],[20.220779,100.134201],[20.2202,100.133003],[20.22032,100.132187],[20.220551,100.131569],[20.220949,100.130943],[20.22146,100.130539],[20.22238,100.130081],[20.2234,100.130028],[20.22426,100.130081],[20.225401,100.12957],[20.226839,100.128822],[20.228889,100.127907],[20.231239,100.126938],[20.232719,100.126312],[20.234501,100.125633],[20.235689,100.125282],[20.236549,100.125282],[20.23838,100.125557],[20.238951,100.125633],[20.239269,100.125359],[20.24003,100.124641],[20.24082,100.124222],[20.24209,100.123596],[20.24258,100.123177],[20.24321,100.122581],[20.24362,100.121933],[20.244169,100.120911],[20.244329,100.11969],[20.244141,100.114143],[20.244221,100.112823],[20.24461,100.111748],[20.24552,100.107658],[20.245569,100.105873],[20.246019,100.10495],[20.247499,100.102898],[20.248671,100.102791],[20.24914,100.102608],[20.25177,100.100777],[20.25688,100.097267],[20.258829,100.095711],[20.260731,100.093811],[20.259911,100.086281],[20.26025,100.084396],[20.261,100.082962],[20.262091,100.08181],[20.26926,100.076973],[20.26903,100.076843],[20.26845,100.076431],[20.26779,100.075684],[20.267691,100.075569],[20.2675,100.075333],[20.26725,100.074577],[20.267429,100.073776],[20.267599,100.073517],[20.267969,100.073036],[20.26873,100.072037],[20.268869,100.071808],[20.26894,100.071388],[20.268921,100.071098],[20.268801,100.069023],[20.26877,100.068626],[20.268709,100.067993],[20.26874,100.06781],[20.268801,100.067451],[20.269529,100.065788],[20.269621,100.065353],[20.26969,100.058792],[20.269739,100.057213],[20.269831,100.05687],[20.269979,100.056557],[20.27109,100.05513],[20.27137,100.054642],[20.27169,100.053932],[20.271879,100.053352],[20.2719,100.053291],[20.27212,100.051521],[20.27227,100.050903],[20.272511,100.050468],[20.272829,100.050049],[20.27322,100.049713],[20.27532,100.048187],[20.27696,100.046913],[20.278509,100.045799],[20.27902,100.04528],[20.279329,100.045052],[20.28196,100.043381],[20.28227,100.042969],[20.28232,100.042664],[20.28199,100.039772],[20.28216,100.037811],[20.28245,100.036713],[20.28249,100.03656],[20.283291,100.033943],[20.283461,100.032356],[20.28355,100.031937],[20.284889,100.027328],[20.28492,100.027069],[20.284889,100.026711],[20.284451,100.025642],[20.283649,100.02253],[20.282631,100.019608],[20.282459,100.019379],[20.2822,100.019218],[20.281549,100.018822],[20.281281,100.018517],[20.28104,100.017998],[20.28096,100.01783],[20.28046,100.016228],[20.280319,100.015823],[20.27994,100.014809],[20.27947,100.013863],[20.27894,100.012939],[20.278629,100.01239],[20.278191,100.011948],[20.277611,100.011673],[20.276871,100.011414],[20.276529,100.011253],[20.27626,100.010933],[20.2761,100.010567],[20.276011,100.009956],[20.276039,100.008537],[20.276131,100.008118],[20.276381,100.007423],[20.27643,100.007057],[20.27619,100.006447],[20.27611,100.005913],[20.276131,100.005661],[20.276541,100.004341],[20.27739,100.002243],[20.277519,100.001602],[20.27751,100.00135],[20.27717,100.000137],[20.27632,99.99839],[20.27622,99.997864],[20.27598,99.995117],[20.27578,99.994469],[20.2752,99.993393],[20.27483,99.992889],[20.274389,99.992393],[20.273899,99.991982],[20.2733,99.991608],[20.272711,99.991333],[20.27207,99.991112],[20.271151,99.990799],[20.26943,99.990196],[20.267929,99.989693],[20.26746,99.989517],[20.265051,99.98867],[20.260799,99.986908],[20.26021,99.986603],[20.25956,99.986122],[20.258579,99.98526],[20.25312,99.980637],[20.250441,99.978249],[20.249901,99.977707],[20.24902,99.976723],[20.24851,99.976128],[20.24799,99.975517],[20.243361,99.969711],[20.24229,99.968307],[20.23768,99.961952],[20.237089,99.961243],[20.23678,99.960907],[20.236469,99.960709],[20.23546,99.960403],[20.235189,99.960258],[20.235001,99.960167],[20.23457,99.959831],[20.23427,99.959534],[20.231171,99.955971],[20.23019,99.954781],[20.229759,99.954353],[20.22612,99.950317],[20.225361,99.949493],[20.223261,99.947304],[20.22253,99.946472],[20.22105,99.944946],[20.2173,99.940514],[20.21426,99.936852],[20.213909,99.936417],[20.210979,99.933022],[20.20336,99.924316],[20.20289,99.923752],[20.20256,99.923363],[20.20229,99.922813],[20.20085,99.919243],[20.200251,99.917732],[20.199671,99.916267],[20.199181,99.915077],[20.19784,99.911629],[20.19697,99.90963],[20.19672,99.908997],[20.196461,99.908287],[20.19632,99.907944],[20.19614,99.907539],[20.195181,99.905983],[20.19488,99.905342],[20.19462,99.904213],[20.19449,99.903137],[20.194229,99.901459],[20.19413,99.900963],[20.193979,99.90033],[20.19376,99.899719],[20.19334,99.898857],[20.192921,99.898331],[20.192261,99.897476],[20.1915,99.896606],[20.190639,99.895409],[20.187269,99.891022],[20.18634,99.889763],[20.185221,99.888191],[20.18457,99.887154],[20.18409,99.886269],[20.18368,99.885536],[20.18329,99.884857],[20.182751,99.883904],[20.18235,99.883186],[20.181841,99.882294],[20.181511,99.881844],[20.18092,99.881378],[20.18082,99.881287],[20.180349,99.880959],[20.179501,99.880363],[20.17819,99.879387],[20.176781,99.878387],[20.174061,99.87645],[20.17366,99.876106],[20.17345,99.875771],[20.1723,99.87352],[20.17215,99.873253],[20.17174,99.872673],[20.17095,99.872009],[20.169439,99.871193],[20.169069,99.87088],[20.16851,99.870308],[20.1668,99.869034],[20.16614,99.868408],[20.164459,99.866531],[20.163719,99.866043],[20.162889,99.865593],[20.160891,99.86451],[20.160801,99.864464],[20.16007,99.864059],[20.15867,99.863297],[20.157801,99.862694],[20.156269,99.861603],[20.156019,99.861389],[20.15589,99.861023],[20.15583,99.860527],[20.15589,99.860184],[20.155491,99.860199],[20.1551,99.860184],[20.1548,99.860092],[20.154181,99.859833],[20.154079,99.859734],[20.153299,99.8591],[20.152769,99.858704],[20.15164,99.858276],[20.147631,99.857521],[20.14694,99.857384],[20.14674,99.857361],[20.145821,99.857262],[20.14502,99.85717],[20.144711,99.85714],[20.143869,99.85704],[20.143379,99.856987],[20.142599,99.856903],[20.139759,99.856598],[20.13909,99.856613],[20.13855,99.856728],[20.137991,99.856918],[20.137341,99.85746],[20.13419,99.860947],[20.13195,99.862442],[20.13092,99.863426],[20.130289,99.863953],[20.12956,99.864464],[20.12685,99.867111],[20.12649,99.867317],[20.126051,99.867447],[20.12459,99.867813],[20.122669,99.868134],[20.12114,99.868584],[20.119909,99.869034],[20.119301,99.869392],[20.118059,99.87043],[20.11643,99.872063],[20.11577,99.87249],[20.11545,99.872627],[20.114981,99.872757],[20.09539,99.874527],[20.09425,99.874573],[20.090561,99.874893],[20.08865,99.874657],[20.08559,99.874527],[20.08499,99.87455],[20.080891,99.874908],[20.079241,99.875107],[20.07443,99.875717],[20.07328,99.875687],[20.06992,99.875542],[20.064859,99.875557],[20.06189,99.875443],[20.05637,99.875359],[20.05394,99.875443],[20.05282,99.875542],[20.049891,99.875992],[20.046709,99.876244],[20.0462,99.876266],[20.04603,99.876282],[20.045691,99.876312],[20.04425,99.876404],[20.04303,99.876297],[20.041679,99.876137],[20.04003,99.875839],[20.03854,99.875542],[20.03141,99.874046],[20.028919,99.873497],[20.026489,99.872787],[20.02272,99.87146],[20.01881,99.870377],[20.014919,99.86937],[20.01181,99.868759],[20.00489,99.867264],[20.004431,99.867188],[20.001101,99.866623],[19.99958,99.866287],[19.998461,99.865959],[19.994511,99.864754],[19.993469,99.864433],[19.991541,99.86377],[19.987789,99.862572],[19.983509,99.861198],[19.977421,99.859497],[19.9772,99.859444],[19.973289,99.858208],[19.969009,99.856873],[19.968769,99.856796],[19.967291,99.856339],[19.962219,99.854317],[19.96102,99.853737],[19.95957,99.853073],[19.956461,99.851562],[19.950371,99.848991],[19.95006,99.848846],[19.94776,99.848],[19.94174,99.8461],[19.941191,99.845947],[19.940399,99.845627],[19.939939,99.845512],[19.939461,99.845451],[19.93458,99.844978],[19.93329,99.844856],[19.9328,99.844833],[19.932329,99.844788],[19.93128,99.844658],[19.930479,99.844559],[19.92926,99.844452],[19.928101,99.844383],[19.927031,99.844254],[19.926519,99.844254],[19.9261,99.844322],[19.925659,99.844429],[19.924841,99.844704],[19.92466,99.844772],[19.92452,99.844833],[19.92285,99.84539],[19.91926,99.84671],[19.919029,99.846786],[19.9188,99.846863],[19.91856,99.846893],[19.918301,99.846916],[19.918011,99.846939],[19.9177,99.846916],[19.91733,99.846863],[19.91716,99.846832],[19.91688,99.846786],[19.91614,99.846657],[19.91597,99.846603],[19.915791,99.846542],[19.915649,99.846451],[19.9156,99.846413],[19.915449,99.846298],[19.91519,99.8461],[19.91506,99.845932],[19.914909,99.845734],[19.91482,99.845551],[19.9144,99.844727],[19.914,99.843964],[19.9137,99.843246],[19.913469,99.842857],[19.9133,99.842613],[19.913071,99.842331],[19.912821,99.842087],[19.91238,99.841667],[19.912121,99.841469],[19.911831,99.841248],[19.911221,99.840927],[19.9109,99.840782],[19.910589,99.840668],[19.910259,99.840652],[19.909861,99.840714],[19.90881,99.840759],[19.908581,99.840767],[19.90823,99.840813],[19.907591,99.840927],[19.907049,99.840973],[19.90662,99.840919],[19.906231,99.840958],[19.90579,99.840981],[19.90518,99.840973],[19.904579,99.840897],[19.903761,99.840767],[19.90309,99.840523],[19.9025,99.840378],[19.901751,99.840179],[19.901529,99.840134],[19.89817,99.839073],[19.896799,99.838638],[19.895309,99.838242],[19.89484,99.838097],[19.89209,99.837196],[19.89089,99.836861],[19.88945,99.836433],[19.879311,99.833359],[19.878031,99.832413],[19.87665,99.831192],[19.872709,99.827423],[19.862711,99.821381],[19.84935,99.809143],[19.836611,99.787727],[19.82707,99.775383],[19.824829,99.766403],[19.82202,99.763603],[19.80855,99.75489],[19.800699,99.753487],[19.78414,99.743393],[19.76815,99.736092],[19.7572,99.733566],[19.746201,99.726852],[19.74276,99.724037],[19.73921,99.722839],[19.72596,99.716492],[19.72014,99.716148],[19.716591,99.71666],[19.71174,99.720444],[19.708179,99.720268],[19.70447,99.719063],[19.688629,99.723358],[19.68475,99.727127],[19.679899,99.727821],[19.67149,99.731598],[19.6681,99.734169],[19.664539,99.734337],[19.65662,99.735718],[19.653709,99.736923],[19.64983,99.737259],[19.644501,99.738632],[19.637711,99.743103],[19.620081,99.743271],[19.61006,99.747726],[19.600519,99.749619],[19.595181,99.748589],[19.591459,99.746529],[19.582239,99.744987],[19.57626,99.746529],[19.57011,99.751678],[19.56736,99.752197],[19.550541,99.747391],[19.541479,99.742073],[19.51705,99.745667],[19.504271,99.746872],[19.50135,99.746696],[19.49699,99.748589],[19.48016,99.751678],[19.472389,99.753738],[19.469641,99.754082],[19.467211,99.755112],[19.462839,99.75563],[19.45928,99.755798],[19.453939,99.757172],[19.44973,99.758034],[19.44228,99.758202],[19.432249,99.761978],[19.42415,99.766098],[19.410549,99.770393],[19.37849,99.78756],[19.357759,99.799057],[19.339621,99.811943],[19.3218,99.838371],[19.310631,99.845917],[19.30415,99.852272],[19.29945,99.853127],[19.290051,99.855881],[19.275141,99.856392],[19.268181,99.857773],[19.255369,99.857422],[19.24938,99.858627],[19.240629,99.860863],[19.23674,99.862923],[19.229931,99.863426],[19.227011,99.863953],[19.20772,99.871498],[19.2001,99.872528],[19.19735,99.874763],[19.188431,99.889008],[19.178049,99.901016],[19.17128,99.906563],[19.16725,99.909927],[19.161579,99.914177],[19.158171,99.914436],[19.152809,99.912689],[19.141399,99.910896],[19.12985,99.910072],[19.115681,99.90567],[19.106331,99.908417],[19.095181,99.912193],[19.09145,99.913727],[19.082689,99.92231],[19.075069,99.927979],[19.069059,99.92746],[19.05657,99.932098],[19.05316,99.933472],[19.050079,99.935867],[19.04554,99.935532],[19.043261,99.934669],[19.04018,99.931236],[19.038719,99.931068],[19.03775,99.930382],[19.02947,99.927116],[19.02639,99.923523],[19.019899,99.920433],[19.019251,99.919052],[19.01503,99.911163],[19.00983,99.906013],[19.00659,99.902573],[19.005449,99.899307],[19.00334,99.898109],[19.00042,99.899483],[18.99782,99.901367],[18.994419,99.903259],[18.991011,99.904289],[18.988569,99.906174],[18.985979,99.906349],[18.98127,99.907204],[18.977051,99.91098],[18.976231,99.912872],[18.97364,99.914413],[18.9699,99.915283],[18.96796,99.918709],[18.96455,99.920937],[18.95822,99.920593],[18.95627,99.922829],[18.95075,99.923523],[18.93889,99.929008],[18.934999,99.931923],[18.93354,99.932793],[18.929319,99.931763],[18.924931,99.933983],[18.922171,99.935013],[18.91876,99.937424],[18.905769,99.943771],[18.902519,99.944633],[18.89814,99.946342],[18.893259,99.946693],[18.887251,99.944633],[18.88319,99.945312],[18.8741,99.947548],[18.867599,99.948402],[18.858829,99.948921],[18.851681,99.948059],[18.846161,99.947891],[18.834141,99.949432],[18.82406,99.949089],[18.821791,99.949608],[18.807159,99.958527],[18.804079,99.960587],[18.78701,99.964371],[18.78587,99.965233],[18.781969,99.969177],[18.776609,99.970032],[18.76491,99.97364],[18.76214,99.973457],[18.757429,99.970032],[18.753201,99.970032],[18.7428,99.975014],[18.74004,99.975357],[18.73597,99.973984],[18.733049,99.971237],[18.73012,99.971237],[18.72703,99.968491],[18.72541,99.968491],[18.72323,99.967339],[18.72118,99.966263],[18.719721,99.966263],[18.718901,99.964706],[18.71516,99.960938],[18.71386,99.958527],[18.71175,99.957161],[18.7085,99.958023],[18.706869,99.957497],[18.7059,99.956131],[18.70134,99.954758],[18.699551,99.952698],[18.69809,99.948753],[18.696951,99.947548],[18.68996,99.944283],[18.687691,99.944801],[18.68573,99.943604],[18.68037,99.934502],[18.674021,99.928673],[18.6724,99.927803],[18.66736,99.92643],[18.661659,99.924202],[18.65711,99.921967],[18.655649,99.92025],[18.65044,99.920433],[18.64784,99.920593],[18.645069,99.918709],[18.641821,99.91819],[18.635799,99.914589],[18.63434,99.911667],[18.626699,99.909103],[18.62442,99.90892],[18.618561,99.907722],[18.61824,99.906349],[18.614981,99.908234],[18.61091,99.907043],[18.6075,99.9048],[18.6049,99.904289],[18.60343,99.903603],[18.601971,99.902397],[18.598881,99.900681],[18.596109,99.898453],[18.592529,99.898621],[18.589769,99.896744],[18.588461,99.89502],[18.58684,99.89399],[18.58391,99.893471],[18.582609,99.89296],[18.58082,99.89193],[18.57691,99.886597],[18.575769,99.886093],[18.575121,99.886597],[18.57398,99.88575],[18.57333,99.88472],[18.572029,99.883858],[18.571541,99.882141],[18.56975,99.881287],[18.568291,99.879051],[18.5665,99.878883],[18.56373,99.875618],[18.56324,99.872871],[18.56275,99.87133],[18.56292,99.86927],[18.560801,99.866348],[18.55966,99.865997],[18.55966,99.864288],[18.558359,99.861198],[18.55673,99.859657],[18.555269,99.854507],[18.55348,99.853821],[18.5525,99.852448],[18.550871,99.851418],[18.54925,99.849182],[18.547291,99.848328],[18.543711,99.840767],[18.540131,99.839912],[18.53964,99.838707],[18.537849,99.838203],[18.53558,99.835617],[18.530531,99.832191],[18.529881,99.830299],[18.52581,99.828934],[18.51783,99.82412],[18.513769,99.820862],[18.5149,99.81897],[18.499439,99.812279],[18.47893,99.807472],[18.47648,99.806099],[18.47323,99.805237],[18.47225,99.80558],[18.466881,99.804207],[18.466709,99.802673],[18.463301,99.804382],[18.462971,99.803703],[18.459061,99.801292],[18.455641,99.797684],[18.45402,99.797173],[18.45385,99.795113],[18.451571,99.793404],[18.452061,99.790131],[18.45125,99.788589],[18.448311,99.786697],[18.448311,99.783607],[18.44245,99.776047],[18.44066,99.775017],[18.43952,99.772797],[18.43692,99.772453],[18.434799,99.769867],[18.42487,99.754601],[18.42519,99.752022],[18.42161,99.749107],[18.42128,99.747902],[18.4221,99.743103],[18.42112,99.741547],[18.420309,99.739487],[18.41995,99.737396],[18.42004,99.735573],[18.42008,99.733253],[18.41995,99.732552],[18.41889,99.730331],[18.41873,99.729698],[18.418711,99.72905],[18.418791,99.728363],[18.4195,99.727074],[18.419979,99.726349],[18.420231,99.726128],[18.421,99.7258],[18.424561,99.724602],[18.425671,99.724037],[18.426571,99.723328],[18.427401,99.722572],[18.428101,99.721451],[18.42823,99.720734],[18.42827,99.719788],[18.42893,99.718018],[18.429291,99.716713],[18.42931,99.715942],[18.429251,99.714172],[18.42909,99.71257],[18.42915,99.711746],[18.429159,99.710548],[18.42911,99.709961],[18.42881,99.709312],[18.42832,99.708794],[18.42795,99.708214],[18.427919,99.707649],[18.42795,99.706039],[18.42767,99.704086],[18.427589,99.702888],[18.427589,99.70208],[18.426929,99.700233],[18.426741,99.699043],[18.426781,99.698059],[18.42658,99.697319],[18.42609,99.696053],[18.42481,99.694153],[18.424101,99.693573],[18.423691,99.692886],[18.42347,99.69194],[18.423491,99.689323],[18.423241,99.688538],[18.423031,99.68734],[18.42272,99.686203],[18.422131,99.684937],[18.422041,99.684174],[18.42222,99.683647],[18.422501,99.683128],[18.422661,99.682358],[18.42264,99.680542],[18.422541,99.679131],[18.42197,99.675194],[18.42194,99.67244],[18.42174,99.671631],[18.421301,99.670486],[18.420971,99.669319],[18.42094,99.665627],[18.42099,99.663811],[18.42087,99.663017],[18.42053,99.66185],[18.417959,99.653954],[18.4172,99.651909],[18.41601,99.649818],[18.412809,99.644562],[18.406851,99.639587],[18.40027,99.634438],[18.392811,99.624962],[18.385281,99.615044],[18.37586,99.599113],[18.36557,99.581909],[18.355709,99.565353],[18.34586,99.548767],[18.33902,99.541557],[18.31636,99.528687],[18.310011,99.528687],[18.305771,99.527657],[18.285431,99.512939],[18.2847,99.512192],[18.284321,99.511879],[18.28384,99.511429],[18.283501,99.511009],[18.28231,99.50872],[18.282021,99.506973],[18.281969,99.506752],[18.281931,99.506447],[18.28183,99.504372],[18.281799,99.503326],[18.2817,99.501801],[18.28154,99.498703],[18.281389,99.496017],[18.28134,99.495178],[18.281179,99.492928],[18.28109,99.491997],[18.28097,99.491493],[18.280741,99.490639],[18.280491,99.490067],[18.280251,99.489571],[18.276279,99.484016],[18.275089,99.482361],[18.271931,99.477943],[18.26992,99.475143],[18.265791,99.469559],[18.264151,99.467949],[18.263901,99.467728],[18.259399,99.462921],[18.254829,99.457451],[18.25322,99.45546],[18.25285,99.455002],[18.252251,99.454407],[18.251181,99.453377],[18.248911,99.451523],[18.24684,99.449829],[18.246321,99.449249],[18.246229,99.449158],[18.24357,99.446136],[18.240339,99.442268],[18.240231,99.442131],[18.23794,99.439133],[18.237009,99.43779],[18.234949,99.434761],[18.234051,99.433434],[18.233271,99.432281],[18.232941,99.431862],[18.23254,99.431396],[18.231871,99.43087],[18.23115,99.430443],[18.23048,99.430099],[18.223049,99.426353],[18.219999,99.42485],[18.214729,99.422234],[18.2141,99.421783],[18.213449,99.421173],[18.21044,99.417763],[18.20784,99.414848],[18.206091,99.41288],[18.20507,99.411789],[18.2041,99.410851],[18.203369,99.410233],[18.202881,99.409859],[18.202271,99.409431],[18.20149,99.408997],[18.20116,99.408768],[18.20055,99.408447],[18.199909,99.408142],[18.198891,99.40773],[18.19791,99.407379],[18.19705,99.407158],[18.19627,99.40699],[18.195271,99.406807],[18.194441,99.406723],[18.193081,99.406639],[18.19174,99.406708],[18.190941,99.406807],[18.190041,99.406929],[18.18878,99.407204],[18.186609,99.407761],[18.184031,99.408447],[18.182199,99.408928],[18.18095,99.409187],[18.180309,99.409233],[18.17975,99.409233],[18.179211,99.409149],[18.17749,99.408699],[18.17017,99.406662],[18.166981,99.405777],[18.163481,99.404831],[18.15963,99.403793],[18.158501,99.403519],[18.157089,99.403229],[18.15344,99.402649],[18.150881,99.402184],[18.15004,99.402046],[18.149481,99.401962],[18.149,99.401863],[18.148581,99.401703],[18.147989,99.401352],[18.14753,99.400978],[18.14703,99.40033],[18.1467,99.399567],[18.14559,99.395081],[18.1453,99.394173],[18.144859,99.393402],[18.144341,99.3927],[18.14374,99.392097],[18.142941,99.391563],[18.14249,99.391312],[18.14209,99.391144],[18.141621,99.390961],[18.14101,99.390823],[18.14044,99.390778],[18.139891,99.390747],[18.13619,99.390709],[18.13114,99.390762],[18.128851,99.391121],[18.124069,99.392548],[18.10453,99.398163],[18.10178,99.398788],[18.099609,99.398727],[18.096781,99.398109],[18.094761,99.397583],[18.092661,99.397118],[18.091841,99.396919],[18.0884,99.396072],[18.085541,99.395348],[18.083891,99.394974],[18.075769,99.392998],[18.070539,99.391769],[18.066629,99.390846],[18.062481,99.390266],[18.05871,99.389839],[18.05596,99.389267],[18.054411,99.388397],[18.051821,99.386383],[18.050211,99.38546],[18.045561,99.383141],[18.043961,99.381851],[18.04265,99.380638],[18.041,99.379402],[18.036779,99.376457],[18.036421,99.376259],[18.034201,99.375107],[18.033239,99.374786],[18.032431,99.374603],[18.031601,99.374496],[18.030519,99.37442],[18.024441,99.373947],[18.0229,99.373329],[18.02154,99.37207],[18.012831,99.358124],[18.01133,99.357002],[18.009991,99.356583],[17.99893,99.355247],[17.98905,99.357224],[17.982321,99.356018],[17.979931,99.355743],[17.97489,99.356071],[17.973339,99.355614],[17.970539,99.353241],[17.969101,99.352692],[17.96756,99.352707],[17.962151,99.354393],[17.961781,99.354492],[17.96125,99.354637],[17.961029,99.35466],[17.96056,99.35466],[17.95981,99.354637],[17.959379,99.354561],[17.95863,99.354279],[17.95808,99.353981],[17.95723,99.353378],[17.95643,99.352737],[17.95587,99.352371],[17.955059,99.351822],[17.95433,99.351357],[17.95396,99.351189],[17.95359,99.351044],[17.953091,99.350883],[17.95245,99.350838],[17.951981,99.350853],[17.951429,99.350929],[17.95067,99.351082],[17.95013,99.351196],[17.94813,99.351593],[17.946581,99.351837],[17.946051,99.351921],[17.945681,99.351936],[17.945511,99.351929],[17.945129,99.351883],[17.944559,99.351707],[17.94421,99.351593],[17.943859,99.351433],[17.94348,99.351257],[17.94228,99.350517],[17.941111,99.349838],[17.93996,99.349243],[17.93936,99.348953],[17.93882,99.348679],[17.93819,99.348473],[17.9373,99.348289],[17.93652,99.348137],[17.934759,99.347778],[17.93421,99.347687],[17.932699,99.347427],[17.93189,99.347298],[17.92786,99.346573],[17.92705,99.346413],[17.92444,99.34594],[17.92285,99.345657],[17.92038,99.345207],[17.9198,99.345093],[17.91939,99.345001],[17.91836,99.344711],[17.91785,99.344589],[17.917351,99.344429],[17.917009,99.344269],[17.9163,99.343849],[17.915291,99.343246],[17.915051,99.343117],[17.91415,99.342613],[17.913731,99.342377],[17.913441,99.342216],[17.91333,99.342163],[17.913191,99.342133],[17.9125,99.342003],[17.91172,99.341957],[17.91118,99.341927],[17.910681,99.341873],[17.90926,99.341827],[17.908791,99.341797],[17.90661,99.341667],[17.904579,99.341522],[17.9039,99.341476],[17.903549,99.341469],[17.902691,99.341431],[17.902109,99.3414],[17.90139,99.341362],[17.900949,99.341331],[17.899851,99.341217],[17.899229,99.341133],[17.89868,99.341026],[17.898109,99.340927],[17.89765,99.340851],[17.89702,99.340736],[17.89642,99.340637],[17.895901,99.340553],[17.89366,99.340157],[17.89069,99.33963],[17.88946,99.339417],[17.888769,99.33931],[17.88637,99.338882],[17.88438,99.338531],[17.882891,99.33828],[17.881689,99.338081],[17.88026,99.337822],[17.87919,99.337646],[17.87808,99.337471],[17.87718,99.337318],[17.8766,99.337257],[17.87611,99.337181],[17.87467,99.337128],[17.874229,99.337143],[17.87361,99.337143],[17.871771,99.337196],[17.87114,99.337242],[17.870489,99.337273],[17.870131,99.337273],[17.86964,99.337196],[17.869011,99.337082],[17.8687,99.337013],[17.868401,99.336838],[17.86796,99.336563],[17.86767,99.336349],[17.86746,99.336197],[17.86726,99.336014],[17.86688,99.33551],[17.86599,99.334396],[17.865061,99.333237],[17.864401,99.332397],[17.863991,99.331802],[17.86343,99.331001],[17.86311,99.33049],[17.862749,99.32975],[17.86245,99.328903],[17.862289,99.328217],[17.86224,99.327454],[17.862181,99.326714],[17.862129,99.32605],[17.86191,99.322456],[17.861759,99.319107],[17.861549,99.315567],[17.86153,99.315292],[17.861521,99.31517],[17.861481,99.315033],[17.86117,99.313766],[17.8608,99.312477],[17.860331,99.310944],[17.86005,99.310051],[17.859909,99.309601],[17.859859,99.309486],[17.85973,99.309273],[17.85928,99.308662],[17.85885,99.308243],[17.858391,99.307747],[17.85741,99.306763],[17.85648,99.305923],[17.855591,99.305107],[17.85523,99.304764],[17.854839,99.304314],[17.854601,99.304031],[17.85445,99.303741],[17.85433,99.303513],[17.85412,99.303017],[17.85392,99.302223],[17.85384,99.30159],[17.85371,99.300491],[17.8533,99.296638],[17.853251,99.296318],[17.85321,99.296013],[17.853029,99.295303],[17.852871,99.2948],[17.852711,99.29451],[17.85252,99.294228],[17.852261,99.293854],[17.852079,99.293587],[17.85186,99.293404],[17.851761,99.293297],[17.85161,99.293198],[17.851259,99.292953],[17.850969,99.29277],[17.850731,99.292641],[17.85043,99.292542],[17.85,99.292397],[17.8496,99.29232],[17.84923,99.29229],[17.84869,99.29232],[17.84779,99.292458],[17.847481,99.292511],[17.844879,99.293228],[17.843941,99.293472],[17.843321,99.293587],[17.842369,99.293701],[17.841961,99.293739],[17.84166,99.293732],[17.84104,99.293709],[17.840599,99.293633],[17.840219,99.293533],[17.839899,99.293449],[17.83931,99.293243],[17.83873,99.292923],[17.83827,99.29261],[17.83799,99.292389],[17.836639,99.2911],[17.836531,99.291023],[17.836411,99.290932],[17.836281,99.290848],[17.835911,99.290672],[17.8354,99.290413],[17.83526,99.290337],[17.83514,99.290298],[17.834579,99.290268],[17.83226,99.290161],[17.831779,99.290154],[17.831591,99.290154],[17.831499,99.290138],[17.830999,99.289932],[17.83036,99.289597],[17.83024,99.28952],[17.83003,99.289322],[17.82963,99.288872],[17.82939,99.288643],[17.829281,99.28849],[17.82917,99.288239],[17.828871,99.287407],[17.82847,99.286018],[17.82832,99.285347],[17.828159,99.284813],[17.82811,99.284683],[17.82798,99.284462],[17.82766,99.284058],[17.82745,99.283836],[17.82724,99.2836],[17.827101,99.28347],[17.826941,99.283363],[17.826679,99.283234],[17.826389,99.283081],[17.82618,99.282997],[17.82585,99.282921],[17.825569,99.282867],[17.825081,99.282806],[17.824591,99.282799],[17.821569,99.28289],[17.82082,99.282898],[17.820551,99.282898],[17.81995,99.28286],[17.8197,99.282852],[17.819,99.282806],[17.818501,99.282753],[17.81819,99.282692],[17.8179,99.282547],[17.817579,99.282333],[17.817209,99.282066],[17.816971,99.281822],[17.816771,99.281609],[17.816601,99.281326],[17.81636,99.280884],[17.816179,99.280487],[17.816031,99.280083],[17.81386,99.273483],[17.81365,99.272911],[17.81352,99.272583],[17.813181,99.271957],[17.81295,99.271584],[17.8127,99.27124],[17.81225,99.270798],[17.81126,99.269852],[17.810381,99.269119],[17.80974,99.26857],[17.80872,99.267761],[17.80821,99.267357],[17.807859,99.267128],[17.80744,99.266907],[17.806999,99.266693],[17.80674,99.266617],[17.80644,99.266571],[17.80608,99.266533],[17.805759,99.266533],[17.805401,99.266533],[17.80504,99.266617],[17.80337,99.266998],[17.802469,99.267174],[17.802071,99.267227],[17.801889,99.267227],[17.801689,99.267227],[17.80142,99.267174],[17.8009,99.267036],[17.800541,99.266937],[17.80023,99.266861],[17.800051,99.266777],[17.798241,99.266006],[17.79715,99.265556],[17.79257,99.263641],[17.791861,99.263344],[17.78828,99.26181],[17.78756,99.261513],[17.78669,99.261124],[17.7859,99.260757],[17.78512,99.260429],[17.78488,99.260292],[17.784559,99.260033],[17.7843,99.259827],[17.783911,99.259506],[17.783489,99.259117],[17.78289,99.258347],[17.781799,99.257004],[17.78129,99.256287],[17.77948,99.254051],[17.7777,99.251877],[17.77697,99.251038],[17.77673,99.250763],[17.776421,99.250481],[17.77618,99.250313],[17.7756,99.250031],[17.775,99.249786],[17.773529,99.249382],[17.773161,99.249283],[17.770929,99.248657],[17.769039,99.248009],[17.768499,99.247833],[17.768101,99.247627],[17.7679,99.247437],[17.76725,99.246834],[17.76651,99.246017],[17.76532,99.244629],[17.76475,99.243988],[17.764339,99.243607],[17.763969,99.243401],[17.763491,99.243141],[17.76297,99.242897],[17.76252,99.242783],[17.761299,99.24247],[17.76108,99.242416],[17.76034,99.242218],[17.759871,99.242073],[17.759029,99.241737],[17.75853,99.241524],[17.758101,99.241241],[17.757481,99.240791],[17.756941,99.240318],[17.75658,99.239883],[17.754259,99.236938],[17.75318,99.235573],[17.752991,99.235367],[17.75267,99.235062],[17.752399,99.234879],[17.75209,99.234688],[17.751051,99.234238],[17.750351,99.234001],[17.7498,99.233772],[17.748859,99.233276],[17.748581,99.233093],[17.747829,99.232452],[17.746889,99.231583],[17.746691,99.231377],[17.74646,99.231194],[17.74609,99.230972],[17.74564,99.230827],[17.745159,99.230682],[17.744881,99.230637],[17.744419,99.230629],[17.743931,99.23069],[17.74349,99.230782],[17.743191,99.230873],[17.74276,99.231102],[17.74197,99.231628],[17.74017,99.232971],[17.73991,99.233147],[17.739531,99.233292],[17.73864,99.233566],[17.73842,99.233589],[17.73773,99.233589],[17.73707,99.233582],[17.736509,99.233513],[17.73584,99.233383],[17.73542,99.233292],[17.734819,99.233177],[17.73427,99.23304],[17.733521,99.232773],[17.732241,99.232307],[17.730801,99.231644],[17.730061,99.231293],[17.728479,99.230621],[17.727859,99.230362],[17.72703,99.230057],[17.726549,99.229881],[17.726231,99.229767],[17.725981,99.229721],[17.724819,99.229462],[17.72401,99.229309],[17.723749,99.229263],[17.723499,99.229233],[17.72278,99.229134],[17.72213,99.22905],[17.72184,99.229019],[17.72105,99.228928],[17.720671,99.228889],[17.720409,99.228859],[17.720261,99.228859],[17.720039,99.228882],[17.71792,99.229012],[17.71751,99.229027],[17.7131,99.229362],[17.71036,99.229683],[17.709999,99.229729],[17.709591,99.229782],[17.709379,99.229797],[17.70927,99.22982],[17.709061,99.229874],[17.708929,99.229912],[17.70859,99.230003],[17.703871,99.231422],[17.6992,99.232727],[17.69821,99.233017],[17.69763,99.233177],[17.697451,99.233223],[17.69726,99.233238],[17.696751,99.233276],[17.696369,99.233292],[17.69614,99.233307],[17.69598,99.233299],[17.69591,99.233292],[17.69561,99.233223],[17.69491,99.23304],[17.694389,99.23291],[17.694099,99.232841],[17.69388,99.232811],[17.69368,99.232803],[17.693279,99.23275],[17.692961,99.232727],[17.692671,99.232697],[17.69244,99.232697],[17.692301,99.232697],[17.692169,99.232727],[17.691891,99.232803],[17.69169,99.232857],[17.691191,99.233093],[17.691019,99.233177],[17.69067,99.233437],[17.690411,99.233658],[17.690121,99.233994],[17.689871,99.234283],[17.689671,99.234543],[17.689461,99.234879],[17.688641,99.236259],[17.68808,99.23719],[17.68734,99.238152],[17.68705,99.238503],[17.686781,99.238724],[17.6863,99.239014],[17.68573,99.239311],[17.68515,99.239563],[17.68358,99.24015],[17.679119,99.241768],[17.67421,99.243568],[17.670959,99.244667],[17.669821,99.24501],[17.66951,99.245102],[17.669319,99.245163],[17.669201,99.245171],[17.669081,99.245171],[17.66873,99.245163],[17.667709,99.245064],[17.66604,99.244743],[17.66552,99.244629],[17.66523,99.244583],[17.66506,99.24456],[17.664921,99.24456],[17.66469,99.244583],[17.6644,99.244614],[17.664009,99.244637],[17.663759,99.24469],[17.66358,99.244743],[17.663389,99.244812],[17.663219,99.244904],[17.662809,99.245117],[17.66263,99.245247],[17.662331,99.245453],[17.66197,99.245811],[17.660839,99.247223],[17.660061,99.248207],[17.659401,99.2491],[17.65922,99.249313],[17.659121,99.249413],[17.65889,99.249588],[17.658171,99.25016],[17.657921,99.250343],[17.657669,99.250473],[17.65728,99.250641],[17.656561,99.250893],[17.656309,99.250961],[17.655861,99.25103],[17.655359,99.251091],[17.654989,99.251106],[17.65469,99.251106],[17.654181,99.251038],[17.653561,99.25087],[17.653231,99.250763],[17.652941,99.250641],[17.652571,99.250427],[17.652439,99.250351],[17.652189,99.250183],[17.651711,99.249847],[17.65132,99.249489],[17.650909,99.249039],[17.650351,99.248322],[17.649651,99.247177],[17.64868,99.245667],[17.64819,99.244987],[17.647699,99.244331],[17.64736,99.243896],[17.647091,99.243652],[17.646799,99.243439],[17.646021,99.24292],[17.644899,99.242287],[17.643909,99.241737],[17.64311,99.24131],[17.641239,99.240349],[17.640791,99.240097],[17.640671,99.240044],[17.64039,99.239937],[17.640221,99.239883],[17.63924,99.239662],[17.639059,99.239616],[17.63826,99.239517],[17.63669,99.239388],[17.635361,99.23925],[17.63233,99.238876],[17.63176,99.238823],[17.631161,99.238739],[17.630199,99.238609],[17.63006,99.238586],[17.629971,99.238579],[17.62962,99.238541],[17.629141,99.238472],[17.62866,99.238403],[17.628309,99.23835],[17.627979,99.238281],[17.62742,99.238197],[17.62673,99.238037],[17.62583,99.237892],[17.625059,99.237633],[17.622801,99.236839],[17.621441,99.236008],[17.61692,99.232162],[17.61537,99.230904],[17.61335,99.229797],[17.60886,99.227928],[17.602249,99.22522],[17.597521,99.223282],[17.59412,99.222054],[17.587271,99.220108],[17.58593,99.219467],[17.584789,99.218277],[17.5783,99.208618],[17.57519,99.203941],[17.574329,99.203087],[17.573111,99.202309],[17.57239,99.202087],[17.57156,99.201981],[17.57074,99.202003],[17.564529,99.203102],[17.56094,99.203789],[17.559891,99.203529],[17.559389,99.203369],[17.55278,99.200447],[17.545259,99.197067],[17.537621,99.193703],[17.52972,99.190163],[17.522421,99.186867],[17.517151,99.184593],[17.511311,99.183838],[17.50985,99.183296],[17.508881,99.182648],[17.503361,99.178322],[17.499451,99.175423],[17.499241,99.175041],[17.48904,99.167084],[17.47415,99.162407],[17.469481,99.161247],[17.423571,99.157494],[17.41935,99.157249],[17.41753,99.156578],[17.411221,99.151299],[17.40942,99.150032],[17.40662,99.149208],[17.39879,99.149406],[17.39036,99.148537],[17.38191,99.147797],[17.377081,99.149017],[17.37434,99.149094],[17.36429,99.146599],[17.3626,99.146698],[17.354561,99.148918],[17.35183,99.149513],[17.34754,99.14946],[17.34433,99.149437],[17.34161,99.149643],[17.33868,99.151382],[17.335911,99.153374],[17.33367,99.154083],[17.33156,99.153992],[17.30291,99.147034],[17.295,99.142593],[17.28458,99.141388],[17.28159,99.140633],[17.25828,99.132843],[17.24894,99.128304],[17.23995,99.123833],[17.238461,99.122993],[17.237061,99.122704],[17.207069,99.123238],[17.20488,99.123596],[17.20418,99.123947],[17.2031,99.12455],[17.19191,99.130913],[17.179131,99.138077],[17.17695,99.138298],[17.17457,99.137848],[17.16736,99.135223],[17.15797,99.131851],[17.15015,99.129463],[17.147699,99.128029],[17.13851,99.112953],[17.13471,99.106644],[17.132629,99.104424],[17.126169,99.098793],[17.115339,99.091873],[17.113079,99.08847],[17.111059,99.084801],[17.109261,99.080406],[17.10791,99.077362],[17.105841,99.075607],[17.103371,99.074699],[17.089741,99.072487],[17.074369,99.06559],[17.07151,99.06543],[17.069031,99.066544],[17.06661,99.06781],[17.05814,99.072273],[17.047461,99.078308],[17.03545,99.087624],[17.023211,99.097221],[17.00762,99.108757],[16.997351,99.112717],[16.988581,99.117897],[16.980551,99.122093],[16.979561,99.122704],[16.978951,99.12368],[16.976191,99.128593],[16.97452,99.130058],[16.97257,99.130501],[16.968321,99.13092],[16.96356,99.131462],[16.96092,99.13134],[16.920919,99.115631],[16.919189,99.11586],[16.91795,99.11602],[16.91305,99.118767],[16.90901,99.121246],[16.9007,99.126984],[16.89715,99.128098],[16.893391,99.129143],[16.89175,99.129051],[16.885201,99.127052],[16.88372,99.126694],[16.881399,99.127083],[16.876499,99.130058],[16.87117,99.133377],[16.863501,99.13826],[16.85927,99.12957],[16.856239,99.123466],[16.855671,99.12233],[16.85342,99.117859],[16.85202,99.115067],[16.85084,99.113182],[16.84898,99.111923],[16.84684,99.111504],[16.84412,99.112358],[16.8416,99.11367],[16.84152,99.113724],[16.837959,99.115807],[16.835329,99.117531],[16.821699,99.130074],[16.801649,99.148598],[16.799669,99.150833],[16.798031,99.15358],[16.795401,99.157867],[16.79244,99.162163],[16.78866,99.166969],[16.76845,99.18911],[16.76483,99.192543],[16.7096,99.240257],[16.68836,99.258202],[16.679461,99.264771],[16.67762,99.266113],[16.677481,99.266212],[16.6754,99.267906],[16.67342,99.269623],[16.67309,99.270317],[16.67288,99.271057],[16.672859,99.271423],[16.67281,99.272797],[16.672779,99.273537],[16.672729,99.27478],[16.672661,99.275673],[16.672489,99.276649],[16.672251,99.277786],[16.67214,99.278313],[16.67173,99.280197],[16.671499,99.281181],[16.6712,99.283028],[16.671181,99.283287],[16.671249,99.285454],[16.671789,99.288597],[16.671829,99.288857],[16.672001,99.289909],[16.67218,99.290947],[16.672421,99.292236],[16.6726,99.293266],[16.67338,99.298218],[16.673161,99.300034],[16.672979,99.300537],[16.672041,99.302116],[16.66967,99.304527],[16.666189,99.308037],[16.665819,99.308411],[16.663031,99.31118],[16.66287,99.311348],[16.66259,99.31163],[16.6623,99.311943],[16.66151,99.312729],[16.6612,99.313026],[16.66095,99.313278],[16.66025,99.314003],[16.659611,99.314667],[16.659439,99.314842],[16.658159,99.316139],[16.65443,99.319923],[16.65276,99.321609],[16.652571,99.3218],[16.649229,99.325203],[16.647921,99.326508],[16.646601,99.32785],[16.64641,99.328041],[16.64311,99.331429],[16.64192,99.332878],[16.64097,99.334152],[16.64082,99.334373],[16.637951,99.338142],[16.63311,99.344543],[16.630091,99.348587],[16.629789,99.348991],[16.629169,99.349792],[16.628531,99.350601],[16.62711,99.352493],[16.62414,99.356438],[16.62381,99.35685],[16.62253,99.358543],[16.62108,99.360443],[16.618429,99.363991],[16.61496,99.368683],[16.61392,99.370857],[16.613609,99.37159],[16.61319,99.372566],[16.613079,99.37281],[16.61297,99.373062],[16.612749,99.373558],[16.611071,99.377563],[16.610439,99.379044],[16.60939,99.381523],[16.60792,99.384987],[16.60771,99.385483],[16.607599,99.385727],[16.607189,99.386703],[16.60689,99.387444],[16.606569,99.388168],[16.606159,99.389153],[16.605419,99.390877],[16.605009,99.391869],[16.603491,99.395462],[16.603121,99.396317],[16.60302,99.396568],[16.602591,99.397552],[16.600929,99.401466],[16.60062,99.402206],[16.600519,99.402458],[16.59807,99.408287],[16.596411,99.412201],[16.596001,99.41317],[16.595791,99.413658],[16.595591,99.414146],[16.594521,99.416603],[16.594311,99.417084],[16.594101,99.41758],[16.594,99.417831],[16.59269,99.420998],[16.591021,99.424927],[16.588301,99.431328],[16.586519,99.435532],[16.58543,99.437042],[16.584,99.438202],[16.58209,99.439056],[16.580641,99.439629],[16.580151,99.439812],[16.578939,99.440331],[16.57461,99.442101],[16.57412,99.442299],[16.57338,99.442596],[16.57313,99.442703],[16.571659,99.443283],[16.57023,99.443893],[16.567341,99.44503],[16.566139,99.445511],[16.563231,99.446663],[16.56251,99.446953],[16.55891,99.448486],[16.55868,99.448608],[16.558229,99.448868],[16.556589,99.45018],[16.554319,99.4524],[16.55036,99.456284],[16.548071,99.458511],[16.54731,99.459251],[16.544491,99.461937],[16.544331,99.462097],[16.543751,99.462677],[16.543159,99.463272],[16.54306,99.463379],[16.542561,99.463837],[16.5424,99.463989],[16.542191,99.464241],[16.542009,99.464417],[16.541679,99.464737],[16.541269,99.465134],[16.540661,99.465729],[16.540331,99.466057],[16.53981,99.466583],[16.539049,99.4673],[16.538851,99.467484],[16.53808,99.468224],[16.53751,99.468781],[16.536751,99.469521],[16.53598,99.470268],[16.53504,99.471191],[16.534849,99.471367],[16.53429,99.471931],[16.53392,99.472313],[16.533001,99.473228],[16.53264,99.473587],[16.530359,99.475601],[16.528509,99.47641],[16.52446,99.477753],[16.52404,99.47789],[16.52319,99.478142],[16.52297,99.47821],[16.522091,99.478523],[16.52186,99.478592],[16.521629,99.478683],[16.521151,99.478859],[16.51795,99.479942],[16.516251,99.480507],[16.51479,99.481003],[16.51083,99.482323],[16.50983,99.482658],[16.509581,99.482742],[16.508089,99.483253],[16.507589,99.483414],[16.507099,99.483589],[16.506849,99.483673],[16.50609,99.483887],[16.504271,99.484047],[16.502211,99.483627],[16.501431,99.483429],[16.50091,99.483299],[16.498619,99.482689],[16.497601,99.482422],[16.497089,99.482277],[16.49658,99.48214],[16.49402,99.481621],[16.492479,99.481903],[16.491171,99.482773],[16.48962,99.484154],[16.48595,99.487839],[16.485571,99.488213],[16.48538,99.488403],[16.483351,99.490791],[16.482929,99.491463],[16.48209,99.49276],[16.48167,99.493408],[16.481529,99.493629],[16.481239,99.494072],[16.481091,99.494301],[16.480101,99.495537],[16.479,99.496292],[16.47747,99.496696],[16.47649,99.496689],[16.476089,99.496658],[16.47576,99.496643],[16.475479,99.496613],[16.47537,99.496597],[16.47506,99.496567],[16.474609,99.496552],[16.472771,99.496483],[16.471889,99.496407],[16.471439,99.496384],[16.470751,99.496323],[16.470169,99.496246],[16.469761,99.496193],[16.468161,99.496147],[16.467911,99.496132],[16.46665,99.496063],[16.465639,99.495987],[16.464371,99.495918],[16.46105,99.495689],[16.460541,99.495644],[16.4568,99.495323],[16.455311,99.495621],[16.453951,99.496407],[16.45089,99.498993],[16.4485,99.500977],[16.447519,99.501823],[16.44635,99.5028],[16.445999,99.503113],[16.44545,99.503563],[16.44314,99.505539],[16.439569,99.508553],[16.438971,99.509071],[16.436991,99.51075],[16.43314,99.513939],[16.428801,99.517578],[16.424419,99.521103],[16.422661,99.521637],[16.421869,99.521713],[16.42108,99.521698],[16.4182,99.521629],[16.415039,99.521561],[16.414009,99.521538],[16.412491,99.5215],[16.411449,99.521492],[16.409679,99.521538],[16.409161,99.521561],[16.40608,99.521568],[16.405041,99.521561],[16.400579,99.521568],[16.40032,99.521568],[16.397169,99.521553],[16.395321,99.521553],[16.393999,99.521561],[16.39348,99.521561],[16.393221,99.521561],[16.391121,99.521568],[16.390341,99.521584],[16.38854,99.521942],[16.3883,99.522041],[16.38677,99.523033],[16.38658,99.523209],[16.385611,99.524483],[16.38533,99.52494],[16.38464,99.5261],[16.384501,99.526337],[16.38258,99.529541],[16.382441,99.529778],[16.382299,99.529999],[16.38088,99.53231],[16.380739,99.532539],[16.380051,99.53373],[16.37991,99.533958],[16.37948,99.53466],[16.377069,99.538559],[16.374229,99.543198],[16.37394,99.543663],[16.37365,99.544144],[16.370649,99.549042],[16.370359,99.549507],[16.36949,99.550911],[16.366779,99.555702],[16.365179,99.558617],[16.364639,99.559593],[16.36409,99.560547],[16.363819,99.561043],[16.363279,99.562012],[16.36249,99.563469],[16.360201,99.567574],[16.357809,99.572144],[16.354179,99.579102],[16.3515,99.584412],[16.35004,99.587318],[16.34803,99.591476],[16.345989,99.595329],[16.343031,99.599533],[16.341009,99.602783],[16.340269,99.605164],[16.338449,99.611328],[16.33709,99.614616],[16.33412,99.621323],[16.33148,99.627182],[16.331369,99.627449],[16.331261,99.627708],[16.330481,99.629509],[16.330259,99.630028],[16.327971,99.635368],[16.325199,99.641823],[16.32476,99.642838],[16.32181,99.649696],[16.319851,99.654007],[16.318529,99.655403],[16.31654,99.656693],[16.314871,99.657768],[16.312389,99.659416],[16.306021,99.663673],[16.305111,99.664284],[16.304211,99.664886],[16.303789,99.665169],[16.3034,99.665428],[16.30304,99.665657],[16.30287,99.665779],[16.30233,99.666168],[16.301941,99.666451],[16.3013,99.666878],[16.299049,99.668381],[16.29727,99.669563],[16.29705,99.669693],[16.2957,99.670593],[16.291679,99.673317],[16.28627,99.676964],[16.281839,99.679993],[16.279289,99.681396],[16.27492,99.682663],[16.27183,99.68354],[16.27051,99.683891],[16.269991,99.684036],[16.26354,99.685898],[16.26153,99.686478],[16.261141,99.6866],[16.260651,99.68676],[16.26017,99.686951],[16.25979,99.687103],[16.25938,99.687233],[16.258711,99.687469],[16.257021,99.688049],[16.252399,99.689629],[16.24692,99.691513],[16.2456,99.691933],[16.239849,99.693893],[16.238029,99.694511],[16.23308,99.696198],[16.23126,99.696831],[16.225599,99.698792],[16.218821,99.701103],[16.212601,99.703194],[16.20962,99.704193],[16.20705,99.70507],[16.206079,99.705429],[16.20174,99.706932],[16.19735,99.708397],[16.191231,99.710533],[16.188431,99.711472],[16.18173,99.713753],[16.18017,99.714302],[16.173941,99.716423],[16.16938,99.717972],[16.168091,99.718399],[16.16556,99.719292],[16.16477,99.719543],[16.16378,99.719856],[16.161659,99.720573],[16.16049,99.720901],[16.15974,99.721077],[16.159121,99.721191],[16.158421,99.721283],[16.157591,99.721336],[16.156981,99.721367],[16.15621,99.721359],[16.15048,99.721077],[16.14863,99.721024],[16.14603,99.720886],[16.13858,99.720573],[16.131781,99.720222],[16.12528,99.719902],[16.12373,99.719841],[16.122801,99.719818],[16.1194,99.719658],[16.118521,99.719597],[16.113729,99.719383],[16.11319,99.719353],[16.1068,99.719032],[16.105841,99.718987],[16.105129,99.719032],[16.10462,99.719116],[16.104019,99.719231],[16.10347,99.71936],[16.10277,99.719597],[16.10154,99.720123],[16.100809,99.720444],[16.099581,99.72094],[16.09844,99.72142],[16.09675,99.722153],[16.094219,99.723213],[16.09005,99.724953],[16.08955,99.725159],[16.084841,99.727127],[16.083389,99.72776],[16.077311,99.730301],[16.073151,99.732063],[16.07266,99.732262],[16.069929,99.733414],[16.06741,99.734489],[16.066401,99.73497],[16.065611,99.735367],[16.064939,99.735817],[16.06447,99.736214],[16.063801,99.73674],[16.06336,99.737137],[16.06078,99.739899],[16.056009,99.745132],[16.05513,99.746132],[16.05422,99.747093],[16.051439,99.750137],[16.050329,99.75135],[16.04903,99.752762],[16.04497,99.757187],[16.04143,99.761009],[16.041059,99.761414],[16.039579,99.763023],[16.037701,99.765007],[16.03714,99.76561],[16.036949,99.765823],[16.033899,99.769058],[16.03371,99.769257],[16.032,99.771072],[16.030279,99.772903],[16.03009,99.773102],[16.02557,99.777908],[16.02293,99.780693],[16.022169,99.781502],[16.02067,99.783081],[16.017441,99.786484],[16.016199,99.787788],[16.01602,99.787971],[16.01585,99.788147],[16.01568,99.788322],[16.015511,99.788498],[16.012739,99.791367],[16.011209,99.792999],[16.009171,99.795059],[16.00786,99.796494],[16.00614,99.798203],[16.0058,99.798553],[16.00466,99.799652],[16.003059,99.801308],[16.002541,99.801842],[16.00178,99.802597],[16.00106,99.803329],[15.99995,99.804489],[15.99944,99.805008],[15.99893,99.805519],[15.99852,99.805931],[15.99809,99.806351],[15.99742,99.807022],[15.99617,99.80825],[15.9937,99.810783],[15.98944,99.815048],[15.98454,99.819893],[15.97968,99.824661],[15.97439,99.829727],[15.97032,99.833603],[15.96583,99.83783],[15.96129,99.842163],[15.95713,99.846077],[15.95294,99.849953],[15.94795,99.854523],[15.9424,99.859627],[15.93697,99.864578],[15.93211,99.868973],[15.92862,99.872124],[15.9278,99.872879],[15.9247,99.875671],[15.92328,99.876953],[15.91854,99.880997],[15.91306,99.885612],[15.9105,99.887657],[15.90986,99.888168],[15.9086,99.889183],[15.90651,99.890747],[15.90628,99.890923],[15.90516,99.891769],[15.90126,99.894272],[15.89934,99.895317],[15.89693,99.896713],[15.8955,99.897507],[15.89383,99.898468],[15.89143,99.899841],[15.89,99.900673],[15.88886,99.90136],[15.88588,99.903069],[15.88534,99.903381],[15.88477,99.903732],[15.88452,99.903877],[15.8836,99.904411],[15.88287,99.904839],[15.8822,99.90519],[15.88194,99.905327],[15.88062,99.906067],[15.87939,99.906723],[15.87742,99.907837],[15.87723,99.907944],[15.87684,99.908173],[15.87643,99.908409],[15.87577,99.908791],[15.87485,99.909317],[15.87437,99.909599],[15.87366,99.910019],[15.86913,99.912613],[15.86472,99.915161],[15.86172,99.916901],[15.85842,99.918762],[15.8563,99.919983],[15.85584,99.920273],[15.85352,99.921623],[15.84915,99.924141],[15.848,99.924797],[15.84266,99.927872],[15.8408,99.92894],[15.83893,99.929993],[15.83869,99.930107],[15.83772,99.930634],[15.83604,99.931587],[15.83532,99.932007],[15.83225,99.933769],[15.83179,99.934036],[15.83115,99.934402],[15.83021,99.934952],[15.82925,99.935547],[15.82839,99.93605],[15.82702,99.936836],[15.82609,99.93734],[15.82586,99.937469],[15.82543,99.937714],[15.82486,99.938042],[15.82453,99.938217],[15.82423,99.938393],[15.82276,99.939194],[15.82242,99.939377],[15.82224,99.939491],[15.82184,99.939728],[15.81962,99.941002],[15.81839,99.941757],[15.81794,99.942009],[15.81565,99.943443],[15.81245,99.946007],[15.80879,99.949387],[15.80795,99.95015],[15.80672,99.951286],[15.80631,99.95166],[15.8061,99.951851],[15.80549,99.952423],[15.80023,99.957314],[15.79641,99.960907],[15.79151,99.965446],[15.79109,99.96582],[15.79089,99.966019],[15.79047,99.966408],[15.78922,99.967567],[15.78465,99.971817],[15.78341,99.972961],[15.77872,99.977364],[15.77314,99.98259],[15.77137,99.984322],[15.77118,99.984497],[15.771,99.98468],[15.7703,99.985336],[15.76963,99.985992],[15.76806,99.98748],[15.76747,99.988037],[15.76677,99.988701],[15.76587,99.989563],[15.76536,99.990021],[15.76506,99.990311],[15.76447,99.990868],[15.76404,99.99128],[15.76343,99.991859],[15.76275,99.9925],[15.76078,99.99437],[15.75662,99.99836],[15.75542,99.999496],[15.75523,99.99968],[15.75283,100.001961],[15.75206,100.002693],[15.75028,100.004356],[15.7501,100.004539],[15.74955,100.005058],[15.74901,100.005569],[15.74865,100.005913],[15.74847,100.006073],[15.74829,100.006241],[15.74811,100.006409],[15.74671,100.007736],[15.74604,100.008377],[15.74588,100.008537],[15.74571,100.00869],[15.74555,100.00885],[15.74347,100.010841],[15.74286,100.011513],[15.74271,100.011703],[15.74197,100.012627],[15.74139,100.013474],[15.74012,100.015778],[15.73951,100.017059],[15.73938,100.017326],[15.73767,100.020683],[15.73662,100.022697],[15.73636,100.023193],[15.73404,100.027718],[15.7334,100.028908],[15.73182,100.031929],[15.73156,100.03244],[15.73129,100.032944],[15.73064,100.034187],[15.72901,100.037308],[15.72816,100.038933],[15.72779,100.039627],[15.72742,100.040352],[15.72717,100.040833],[15.72655,100.042023],[15.7244,100.04612],[15.72409,100.046707],[15.72305,100.048714],[15.72204,100.050598],[15.72073,100.053078],[15.72005,100.054352],[15.71917,100.056023],[15.71907,100.05619],[15.71891,100.056511],[15.71863,100.057007],[15.71828,100.057648],[15.71801,100.058121],[15.71785,100.058388],[15.71766,100.058548],[15.71751,100.058578],[15.71732,100.058617],[15.71702,100.058617],[15.71687,100.058578],[15.71626,100.058357],[15.71531,100.058052],[15.71488,100.057907],[15.71418,100.057663],[15.71319,100.057289],[15.70982,100.056313],[15.70848,100.056099],[15.70526,100.055977],[15.70499,100.055977],[15.70418,100.055969],[15.69769,100.055939],[15.69256,100.055923],[15.68718,100.05587],[15.68639,100.055878],[15.68184,100.055962],[15.67809,100.056519],[15.67601,100.057114],[15.67575,100.05719],[15.67549,100.057281],[15.67423,100.05777],[15.67133,100.059227],[15.67039,100.059776],[15.66859,100.06102],[15.66796,100.061508],[15.66775,100.061684],[15.66653,100.062759],[15.66613,100.063141],[15.66593,100.063339],[15.66535,100.063927],[15.66513,100.064194],[15.66399,100.065514],[15.66335,100.066238],[15.6628,100.066879],[15.66244,100.067307],[15.65813,100.072357],[15.65441,100.076736],[15.65335,100.07798],[15.64987,100.082092],[15.64952,100.082497],[15.64579,100.086853],[15.64386,100.089127],[15.64161,100.091782],[15.63819,100.095734],[15.63676,100.097382],[15.63577,100.098457],[15.63527,100.099083],[15.63476,100.099693],[15.63253,100.10228],[15.63229,100.102562],[15.6313,100.103737],[15.63024,100.105003],[15.62668,100.109123],[15.6219,100.114677],[15.62155,100.115082],[15.62043,100.116333],[15.61751,100.119652],[15.61555,100.121933],[15.61525,100.122299],[15.61512,100.122459],[15.61465,100.122726],[15.61421,100.12278],[15.61356,100.12236],[15.61316,100.121872],[15.61283,100.121582],[15.6123,100.121407],[15.61209,100.121422],[15.61115,100.121536],[15.6109,100.121559],[15.61037,100.121597],[15.60577,100.122017],[15.60203,100.122414],[15.60097,100.122528],[15.59964,100.122673],[15.59883,100.122726],[15.59727,100.122887],[15.594,100.123238],[15.59322,100.123322],[15.59139,100.123497],[15.59112,100.123528],[15.58641,100.124046],[15.58456,100.12426],[15.58217,100.124512],[15.57952,100.124786],[15.57741,100.125023],[15.57477,100.125313],[15.57104,100.12571],[15.5673,100.126099],[15.56677,100.126152],[15.56257,100.126587],[15.55892,100.126907],[15.55866,100.126938],[15.55732,100.127083],[15.55625,100.12719],[15.55572,100.127258],[15.55546,100.127289],[15.55467,100.127388],[15.54787,100.128113],[15.54605,100.128242],[15.54499,100.128197],[15.54446,100.128113],[15.54343,100.127853],[15.5396,100.126534],[15.53935,100.126427],[15.53479,100.124977],[15.53266,100.124817],[15.53055,100.125191],[15.52954,100.125526],[15.52501,100.127136],[15.52288,100.127296],[15.52028,100.126984],[15.51816,100.126678],[15.51471,100.126213],[15.5098,100.125504],[15.50955,100.125473],[15.50904,100.125397],[15.50748,100.125252],[15.50665,100.125229],[15.50425,100.125526],[15.50321,100.125801],[15.50295,100.125893],[15.50144,100.126472],[15.49994,100.127098],[15.49968,100.127197],[15.4979,100.127907],[15.49206,100.130219],[15.49181,100.130333],[15.48732,100.132233],[15.48482,100.133888],[15.48358,100.134918],[15.48048,100.137543],[15.47986,100.138069],[15.47966,100.138237],[15.47863,100.139107],[15.4778,100.139793],[15.47758,100.139954],[15.4769,100.140404],[15.47667,100.140549],[15.4762,100.140823],[15.47547,100.141182],[15.47293,100.142067],[15.47161,100.142403],[15.46452,100.144142],[15.46318,100.144463],[15.46139,100.144882],[15.46078,100.145027],[15.45703,100.145958],[15.45379,100.14653],[15.45133,100.146538],[15.44864,100.146118],[15.44813,100.145958],[15.44761,100.145798],[15.44397,100.144928],[15.44036,100.144043],[15.43984,100.143913],[15.43825,100.143509],[15.43669,100.143097],[15.43405,100.142403],[15.43217,100.142311],[15.43031,100.142761],[15.42954,100.143051],[15.42879,100.143341],[15.42844,100.143471],[15.42729,100.143898],[15.42502,100.144737],[15.41997,100.146683],[15.41895,100.147003],[15.41788,100.147179],[15.41599,100.147247],[15.41572,100.147247],[15.41438,100.147217],[15.41276,100.147232],[15.41113,100.147217],[15.40869,100.147186],[15.40271,100.147087],[15.40135,100.147087],[15.40056,100.147079],[15.39872,100.147141],[15.39752,100.147209],[15.39729,100.147232],[15.39668,100.147301],[15.39601,100.147377],[15.39561,100.147438],[15.39551,100.147453],[15.3949,100.14756],[15.39478,100.147583],[15.39407,100.14772],[15.39362,100.147827],[15.393,100.148003],[15.39124,100.148438],[15.39037,100.148712],[15.39014,100.148788],[15.38919,100.149109],[15.38869,100.149261],[15.38818,100.149422],[15.38664,100.14994],[15.38307,100.151154],[15.38178,100.151604],[15.38048,100.152039],[15.38021,100.15213],[15.37995,100.152222],[15.37785,100.152931],[15.37759,100.153023],[15.37479,100.153976],[15.3707,100.155373],[15.36592,100.157043],[15.36289,100.158073],[15.35931,100.159286],[15.35477,100.16095],[15.35355,100.161484],[15.34929,100.163544],[15.34725,100.164627],[15.34634,100.165154],[15.34216,100.16748],[15.341,100.168121],[15.33988,100.168739],[15.3395,100.168953],[15.33886,100.169312],[15.33798,100.1698],[15.33737,100.170143],[15.33693,100.170387],[15.33648,100.170631],[15.33251,100.172836],[15.33088,100.173737],[15.32901,100.174782],[15.32783,100.17543],[15.32526,100.176849],[15.32505,100.176971],[15.32421,100.177437],[15.32274,100.178253],[15.32159,100.178886],[15.32127,100.17907],[15.31896,100.180351],[15.31723,100.18132],[15.3147,100.182716],[15.31442,100.182877],[15.31256,100.183907],[15.31003,100.185318],[15.30866,100.186073],[15.30612,100.187477],[15.30554,100.187843],[15.30511,100.18808],[15.30416,100.188568],[15.30307,100.189117],[15.30274,100.189278],[15.30025,100.190407],[15.2999,100.190559],[15.29957,100.190697],[15.2993,100.190811],[15.29896,100.190964],[15.29851,100.191147],[15.29838,100.1912],[15.29825,100.191261],[15.29813,100.191307],[15.29798,100.191368],[15.29782,100.191437],[15.2976,100.191521],[15.29703,100.191742],[15.29618,100.192047],[15.29541,100.192329],[15.29437,100.19268],[15.29415,100.192757],[15.29393,100.192833],[15.29348,100.192978],[15.29326,100.193047],[15.28926,100.194153],[15.28852,100.194344],[15.28729,100.194672],[15.28608,100.195],[15.28584,100.195061],[15.28535,100.19519],[15.28036,100.196571],[15.27729,100.197403],[15.27612,100.197723],[15.2747,100.198097],[15.27351,100.198418],[15.27231,100.198738],[15.26826,100.199837],[15.26282,100.201271],[15.26071,100.201843],[15.26047,100.20192],[15.25882,100.202377],[15.2581,100.202583],[15.25691,100.202904],[15.25644,100.203018],[15.25549,100.203247],[15.25526,100.2033],[15.2548,100.203407],[15.25265,100.203819],[15.24998,100.204338],[15.24949,100.20443],[15.24851,100.204643],[15.24778,100.204781],[15.24681,100.204987],[15.24633,100.205078],[15.24512,100.205307],[15.24278,100.20578],[15.24127,100.206078],[15.24049,100.20623],[15.23587,100.207352],[15.23538,100.207481],[15.23346,100.208],[15.23133,100.208572],[15.22951,100.209053],[15.22351,100.210709],[15.2228,100.210907],[15.22038,100.211639],[15.22014,100.211723],[15.21967,100.211884],[15.21848,100.212288],[15.21754,100.212608],[15.21614,100.21312],[15.21521,100.213493],[15.21316,100.214401],[15.20888,100.216461],[15.20757,100.217171],[15.20649,100.217796],[15.20231,100.220222],[15.19877,100.222237],[15.19429,100.224808],[15.19122,100.226486],[15.18906,100.227707],[15.18715,100.228844],[15.18267,100.231468],[15.18014,100.233093],[15.17931,100.23365],[15.17829,100.23436],[15.17748,100.234932],[15.17647,100.235672],[15.17547,100.236397],[15.17467,100.237],[15.17427,100.237297],[15.17085,100.239853],[15.16943,100.240891],[15.16743,100.242371],[15.16702,100.242668],[15.16662,100.242973],[15.1636,100.245178],[15.16119,100.246941],[15.15867,100.248703],[15.15807,100.249092],[15.1566,100.249992],[15.15618,100.250237],[15.1529,100.251968],[15.15093,100.25296],[15.14985,100.25354],[15.14877,100.254128],[15.14688,100.255127],[15.14652,100.25531],[15.14462,100.256218],[15.14441,100.25631],[15.14381,100.256569],[15.14345,100.256737],[15.14328,100.256813],[15.14258,100.257141],[15.1424,100.257233],[15.13979,100.258553],[15.13638,100.260277],[15.13618,100.260384],[15.13599,100.260468],[15.13366,100.261642],[15.13288,100.262032],[15.13269,100.262131],[15.13211,100.262428],[15.13091,100.263031],[15.13071,100.26313],[15.13028,100.263344],[15.13006,100.263458],[15.12984,100.263573],[15.12871,100.26413],[15.12803,100.26445],[15.12519,100.265984],[15.12263,100.267998],[15.12059,100.270264],[15.12029,100.270668],[15.11829,100.273659],[15.11704,100.275551],[15.11691,100.275757],[15.11476,100.279121],[15.11189,100.283524],[15.1103,100.286003],[15.10981,100.286713],[15.10929,100.287376],[15.107,100.289864],[15.1045,100.291901],[15.10075,100.294456],[15.09984,100.29509],[15.09925,100.295486],[15.09802,100.296333],[15.09573,100.29789],[15.09328,100.299507],[15.08991,100.301826],[15.08797,100.303169],[15.08675,100.304001],[15.08506,100.305168],[15.08359,100.306198],[15.08292,100.306671],[15.08214,100.307297],[15.08133,100.307953],[15.07951,100.30954],[15.07753,100.31144],[15.07606,100.312767],[15.07379,100.315063],[15.07118,100.317436],[15.06834,100.319649],[15.06525,100.32151],[15.05924,100.324608],[15.05301,100.327957],[15.04762,100.330757],[15.04751,100.330833],[15.04493,100.332314],[15.04151,100.334091],[15.0373,100.335579],[15.03228,100.336708],[15.02009,100.339088],[15.01539,100.340363],[15.01103,100.342216],[14.99827,100.348938],[14.98775,100.3545],[14.97862,100.359711],[14.94595,100.385002],[14.93855,100.390968],[14.93602,100.392723],[14.93327,100.394218],[14.9229,100.399612],[14.9125,100.405006],[14.90917,100.406914],[14.90763,100.408119],[14.90623,100.409462],[14.90454,100.411537],[14.90295,100.413712],[14.89979,100.418411],[14.89884,100.419594],[14.89781,100.420708],[14.89672,100.421722],[14.89556,100.422684],[14.88987,100.426567],[14.88409,100.430473],[14.87735,100.435089],[14.87514,100.43644],[14.87249,100.437813],[14.87109,100.438423],[14.86971,100.43895],[14.86837,100.439407],[14.86738,100.439743],[14.84928,100.445084],[14.84726,100.445663],[14.84332,100.446716],[14.83894,100.447487],[14.83473,100.44767],[14.82958,100.44735],[14.82374,100.446953],[14.81974,100.446632],[14.81552,100.447098],[14.81223,100.448128],[14.80827,100.450729],[14.80396,100.454041],[14.7992,100.45681],[14.79534,100.458],[14.79177,100.458366],[14.78836,100.457741],[14.78346,100.455803],[14.77892,100.453453],[14.77537,100.451897],[14.77126,100.450951],[14.76771,100.450951],[14.76466,100.451317],[14.76021,100.452454],[14.75194,100.45343],[14.74029,100.454597],[14.72864,100.454987],[14.71756,100.455673],[14.71203,100.455742],[14.70655,100.455513],[14.70081,100.456139],[14.69838,100.456802],[14.69604,100.457611],[14.69409,100.458519],[14.69224,100.459549],[14.68872,100.461807],[14.68175,100.466316],[14.67903,100.468048],[14.67772,100.468758],[14.67635,100.469383],[14.6747,100.470032],[14.6729,100.470589],[14.67138,100.470947],[14.6698,100.471199],[14.66144,100.472649],[14.65078,100.474442],[14.64606,100.474808],[14.6414,100.474693],[14.63213,100.473251],[14.61383,100.469772],[14.60978,100.468941],[14.60526,100.469658],[14.60155,100.470863],[14.596,100.473961],[14.58557,100.480904],[14.5814,100.483727],[14.57584,100.487503],[14.57241,100.489838],[14.56537,100.493813],[14.55793,100.497063],[14.5467,100.500923],[14.53397,100.504532],[14.52399,100.507629],[14.51725,100.512268],[14.51076,100.517433],[14.50352,100.520782],[14.48903,100.526711],[14.48318,100.529457],[14.47226,100.534416],[14.46707,100.536926],[14.46552,100.537682],[14.46439,100.538063],[14.4626,100.538567],[14.45988,100.539131],[14.45759,100.539543],[14.45528,100.540001],[14.45267,100.540497],[14.45009,100.540977],[14.44627,100.541733],[14.44432,100.542099],[14.4423,100.542282],[14.43974,100.54303],[14.43799,100.543922],[14.43635,100.545029],[14.43472,100.546593],[14.4333,100.548424],[14.42962,100.553459],[14.42807,100.555634],[14.42727,100.556686],[14.42557,100.558952],[14.41425,100.574028],[14.40527,100.584137],[14.40375,100.585831],[14.40259,100.587097],[14.40093,100.588966],[14.39634,100.594048],[14.39526,100.595238],[14.39514,100.595383],[14.39509,100.595413],[14.39261,100.597809],[14.38907,100.600853],[14.38355,100.604683],[14.38173,100.605766],[14.37816,100.607613],[14.37716,100.608047],[14.37459,100.609138],[14.37241,100.609978],[14.36911,100.610939],[14.36623,100.611748],[14.36269,100.612419],[14.35971,100.613007],[14.35777,100.613167],[14.35565,100.613297],[14.35309,100.613327],[14.34958,100.613258],[14.34487,100.613213],[14.332,100.613342],[14.32856,100.613327],[14.31873,100.613327],[14.30838,100.613342],[14.3044,100.613373],[14.30383,100.613373],[14.30248,100.613388],[14.28388,100.613457],[14.26434,100.613449],[14.26224,100.613487],[14.25709,100.613564],[14.2519,100.613564],[14.24813,100.613564],[14.24431,100.613411],[14.24005,100.612999],[14.23393,100.612228],[14.23293,100.612091],[14.23122,100.61187],[14.21575,100.609734],[14.21111,100.609123],[14.21052,100.609062],[14.20943,100.608963],[14.20799,100.60891],[14.20694,100.608932],[14.2055,100.608994],[14.2024,100.609047],[14.20071,100.609154],[14.19831,100.609467],[14.19601,100.609779],[14.19276,100.610519],[14.18953,100.61145],[14.18302,100.613777],[14.17835,100.61557],[14.17814,100.615677],[14.17804,100.615761],[14.17794,100.615837],[14.17783,100.615936],[14.17773,100.616058],[14.17759,100.616257],[14.17754,100.616348],[14.17745,100.616524],[14.17739,100.616699],[14.17736,100.616814],[14.17734,100.616943],[14.17734,100.617081],[14.17737,100.617218],[14.17741,100.617348],[14.17747,100.61747],[14.17755,100.617599],[14.17835,100.618568],[14.17858,100.618782],[14.17868,100.618927],[14.17905,100.619164],[14.17952,100.619453],[14.17988,100.619713],[14.18023,100.620003],[14.18057,100.620293],[14.18088,100.620598],[14.18122,100.620956],[14.18154,100.621353],[14.18183,100.621742],[14.1821,100.622139],[14.18238,100.622627],[14.18266,100.623169],[14.18351,100.624786],[14.18394,100.625603],[14.1876,100.6325],[14.18777,100.632629],[14.18804,100.632973],[14.18819,100.633118],[14.18844,100.633324],[14.1886,100.633423],[14.18879,100.633507],[14.18898,100.633583],[14.18944,100.633728],[14.18958,100.633781],[14.18973,100.633858],[14.18985,100.633949],[14.18996,100.634079],[14.19003,100.634178],[14.1901,100.6343],[14.19017,100.634453],[14.19021,100.634598],[14.19024,100.634697],[14.19024,100.634773],[14.19026,100.634903],[14.19025,100.635078],[14.19024,100.635193],[14.19022,100.635292],[14.1902,100.635384],[14.19014,100.635567],[14.19004,100.635803],[14.18993,100.636009],[14.18973,100.636276],[14.18955,100.636513],[14.18934,100.636711],[14.18917,100.636848],[14.18869,100.637123],[14.18505,100.63929],[14.18225,100.640869],[14.16198,100.65229],[14.15898,100.653976],[14.14369,100.662613],[14.14085,100.664207],[14.12254,100.67453],[14.11993,100.676003],[14.1014,100.686447],[14.09778,100.688477],[14.08837,100.693787],[14.08782,100.694069],[14.08718,100.694328],[14.08655,100.694542],[14.08592,100.694717],[14.08521,100.694847],[14.08467,100.694923],[14.0686,100.696533],[14.06346,100.697052],[14.05247,100.698151],[14.05158,100.698227],[14.05068,100.698273],[14.02581,100.698288],[14.02536,100.698311],[14.02491,100.698341],[14.02444,100.698387],[14.02399,100.698463],[14.0235,100.698547],[14.02317,100.698624],[14.02292,100.698692],[14.0224,100.698837],[14.02195,100.698982],[14.02148,100.69915],[14.02108,100.699318],[14.02067,100.699501],[14.01956,100.699989],[14.00956,100.704399],[13.99926,100.708946],[13.99298,100.711723],[13.99042,100.712837],[13.98989,100.713013],[13.98935,100.713173],[13.98881,100.713287],[13.98828,100.713371],[13.98776,100.713417],[13.98726,100.713463],[13.98675,100.713448],[13.9863,100.713417],[13.98523,100.713333],[13.98473,100.713333],[13.9826,100.713287],[13.95215,100.71286],[13.95173,100.712837],[13.95132,100.712822],[13.95075,100.712784],[13.9502,100.712723],[13.94955,100.712624],[13.94912,100.712547],[13.94865,100.712463],[13.94311,100.710999],[13.93615,100.709167],[13.93011,100.707581],[13.92421,100.706032],[13.92266,100.705643],[13.92128,100.705261],[13.92036,100.704964],[13.91983,100.704773],[13.91909,100.704483],[13.9177,100.703888],[13.91276,100.701317],[13.90788,100.698799],[13.90705,100.698357],[13.89609,100.692703],[13.89326,100.691231],[13.88801,100.688507],[13.88746,100.688217],[13.87732,100.682983],[13.87618,100.682381],[13.86972,100.679039],[13.86879,100.678574],[13.86822,100.678307],[13.86793,100.6782],[13.86763,100.678101],[13.86725,100.677994],[13.86686,100.677887],[13.8578,100.675797],[13.8572,100.675636],[13.85666,100.675484],[13.85623,100.675323],[13.85546,100.675003],[13.8538,100.674316],[13.85204,100.673592],[13.85131,100.673302],[13.85097,100.67318],[13.85063,100.67308],[13.85029,100.672997],[13.84993,100.672928],[13.84957,100.672882],[13.84612,100.672638],[13.84541,100.672592],[13.84291,100.672417],[13.84251,100.672401],[13.84197,100.672401],[13.84152,100.672432],[13.84111,100.672478],[13.84064,100.672546],[13.84026,100.672623],[13.83963,100.672783],[13.83788,100.673233],[13.83672,100.673523],[13.83597,100.673721],[13.83529,100.673866],[13.83487,100.673943],[13.83439,100.674011],[13.83402,100.674049],[13.83295,100.674118],[13.83175,100.674179],[13.82532,100.67453],[13.8245,100.674606],[13.82378,100.674713],[13.8232,100.674828],[13.82128,100.675308],[13.81476,100.677017],[13.79887,100.681221],[13.79574,100.682037],[13.78257,100.685516],[13.78209,100.685669],[13.78161,100.685822],[13.7809,100.686073],[13.78006,100.686363],[13.77943,100.686623],[13.77875,100.68692],[13.77829,100.687134],[13.77761,100.687462],[13.77604,100.688309],[13.77088,100.691109],[13.76983,100.691681],[13.76765,100.692863],[13.76654,100.693466],[13.76069,100.696648],[13.75988,100.69709],[13.75691,100.6987],[13.75131,100.701736],[13.75102,100.701881],[13.75072,100.702011],[13.75036,100.702148],[13.7501,100.70224],[13.74983,100.702316],[13.74956,100.7024],[13.74928,100.702469],[13.74898,100.70253],[13.7487,100.702583],[13.7481,100.70266],[13.74738,100.702713],[13.74684,100.702713],[13.74257,100.702789],[13.74221,100.70298],[13.73885,100.703033],[13.73849,100.703217],[13.73729,100.703247],[13.73711,100.703346],[13.7362,100.70343],[13.73587,100.703499],[13.73561,100.703598],[13.73523,100.70388],[13.73436,100.704857],[13.73386,100.705383],[13.73325,100.705803],[13.73292,100.706093],[13.73268,100.706451],[13.73245,100.707199],[13.73227,100.70813],[13.7322,100.708519],[13.73188,100.710297],[13.7304,100.723747],[13.73037,100.724022],[13.72961,100.73085],[13.72959,100.731033],[13.72935,100.73317],[13.72933,100.733917],[13.72933,100.734703],[13.72949,100.740051],[13.72953,100.741081],[13.72953,100.741257],[13.7296,100.744133],[13.7297,100.748718],[13.72977,100.751572],[13.72991,100.757378],[13.72997,100.757896],[13.7309,100.761551],[13.73172,100.764793],[13.7318,100.765182],[13.73183,100.765602],[13.73191,100.76786],[13.73211,100.771118],[13.73215,100.773232],[13.73228,100.783249],[13.73232,100.784142],[13.73249,100.785889],[13.73291,100.79023],[13.73429,100.803726],[13.73383,100.805557],[13.73315,100.807281],[13.73138,100.809334],[13.72858,100.811081],[13.72721,100.81176],[13.7256,100.812553],[13.71357,100.818466],[13.71015,100.820236],[13.67427,100.838043],[13.67241,100.840233],[13.66908,100.845444],[13.60214,100.949783],[13.59885,100.954903],[13.59275,100.964043],[13.57161,100.981888],[13.55248,100.997871],[13.5509,100.999191],[13.5466,101.002937],[13.54299,101.005966],[13.53928,101.009087],[13.5367,101.011261],[13.49601,101.045448],[13.4933,101.046761],[13.49057,101.04705],[13.47329,101.04612],[13.4541,101.046257],[13.44076,101.046288],[13.42756,101.046783],[13.39933,101.047531],[13.39226,101.047073],[13.38711,101.046272],[13.36243,101.038658],[13.35742,101.036041],[13.35643,101.035423],[13.35091,101.031921],[13.34394,101.027634],[13.32626,101.016411],[13.31824,101.010399],[13.303,100.998978],[13.30144,100.997482],[13.30042,100.99649],[13.29915,100.99559],[13.29733,100.994743],[13.29551,100.993729],[13.29331,100.992599],[13.29079,100.991959],[13.28824,100.991524],[13.2831,100.991096],[13.27806,100.990791],[13.27206,100.990356],[13.26595,100.989998],[13.26406,100.989861],[13.26223,100.989769],[13.26119,100.98983],[13.26009,100.98996],[13.25884,100.990173],[13.25766,100.990509],[13.25655,100.990868],[13.25397,100.991837],[13.25177,100.992706],[13.24063,100.996986],[13.23351,100.99971],[13.22734,101.002083],[13.22418,101.003311],[13.22106,101.004509],[13.21955,101.005058],[13.21801,101.005463],[13.21637,101.005692],[13.21487,101.005783],[13.21191,101.005524],[13.20789,101.004379],[13.20639,101.003883],[13.19684,101.00074],[13.19001,100.99852],[13.18317,100.996277],[13.17575,100.993828],[13.16839,100.99144],[13.16099,100.989037],[13.15633,100.987556],[13.15439,100.986961],[13.15364,100.986717],[13.15228,100.986397],[13.15062,100.986153],[13.14806,100.986031],[13.14536,100.985947],[13.14282,100.985809],[13.13809,100.985718],[13.13165,100.985413],[13.12547,100.985199],[13.12188,100.985008],[13.12003,100.985031],[13.11832,100.985123],[13.11127,100.986557],[13.10656,100.987534],[13.10132,100.988663],[13.09598,100.989754],[13.09082,100.990791],[13.08545,100.99192],[13.07498,100.994072],[13.06974,100.995102],[13.06474,100.996117],[13.05745,100.996262],[13.05021,100.996323],[13.03819,100.996429],[13.025,100.996498],[13.01834,100.996536],[13.01381,100.996597],[13.01173,100.996452],[13.00731,100.995232],[12.99751,100.991707],[12.99483,100.990753],[12.98278,100.986504],[12.97491,100.983803],[12.97186,100.982681],[12.96919,100.981857],[12.96762,100.981293],[12.96685,100.981194],[12.9663,100.981056],[12.96574,100.98101],[12.96515,100.981056],[12.96462,100.981377],[12.96341,100.982033],[12.96096,100.98378],[12.95902,100.984718],[12.95468,100.98716],[12.95261,100.988342],[12.94143,100.994949],[12.93028,101.001678],[12.92805,101.003357],[12.92681,101.00486],[12.92379,101.009621],[12.92007,101.015747],[12.91659,101.0214],[12.91547,101.022774],[12.9151,101.023117],[12.91215,101.025848],[12.90933,101.028763],[12.90849,101.029533],[12.90795,101.03009],[12.90274,101.035248],[12.90131,101.036652],[12.90082,101.03714],[12.89481,101.043053],[12.88653,101.051193],[12.88284,101.05481],[12.87155,101.065903],[12.86993,101.067871],[12.86114,101.083557],[12.85287,101.098701],[12.84665,101.109756],[12.84072,101.120407],[12.83925,101.121857],[12.83811,101.12278],[12.83599,101.12429],[12.83082,101.127808],[12.82666,101.130661],[12.82239,101.133537],[12.81921,101.135651],[12.81603,101.137787],[12.80908,101.142593],[12.80223,101.147209],[12.79566,101.151749],[12.78903,101.15638],[12.78129,101.163872],[12.77738,101.167793],[12.77337,101.171707],[12.76987,101.175087],[12.76591,101.179092],[12.76228,101.182678],[12.75869,101.186302],[12.75254,101.192291],[12.7495,101.195259],[12.74631,101.198151],[12.73827,101.20517],[12.73008,101.212349],[12.72737,101.214783],[12.72482,101.217682],[12.72087,101.222397],[12.71684,101.227226],[12.70798,101.237846],[12.70502,101.241524],[12.7044,101.242378],[12.7039,101.243347],[12.70129,101.250237],[12.69903,101.256577],[12.69825,101.264671],[12.69778,101.270447],[12.69759,101.273117],[12.69682,101.279663],[12.69649,101.282837],[12.69607,101.285477],[12.69359,101.291321],[12.69267,101.293213],[12.69164,101.294777],[12.69023,101.29615],[12.68867,101.297241],[12.68297,101.299988],[12.67723,101.302818],[12.66358,101.309792],[12.66238,101.311333],[12.66135,101.316528],[12.66116,101.317993],[12.65854,101.326317],[12.65777,101.328644],[12.65398,101.336578],[12.6483,101.344757],[12.64673,101.348091],[12.64639,101.348824],[12.64616,101.349297],[12.64595,101.349747],[12.64557,101.350563],[12.64334,101.355293],[12.64314,101.355721],[12.63985,101.362717],[12.63967,101.363518],[12.63899,101.372093],[12.64012,101.388603],[12.64075,101.398293],[12.64155,101.408882],[12.64237,101.422127],[12.64219,101.424332],[12.64124,101.42881],[12.64327,101.435623],[12.65019,101.447891],[12.65435,101.455276],[12.6613,101.472076],[12.66057,101.488861],[12.66082,101.495087],[12.66561,101.511528],[12.67204,101.521507],[12.68008,101.523369],[12.68229,101.525742],[12.68671,101.534187],[12.70008,101.541809],[12.70731,101.54882],[12.71304,101.560768],[12.71314,101.563553],[12.71917,101.568703],[12.72148,101.574471],[12.72651,101.577766],[12.73162,101.587303],[12.73595,101.595383],[12.75103,101.609909],[12.75394,101.613403],[12.7559,101.615753],[12.76348,101.624847],[12.77363,101.639168],[12.77632,101.64283],[12.78186,101.646896],[12.78272,101.650703],[12.78339,101.653229],[12.78356,101.653877],[12.78415,101.656662],[12.78494,101.6586],[12.7862,101.661133],[12.78678,101.662407],[12.78695,101.663277],[12.78691,101.664818],[12.78645,101.669197],[12.78565,101.679581],[12.78532,101.681557],[12.78398,101.68602],[12.78172,101.693832],[12.77642,101.711746],[12.77624,101.712372],[12.77546,101.715767],[12.77636,101.718887],[12.77753,101.722893],[12.78054,101.732933],[12.78879,101.760483],[12.78925,101.762283],[12.78942,101.766441],[12.78921,101.76889],[12.78892,101.772278],[12.78788,101.785912],[12.78737,101.788971],[12.78692,101.789993],[12.7862,101.791634],[12.78431,101.79554],[12.78356,101.796959],[12.78314,101.798241],[12.78285,101.800392],[12.78164,101.810562],[12.78092,101.815964],[12.78046,101.819359],[12.77996,101.821373],[12.77896,101.824249],[12.77678,101.830948],[12.77469,101.837212],[12.7741,101.838966],[12.77222,101.842232],[12.77109,101.843819],[12.76665,101.850388],[12.76581,101.851372],[12.76473,101.852402],[12.76247,101.854286],[12.76138,101.855186],[12.7597,101.857162],[12.75732,101.859947],[12.75564,101.861931],[12.75476,101.863258],[12.75255,101.867813],[12.74983,101.873299],[12.7466,101.880547],[12.74455,101.885017],[12.74267,101.889313],[12.74187,101.890121],[12.7407,101.8909],[12.73957,101.89167],[12.73878,101.892616],[12.73798,101.894157],[12.73551,101.899353],[12.73346,101.904243],[12.73224,101.907806],[12.73099,101.911499],[12.73091,101.912956],[12.73053,101.91626],[12.72299,101.941582],[12.72316,101.953247],[12.72295,101.954933],[12.72217,101.957153],[12.72216,101.958961],[12.72146,101.971413],[12.7209,101.972687],[12.72015,101.973846],[12.71939,101.975357],[12.71882,101.976128],[12.71659,101.978317],[12.71395,101.980293],[12.71165,101.981361],[12.70043,101.986168],[12.69917,101.986771],[12.69767,101.988274],[12.69088,101.995911],[12.68599,102.001244],[12.68335,102.00415],[12.6823,102.005096],[12.68121,102.005569],[12.67991,102.005608],[12.67862,102.005386],[12.67744,102.00518],[12.67636,102.005051],[12.67552,102.005013],[12.67451,102.00518],[12.65326,102.011581],[12.65151,102.012482],[12.65004,102.016434],[12.64939,102.018707],[12.64882,102.021049],[12.64871,102.021553],[12.64862,102.021927],[12.64854,102.022362],[12.6485,102.02282],[12.64855,102.023499],[12.64883,102.025787],[12.64942,102.03067],[12.65019,102.040031],[12.65722,102.058571],[12.66028,102.066811],[12.66145,102.071777],[12.66534,102.088951],[12.66677,102.0914],[12.66697,102.091743],[12.66748,102.092644],[12.6629,102.119957],[12.6499,102.129128],[12.64373,102.130623],[12.64176,102.131866],[12.63252,102.142036],[12.62387,102.151543],[12.62117,102.148933],[12.61644,102.141602],[12.61577,102.140556],[12.60959,102.134377],[12.60811,102.133591],[12.60534,102.133743],[12.60309,102.135002],[12.60275,102.1353],[12.60235,102.135674],[12.60058,102.137268],[12.59573,102.143303],[12.58852,102.155151],[12.57278,102.162529],[12.56758,102.162529],[12.55827,102.157852],[12.54606,102.155487],[12.54006,102.157417],[12.53078,102.157288],[12.53014,102.157707],[12.52137,102.163589],[12.51361,102.168503],[12.50319,102.170288],[12.50093,102.170937],[12.48798,102.174721],[12.48346,102.179352],[12.48312,102.181931],[12.47407,102.190857],[12.46938,102.195831],[12.46737,102.199783],[12.46502,102.206131],[12.4658,102.220001],[12.45995,102.230057],[12.45079,102.245682],[12.4543,102.258827],[12.45664,102.262444],[12.45698,102.269478],[12.45161,102.284752],[12.44726,102.288696],[12.4439,102.297287],[12.44038,102.300537],[12.43006,102.313637],[12.42664,102.318916],[12.41257,102.330421],[12.39741,102.350517],[12.39663,102.354973],[12.39218,102.364067],[12.38945,102.368896],[12.38737,102.370117],[12.38571,102.37117],[12.38241,102.373177],[12.381,102.374153],[12.37111,102.388428],[12.36611,102.395821],[12.36796,102.410751],[12.36292,102.425003],[12.34096,102.4468],[12.33492,102.456932],[12.32819,102.45916],[12.32289,102.459846],[12.31658,102.465607],[12.31094,102.468086],[12.30272,102.475471],[12.29473,102.480309],[12.28444,102.484909],[12.27337,102.493149],[12.25648,102.507713],[12.25171,102.509537],[12.25944,102.518356],[12.26459,102.532806],[12.26085,102.543793],[12.25926,102.553307],[12.25758,102.555817],[12.2537,102.560799],[12.25156,102.568703],[12.25103,102.578362],[12.25093,102.587677],[12.25035,102.608727],[12.25054,102.611641],[12.24529,102.625427],[12.23383,102.627869],[12.23004,102.632057],[12.22525,102.645149],[12.20238,102.657333],[12.19404,102.659683],[12.18628,102.665611],[12.16334,102.679649],[12.15023,102.683006],[12.13089,102.691048],[12.1194,102.694992],[12.11467,102.697151],[12.1053,102.700394],[12.09618,102.705383],[12.08143,102.718521],[12.07709,102.725151],[12.06748,102.731934],[12.06485,102.73616],[12.06065,102.739113],[12.05058,102.75132],[12.04662,102.753799],[12.04233,102.758507],[12.01981,102.769608],[12.01509,102.77037],[12.00404,102.770599],[11.98184,102.776588],[11.96461,102.783089],[11.92141,102.80452],[11.90769,102.808289],[11.90115,102.811401],[11.88415,102.814987],[11.87684,102.818672],[11.86838,102.820839],[11.84824,102.831734],[11.84367,102.837181],[11.81262,102.853706],[11.80578,102.860786],[11.78507,102.874878],[11.7791,102.883461],[11.77862,102.884491],[11.77812,102.886162],[11.77667,102.886948],[11.77323,102.888817],[11.77145,102.888847],[11.7708,102.889069],[11.76782,102.890984],[11.76454,102.894508],[11.75899,102.896049],[11.75711,102.896729],[11.75476,102.896507],[11.75231,102.897057],[11.75154,102.897423],[11.7498,102.897713],[11.74754,102.898857],[11.74599,102.899002],[11.74284,102.900726],[11.74084,102.901321],[11.73924,102.902321],[11.73823,102.902657],[11.73688,102.904053],[11.73105,102.906174],[11.72379,102.905197],[11.71887,102.907021],[11.71666,102.907227],[11.7156,102.907669],[11.71261,102.907578],[11.71073,102.907593],[11.70928,102.906769],[11.70047,102.906502],[11.69846,102.904984],[11.69535,102.904503],[11.69275,102.904793],[11.68926,102.903084],[11.68662,102.902481],[11.68326,102.903008],[11.68151,102.903816],[11.67983,102.904114],[11.67867,102.904861],[11.67712,102.905067],[11.67607,102.905533],[11.67155,102.904831],[11.6703,102.905792],[11.66651,102.906242],[11.66574,102.906036],[11.66491,102.906464],[11.66189,102.906693],[11.65979,102.907532],[11.65812,102.906967],[11.65571,102.907349],[11.65356,102.908577],[11.65165,102.908836],[11.64946,102.911377],[11.64477,102.916077],[11.6429,102.918373],[11.64362,102.923988],[11.64301,102.928268],[11.64347,102.933006],[11.63845,102.941254],[11.63771,102.943657],[11.63596,102.946564],[11.63056,102.94841],[11.62356,102.949257],[11.62305,102.959099],[11.61957,102.962143],[11.61888,102.962822],[11.6163,102.979683],[11.61549,102.983543],[11.6144,102.988731],[11.60786,102.99955],[11.602,103.010292],[11.60196,103.01226],[11.60207,103.013702],[11.60248,103.015457],[11.60349,103.018707],[11.60551,103.024986],[11.60552,103.025497],[11.60557,103.02755],[11.6056,103.030159],[11.60596,103.035187],[11.60501,103.03965],[11.60492,103.040741],[11.60497,103.043221],[11.60483,103.045799],[11.60459,103.051231],[11.60384,103.054947],[11.60387,103.055687],[11.60395,103.056992],[11.60426,103.060738],[11.60432,103.061996],[11.60429,103.062576],[11.60388,103.063538],[11.60186,103.065804],[11.60169,103.06633],[11.60166,103.066963],[11.60207,103.070351],[11.60197,103.071091],[11.60167,103.071609],[11.6012,103.072037],[11.60047,103.072578],[11.59986,103.072983],[11.59913,103.073311],[11.59821,103.073441],[11.59735,103.073799],[11.59625,103.074707],[11.59593,103.075119],[11.59537,103.076553],[11.59405,103.079643],[11.59234,103.082916],[11.59217,103.085197],[11.59172,103.085518],[11.58763,103.08609],[11.58631,103.087021],[11.58491,103.087578],[11.58245,103.087196],[11.58056,103.086647],[11.57998,103.08696],[11.57799,103.089256],[11.57315,103.091026],[11.5725,103.091621],[11.57233,103.091957],[11.57225,103.092667],[11.57285,103.094414],[11.57348,103.095551],[11.57386,103.096298],[11.5736,103.098068],[11.5731,103.099411],[11.57245,103.100128],[11.57032,103.103363],[11.57003,103.104584],[11.56918,103.108437],[11.56847,103.11319],[11.56842,103.117027],[11.56869,103.118782],[11.56872,103.119423],[11.56863,103.120323],[11.56853,103.121597],[11.56842,103.12207],[11.56795,103.122673],[11.5659,103.12368],[11.56546,103.124168],[11.56533,103.124733],[11.56502,103.128433],[11.5649,103.12986],[11.5649,103.130928],[11.56522,103.131577],[11.5656,103.131882],[11.56614,103.132057],[11.56714,103.132141],[11.56756,103.132301],[11.56791,103.132591],[11.56859,103.13308],[11.56917,103.133186],[11.57056,103.133148],[11.57129,103.133347],[11.57193,103.133659],[11.57353,103.135071],[11.57457,103.135872],[11.57491,103.136261],[11.57502,103.136902],[11.57487,103.137917],[11.57441,103.140404],[11.57429,103.141327],[11.57433,103.142113],[11.57444,103.142891],[11.57476,103.144463],[11.57497,103.144943],[11.57528,103.145447],[11.57682,103.146919],[11.57742,103.147034],[11.57778,103.147011],[11.57831,103.147133],[11.57866,103.147537],[11.57868,103.148178],[11.57848,103.148842],[11.57848,103.150169],[11.57856,103.15094],[11.57885,103.151627],[11.57896,103.152298],[11.57817,103.156929],[11.57748,103.15934],[11.57724,103.160477],[11.57753,103.162361],[11.57745,103.163803],[11.57709,103.165443],[11.57664,103.168533],[11.57636,103.172096],[11.57614,103.175041],[11.57617,103.176277],[11.5766,103.177353],[11.57753,103.179581],[11.57851,103.181953],[11.57915,103.183578],[11.57981,103.185051],[11.5804,103.185829],[11.58186,103.187073],[11.58236,103.187508],[11.58281,103.188171],[11.58325,103.188911],[11.58361,103.189934],[11.58373,103.193459],[11.58285,103.196899],[11.58268,103.199982],[11.58339,103.202049],[11.58439,103.203133],[11.58479,103.204308],[11.58481,103.206703],[11.58574,103.20929],[11.58657,103.21035],[11.58873,103.212334],[11.59018,103.213943],[11.5904,103.214432],[11.5906,103.21769],[11.59058,103.217781],[11.59035,103.218803],[11.5882,103.220268],[11.58678,103.221764],[11.58348,103.22261],[11.57834,103.220749],[11.57638,103.221848],[11.57541,103.223122],[11.57472,103.22464],[11.57318,103.228439],[11.57241,103.229523],[11.57052,103.231133],[11.56974,103.232101],[11.56895,103.233109],[11.5683,103.234047],[11.56771,103.234581],[11.56548,103.235992],[11.56257,103.237617],[11.56186,103.237663],[11.56118,103.237488],[11.5604,103.237297],[11.55926,103.237343],[11.55846,103.236687],[11.55735,103.234642],[11.55677,103.233994],[11.55431,103.233093],[11.55359,103.232971],[11.55289,103.233101],[11.55138,103.233681],[11.54972,103.234703],[11.54917,103.235039],[11.5485,103.235313],[11.54473,103.23539],[11.54185,103.236504],[11.54024,103.237099],[11.53936,103.237282],[11.53716,103.237579],[11.53528,103.237],[11.534,103.236366],[11.53277,103.235626],[11.53164,103.234917],[11.53099,103.234749],[11.52984,103.23455],[11.52888,103.234177],[11.52735,103.233299],[11.52659,103.232536],[11.5262,103.23188],[11.5253,103.230614],[11.52429,103.229973],[11.52392,103.229927],[11.52121,103.229973],[11.51972,103.229561],[11.51893,103.229263],[11.5182,103.229317],[11.51399,103.23159],[11.51297,103.231812],[11.51194,103.231857],[11.51011,103.23188],[11.50902,103.232224],[11.50693,103.233429],[11.50576,103.233551],[11.50494,103.233231],[11.50325,103.23259],[11.50252,103.232422],[11.50093,103.232712],[11.50011,103.232773],[11.49915,103.232857],[11.49806,103.232651],[11.49561,103.231987],[11.49041,103.228378],[11.48962,103.227768],[11.48887,103.227501],[11.48762,103.227386],[11.48165,103.227951],[11.47617,103.227783],[11.47501,103.227638],[11.47367,103.226982],[11.47107,103.225647],[11.46887,103.224922],[11.46673,103.224213],[11.46596,103.224083],[11.46513,103.224503],[11.46288,103.22673],[11.45861,103.229118],[11.45768,103.229927],[11.45594,103.235283],[11.45535,103.235847],[11.45436,103.235909],[11.45231,103.23494],[11.45074,103.234207],[11.44935,103.233437],[11.44882,103.232803],[11.4481,103.231903],[11.44777,103.231461],[11.44646,103.23069],[11.44483,103.229797],[11.44376,103.228737],[11.44315,103.22834],[11.44296,103.228027],[11.44312,103.227257],[11.44294,103.226593],[11.44219,103.225899],[11.44182,103.225731],[11.44121,103.225906],[11.44061,103.226013],[11.43851,103.225807],[11.43649,103.225662],[11.43577,103.225906],[11.43484,103.226486],[11.43371,103.22715],[11.43153,103.228653],[11.43091,103.228668],[11.43053,103.228401],[11.43026,103.22805],[11.42979,103.227699],[11.42935,103.227997],[11.42913,103.228737],[11.42871,103.229958],[11.42834,103.230888],[11.42772,103.232048],[11.42666,103.232628],[11.42512,103.231987],[11.42317,103.23111],[11.41956,103.229424],[11.41809,103.229721],[11.41689,103.230324],[11.41594,103.231331],[11.41515,103.232651],[11.41403,103.233566],[11.41247,103.233757],[11.41083,103.233849],[11.4076,103.234238],[11.40635,103.23497],[11.40458,103.235901],[11.40382,103.23703],[11.40074,103.243408],[11.39951,103.246849],[11.39861,103.247864],[11.39231,103.250717],[11.38318,103.25174],[11.38208,103.252617],[11.38027,103.256081],[11.37877,103.259323],[11.37654,103.260857],[11.37606,103.261749],[11.37449,103.264359],[11.37389,103.264664],[11.3691,103.264771],[11.36836,103.265198],[11.36669,103.267418],[11.35941,103.271683],[11.35284,103.28212],[11.34847,103.285744],[11.34724,103.286469],[11.34553,103.287643],[11.34518,103.288109],[11.34536,103.288788],[11.34643,103.289711],[11.34668,103.290863],[11.34588,103.292938],[11.34509,103.293678],[11.33875,103.295464],[11.33796,103.296097],[11.33729,103.297028],[11.33656,103.297882],[11.33186,103.300552],[11.33066,103.30188],[11.3304,103.302391],[11.33031,103.303093],[11.33047,103.305153],[11.33047,103.306183],[11.32961,103.30854],[11.32908,103.309013],[11.32749,103.309433],[11.32654,103.310249],[11.3261,103.311157],[11.32575,103.312737],[11.32507,103.31424],[11.32294,103.317398],[11.32109,103.320778],[11.32049,103.321167],[11.31987,103.321289],[11.31806,103.321457],[11.31508,103.321899],[11.31325,103.322609],[11.31258,103.322662],[11.3116,103.322113],[11.3109,103.321907],[11.30992,103.321991],[11.30893,103.32225],[11.30779,103.322746],[11.30688,103.323372],[11.3058,103.324211],[11.30497,103.324944],[11.30449,103.325333],[11.30392,103.325691],[11.30293,103.325844],[11.30268,103.325783],[11.29959,103.324966],[11.29905,103.324928],[11.2979,103.324837],[11.29723,103.324654],[11.29601,103.323753],[11.29476,103.323433],[11.29397,103.323624],[11.2925,103.324753],[11.29014,103.325653],[11.28738,103.326508],[11.28699,103.327026],[11.28605,103.32917],[11.28512,103.330017],[11.28327,103.330742],[11.28231,103.330727],[11.27854,103.329353],[11.27771,103.329453],[11.27648,103.330269],[11.27562,103.330856],[11.27447,103.331558],[11.27372,103.332024],[11.27274,103.332283],[11.27011,103.332947],[11.26775,103.333687],[11.26709,103.334099],[11.26572,103.335281],[11.26541,103.335876],[11.26491,103.337448],[11.26399,103.339478],[11.26304,103.341507],[11.26191,103.343407],[11.2606,103.345131],[11.25998,103.345482],[11.25803,103.345978],[11.25598,103.346603],[11.2535,103.347031],[11.25327,103.347191],[11.25276,103.34761],[11.25099,103.351044],[11.24909,103.354622],[11.24879,103.355293],[11.24842,103.355789],[11.24748,103.356209],[11.24567,103.356209],[11.24308,103.356209],[11.24239,103.356491],[11.24009,103.358109],[11.23948,103.358612],[11.23888,103.359482],[11.23785,103.361458],[11.23727,103.361908],[11.23649,103.362137],[11.23424,103.362457],[11.23186,103.36274],[11.23022,103.363487],[11.22925,103.363747],[11.22569,103.364067],[11.22477,103.364693],[11.22408,103.365273],[11.22289,103.366341],[11.22187,103.367439],[11.22114,103.36763],[11.22042,103.367523],[11.22021,103.367577],[11.21984,103.367989],[11.21934,103.368477],[11.21889,103.368767],[11.21749,103.369614],[11.21565,103.371063],[11.21389,103.37262],[11.21215,103.37439],[11.21129,103.375877],[11.21071,103.37722],[11.21017,103.377876],[11.20754,103.379547],[11.20646,103.380302],[11.20535,103.381142],[11.20467,103.382057],[11.20402,103.383331],[11.20299,103.385292],[11.20158,103.387016],[11.20094,103.387779],[11.19945,103.388924],[11.19743,103.390358],[11.19607,103.390877],[11.19556,103.390968],[11.19516,103.391029],[11.19458,103.391098],[11.19393,103.390984],[11.19326,103.390533],[11.19254,103.390106],[11.19202,103.389648],[11.19145,103.388702],[11.19104,103.388496],[11.19063,103.388634],[11.19037,103.389236],[11.19007,103.389633],[11.18963,103.389832],[11.1892,103.389771],[11.18897,103.389664],[11.18855,103.389473],[11.18803,103.389282],[11.1875,103.389397],[11.18686,103.390068],[11.18626,103.390823],[11.18613,103.391403],[11.18627,103.391899],[11.18647,103.392479],[11.18649,103.392998],[11.1864,103.393242],[11.18608,103.393578],[11.18541,103.393738],[11.1844,103.393951],[11.184,103.394127],[11.18359,103.394417],[11.18341,103.394943],[11.18338,103.395569],[11.18366,103.396118],[11.18396,103.396408],[11.18422,103.396881],[11.18416,103.397163],[11.18315,103.398163],[11.18271,103.399933],[11.18287,103.401947],[11.18255,103.403778],[11.18269,103.404312],[11.18305,103.404793],[11.18307,103.405411],[11.18288,103.407066],[11.183,103.407387],[11.18321,103.407898],[11.18416,103.408882],[11.18428,103.409531],[11.18365,103.410843],[11.18349,103.411758],[11.18326,103.414078],[11.18286,103.416344],[11.18285,103.420883],[11.18364,103.424301],[11.1816,103.43045],[11.18061,103.4356],[11.17133,103.445473],[11.17097,103.446518],[11.17128,103.447769],[11.17192,103.449387],[11.17298,103.450996],[11.17648,103.454811],[11.18074,103.458771],[11.18119,103.459801],[11.18182,103.464951],[11.18233,103.465736],[11.18585,103.468758],[11.18979,103.471992],[11.19473,103.474182],[11.19598,103.474953],[11.19772,103.476303],[11.19857,103.476929],[11.19942,103.477669],[11.20113,103.478958],[11.20304,103.480507],[11.20471,103.481773],[11.20656,103.483238],[11.20854,103.484772],[11.20998,103.486183],[11.21027,103.486923],[11.21045,103.487823],[11.21039,103.489372],[11.21008,103.49366],[11.20821,103.51046],[11.20727,103.51165],[11.20585,103.513023],[11.20319,103.515953],[11.20203,103.519188],[11.20101,103.522598],[11.19859,103.532829],[11.19582,103.539001],[11.19552,103.544373],[11.19414,103.549026],[11.19365,103.553429],[11.19193,103.557022],[11.19208,103.559959],[11.19363,103.562714],[11.19476,103.56871],[11.19292,103.574707],[11.19234,103.575996],[11.19049,103.579964],[11.19004,103.581207],[11.18869,103.585373],[11.18686,103.587471],[11.18619,103.589417],[11.18608,103.590813],[11.18591,103.594711],[11.18573,103.595322],[11.1852,103.595947],[11.1827,103.597633],[11.18065,103.598991],[11.1801,103.5998],[11.17972,103.600929],[11.17936,103.602127],[11.17823,103.604088],[11.1776,103.605919],[11.17711,103.607857],[11.17699,103.608253],[11.17684,103.608704],[11.17675,103.609093],[11.17663,103.609612],[11.176,103.611229],[11.17401,103.615463],[11.17314,103.619499],[11.17309,103.620338],[11.17312,103.621239],[11.17308,103.624657],[11.1727,103.631561],[11.17279,103.632179],[11.17314,103.632736],[11.17592,103.635521],[11.17691,103.636276],[11.17731,103.636833],[11.17748,103.637352],[11.1775,103.638008],[11.17767,103.639717],[11.17787,103.640297],[11.17843,103.640999],[11.17895,103.641747],[11.17928,103.642517],[11.17927,103.643646],[11.17883,103.645798],[11.17867,103.646828],[11.17881,103.648117],[11.17961,103.651459],[11.17982,103.652237],[11.18029,103.653122],[11.18186,103.654266],[11.1829,103.655678],[11.1831,103.657021],[11.18229,103.659958],[11.18197,103.661087],[11.18152,103.662033],[11.17997,103.663933],[11.17963,103.66465],[11.17872,103.666634],[11.17818,103.667557],[11.1777,103.668221],[11.17682,103.668671],[11.17575,103.669441],[11.17496,103.670227],[11.17445,103.671227],[11.17418,103.671707],[11.1741,103.673157],[11.17405,103.674454],[11.17397,103.67588],[11.17366,103.676682],[11.17308,103.677841],[11.17065,103.682823],[11.17009,103.686668],[11.16957,103.690979],[11.16915,103.692131],[11.16804,103.693398],[11.16752,103.694008],[11.16648,103.695183],[11.16421,103.697701],[11.15985,103.702187],[11.15614,103.711243],[11.15262,103.720367],[11.15229,103.72171],[11.15202,103.723969],[11.1517,103.726891],[11.15096,103.732788],[11.15073,103.733566],[11.15039,103.734428],[11.14969,103.735809],[11.1481,103.738739],[11.14768,103.74202],[11.14836,103.743347],[11.14942,103.744827],[11.15026,103.745934],[11.15069,103.74662],[11.15106,103.747192],[11.15114,103.747833],[11.15095,103.748703],[11.14987,103.750328],[11.14856,103.752373],[11.14835,103.753464],[11.14851,103.754333],[11.14922,103.756638],[11.14941,103.757294],[11.14952,103.757881],[11.14919,103.758911],[11.14651,103.76133],[11.1442,103.763733],[11.14196,103.766197],[11.13964,103.768623],[11.13886,103.769012],[11.1381,103.76931],[11.13718,103.769592],[11.13477,103.770317],[11.13238,103.771004],[11.13146,103.771141],[11.13038,103.771156],[11.12787,103.771088],[11.12668,103.77153],[11.12241,103.773743],[11.12171,103.773857],[11.12084,103.773911],[11.12001,103.773933],[11.11721,103.773972],[11.10998,103.775299],[11.10607,103.774773],[11.1045,103.775162],[11.10346,103.775337],[11.10286,103.775177],[11.1018,103.774887],[11.09952,103.775078],[11.09706,103.775284],[11.09649,103.775337],[11.09577,103.775627],[11.09525,103.776192],[11.0947,103.777184],[11.09453,103.779541],[11.09447,103.781898],[11.09466,103.783058],[11.09488,103.784233],[11.09502,103.78524],[11.09505,103.785767],[11.09496,103.786369],[11.09466,103.787041],[11.09433,103.787537],[11.09375,103.788277],[11.09328,103.789017],[11.09195,103.791183],[11.09117,103.792397],[11.09022,103.79364],[11.08845,103.796211],[11.08748,103.798477],[11.08641,103.7995],[11.08534,103.79982],[11.08406,103.799927],[11.08297,103.799973],[11.08174,103.799881],[11.07517,103.796448],[11.07028,103.795197],[11.06735,103.795021],[11.06615,103.794579],[11.06494,103.794243],[11.0645,103.794113],[11.06399,103.794029],[11.0629,103.793983],[11.06133,103.793953],[11.06056,103.793938],[11.06005,103.793953],[11.05928,103.794083],[11.05789,103.794296],[11.05707,103.794327],[11.05632,103.793892],[11.0545,103.79258],[11.05322,103.792236],[11.05209,103.792221],[11.05152,103.792267],[11.05095,103.79245],[11.04974,103.793556],[11.04763,103.795731],[11.04724,103.796448],[11.04712,103.797119],[11.04707,103.797707],[11.04714,103.798843],[11.04714,103.800903],[11.04725,103.802391],[11.04753,103.803543],[11.05113,103.81208],[11.05209,103.814003],[11.05402,103.816803],[11.05514,103.818604],[11.05573,103.820747],[11.05638,103.82383],[11.057,103.825287],[11.05763,103.826073],[11.06003,103.828537],[11.06042,103.83004],[11.06021,103.83284],[11.06045,103.833878],[11.06309,103.839684],[11.06362,103.840446],[11.07223,103.848389],[11.07265,103.849403],[11.07273,103.850739],[11.07205,103.852127],[11.07038,103.854652],[11.07001,103.856651],[11.07053,103.858231],[11.0738,103.861671],[11.07438,103.863029],[11.07604,103.867943],[11.08074,103.876663],[11.08276,103.883034],[11.08504,103.887573],[11.08747,103.891853],[11.09351,103.902863],[11.09626,103.907677],[11.09797,103.910271],[11.09986,103.912628],[11.10172,103.914497],[11.11719,103.928207],[11.12314,103.933548],[11.12609,103.937073],[11.12849,103.940979],[11.13351,103.950737],[11.13833,103.960007],[11.14351,103.970093],[11.14877,103.980263],[11.15045,103.983887],[11.15166,103.987389],[11.15335,103.990837],[11.15434,103.992569],[11.16036,104.000847],[11.1649,104.007309],[11.16648,104.00956],[11.17444,104.020821],[11.17617,104.023148],[11.17744,104.024361],[11.1804,104.026291],[11.18675,104.032623],[11.18853,104.034492],[11.18943,104.035606],[11.1903,104.037193],[11.19067,104.038139],[11.19143,104.040947],[11.19232,104.044868],[11.19301,104.049026],[11.19386,104.055923],[11.19406,104.057426],[11.19365,104.060654],[11.19418,104.071198],[11.19437,104.073151],[11.19465,104.074532],[11.19516,104.07576],[11.20094,104.086983],[11.20212,104.08889],[11.20234,104.089523],[11.20257,104.090561],[11.20284,104.091293],[11.20358,104.092796],[11.20381,104.093384],[11.20417,104.094589],[11.20428,104.095154],[11.20439,104.09597],[11.20459,104.096642],[11.20479,104.097198],[11.20496,104.097893],[11.20516,104.099487],[11.20535,104.100258],[11.20553,104.100502],[11.20604,104.10096],[11.20737,104.101891],[11.20792,104.102623],[11.20809,104.103104],[11.20937,104.108627],[11.21023,104.112587],[11.2122,104.117897],[11.21319,104.120369],[11.21763,104.127892],[11.22001,104.131653],[11.22482,104.137657],[11.2308,104.146797],[11.24009,104.161209],[11.24535,104.16938],[11.25656,104.18306],[11.26132,104.188797],[11.26612,104.195312],[11.26954,104.199753],[11.27281,104.205101],[11.27728,104.212517],[11.27887,104.215157],[11.28602,104.227188],[11.29414,104.241119],[11.30092,104.252647],[11.30841,104.265282],[11.31258,104.272278],[11.31552,104.278542],[11.31805,104.282516],[11.32065,104.286133],[11.32409,104.291763],[11.32748,104.297836],[11.33257,104.305969],[11.34071,104.319382],[11.34404,104.324768],[11.34898,104.329353],[11.35067,104.331482],[11.35595,104.340073],[11.35931,104.34671],[11.36522,104.355904],[11.36764,104.358238],[11.37237,104.362923],[11.37664,104.368263],[11.37729,104.369011],[11.38512,104.374298],[11.39029,104.38002],[11.39617,104.38681],[11.3989,104.392479],[11.4047,104.399544],[11.40971,104.409241],[11.41611,104.424797],[11.41866,104.42984],[11.42282,104.446877],[11.4267,104.457939],[11.43018,104.46505],[11.43874,104.476578],[11.44111,104.480171],[11.44412,104.485619],[11.44534,104.487007],[11.44653,104.488136],[11.4482,104.48912],[11.45309,104.491272],[11.45469,104.492531],[11.45604,104.495033],[11.4585,104.504662],[11.45999,104.51059],[11.46157,104.517471],[11.4626,104.521729],[11.46297,104.522919],[11.46348,104.523781],[11.46505,104.525787],[11.46582,104.527733],[11.46739,104.531898],[11.47216,104.544884],[11.47508,104.553177],[11.47558,104.566727],[11.47516,104.57859],[11.47593,104.584923],[11.47684,104.58889],[11.47796,104.591553],[11.4827,104.61026],[11.48373,104.615677],[11.48535,104.624268],[11.48672,104.630508],[11.48914,104.63916],[11.4909,104.647552],[11.49224,104.652893],[11.49312,104.657547],[11.49447,104.66188],[11.49498,104.663223],[11.49638,104.66687],[11.49774,104.670662],[11.49856,104.672638],[11.49964,104.676613],[11.50056,104.679749],[11.50305,104.686951],[11.50356,104.694168],[11.50428,104.699677],[11.50513,104.704674],[11.50695,104.712051],[11.50716,104.715637],[11.5071,104.724953],[11.50695,104.728851],[11.50735,104.733101],[11.50765,104.734657],[11.5088,104.738792],[11.51005,104.744072],[11.51144,104.750343],[11.51393,104.763412],[11.51486,104.767693],[11.51789,104.77317],[11.51962,104.776314],[11.52081,104.778954],[11.52391,104.790916],[11.52485,104.794319],[11.52508,104.794853],[11.52576,104.796127],[11.526,104.796539],[11.5275,104.799171],[11.52917,104.80204],[11.5295,104.802589],[11.52975,104.803032],[11.53017,104.803993],[11.53039,104.804741],[11.53051,104.805389],[11.53062,104.805977],[11.53119,104.809479],[11.53182,104.813492],[11.53254,104.81739],[11.53259,104.817734],[11.53285,104.819397],[11.53309,104.820824],[11.5333,104.822166],[11.53381,104.825127],[11.53402,104.826477],[11.53435,104.828453],[11.53438,104.828537],[11.53437,104.828773],[11.53431,104.829033],[11.5342,104.829201],[11.53414,104.829323],[11.53413,104.829643],[11.53463,104.830093],[11.53414,104.830704],[11.53351,104.831467],[11.53081,104.834793],[11.52835,104.837891],[11.52877,104.841797],[11.52904,104.844307],[11.52908,104.844551],[11.53072,104.855827],[11.53079,104.856331],[11.53114,104.858963],[11.53308,104.873177],[11.53473,104.885193],[11.53474,104.885353],[11.53458,104.885536],[11.53447,104.885757],[11.53425,104.885963],[11.53221,104.886429],[11.53208,104.886452],[11.52989,104.886871],[11.52962,104.886932],[11.52785,104.887291],[11.52576,104.887718],[11.52572,104.888298],[11.52556,104.889893],[11.52537,104.890633],[11.52427,104.894363],[11.52349,104.897171],[11.5231,104.898407],[11.52284,104.899269],[11.52256,104.9002],[11.52215,104.901703],[11.52156,104.903717],[11.52088,104.906128],[11.52042,104.907951],[11.5193,104.913322],[11.51897,104.915192],[11.51894,104.915604],[11.51896,104.916061],[11.51903,104.916496],[11.51917,104.916962],[11.51975,104.91864],[11.51983,104.918854],[11.52025,104.919617],[11.5207,104.920212],[11.52108,104.920509],[11.52147,104.920723],[11.52208,104.920898],[11.52358,104.920998],[11.52505,104.921097],[11.52677,104.921227],[11.527,104.92186],[11.52883,104.926086],[11.52992,104.928574],[11.5299,104.92897],[11.53005,104.929619],[11.5302,104.930206],[11.53026,104.930496],[11.53027,104.930717],[11.53014,104.930946],[11.5296,104.931168],[11.52902,104.931396],[11.52877,104.931587],[11.52823,104.931801],[11.52758,104.931999],[11.52638,104.932114],[11.5239,104.93235],[11.51604,104.935379],[11.51338,104.935677],[11.51252,104.935997],[11.50867,104.937866],[11.50674,104.938766],[11.50388,104.939621],[11.50249,104.940048],[11.49697,104.942436],[11.49289,104.94355],[11.49186,104.94355],[11.49092,104.943123],[11.48942,104.942436],[11.48809,104.941818],[11.48757,104.94165],[11.48726,104.941727],[11.48513,104.942841],[11.48492,104.942963],[11.48385,104.943527],[11.48288,104.944061],[11.48157,104.944771],[11.48138,104.944633],[11.48112,104.944733],[11.48108,104.945053],[11.47857,104.946381],[11.47776,104.946823],[11.47264,104.949509],[11.47149,104.950127],[11.46992,104.950981],[11.46587,104.953209],[11.46406,104.954208],[11.46098,104.955994],[11.46003,104.956543],[11.45616,104.958847],[11.45244,104.961067],[11.45039,104.962288],[11.44289,104.966873],[11.44102,104.968018],[11.43993,104.968681],[11.43116,104.973999],[11.42561,104.977943],[11.4193,104.985237],[11.40634,104.999748],[11.40146,105.004936],[11.40073,105.005623],[11.39999,105.005829],[11.39922,105.005791],[11.39655,105.005074],[11.39496,105.004761],[11.3919,105.00444],[11.38985,105.004044],[11.38363,105.001984],[11.37883,105.001343],[11.37475,105.001892],[11.37105,105.003014],[11.36419,105.000473],[11.35815,105.001381],[11.35153,105.004639],[11.34709,105.007607],[11.34363,105.010948],[11.34161,105.013443],[11.33983,105.016502],[11.33843,105.019676],[11.33641,105.022873],[11.33367,105.025948],[11.32995,105.028282]];
\ No newline at end of file
diff --git a/extlib/leaflet/debug/vector/vector-mobile.html b/extlib/leaflet/debug/vector/vector-mobile.html
deleted file mode 100644
index 519de0c6..00000000
--- a/extlib/leaflet/debug/vector/vector-mobile.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet debug page</title>

-

-	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />

-

-	<link rel="stylesheet" href="../../dist/leaflet.css" />

-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->

-	

-	<link rel="stylesheet" href="../css/mobile.css" />

-	

-	<script src="../leaflet-include.js"></script>

-</head>

-<body>

-	<div id="map"></div>

-

-	<script src="route.js"></script>

-	<script>

-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',

-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18});

-	

-		for (var i = 0, latlngs = [], len = route.length; i < len; i++) {

-			latlngs.push(new L.LatLng(route[i][0], route[i][1]));

-		}

-		var path = new L.Polyline(latlngs, {smoothFactor: 1});

-

-		var map = new L.Map('map', {layers: [cloudmade]});

-

-		map.fitBounds(new L.LatLngBounds(latlngs));

-		

-		map.addLayer(new L.Marker(latlngs[0]));

-		map.addLayer(new L.Marker(latlngs[latlngs.length - 1]));

-		

-		map.addLayer(path);

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/debug/vector/vector.html b/extlib/leaflet/debug/vector/vector.html
deleted file mode 100644
index 4886f3b4..00000000
--- a/extlib/leaflet/debug/vector/vector.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>

-<html>

-<head>

-	<title>Leaflet debug page</title>

-

-	<link rel="stylesheet" href="../../dist/leaflet.css" />

-	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->

-	

-	<link rel="stylesheet" href="../css/screen.css" />

-	

-	<script src="../leaflet-include.js"></script>

-</head>

-<body>

-	<div id="map" style="width: 800px; height: 600px; border: 1px solid #ccc"></div>

-

-	<script src="route.js"></script>

-	<script>

-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',

-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18});

-	

-		for (var i = 0, latlngs = [], len = route.length; i < len; i++) {

-			latlngs.push(new L.LatLng(route[i][0], route[i][1]));

-		}

-		var path = new L.Polyline(latlngs);

-

-		var map = new L.Map('map', {layers: [cloudmade]});

-

-		map.fitBounds(new L.LatLngBounds(latlngs));

-		

-		map.addLayer(new L.Marker(latlngs[0]));

-		map.addLayer(new L.Marker(latlngs[len - 1]));

-		

-		map.addLayer(path);

-		

-		path.bindPopup("Hello world");

-	</script>

-</body>

-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/dist/images/marker-shadow.png b/extlib/leaflet/dist/images/marker-shadow.png
deleted file mode 100644
index a64f6a67..00000000
--- a/extlib/leaflet/dist/images/marker-shadow.png
+++ /dev/null
diff --git a/extlib/leaflet/dist/images/marker.png b/extlib/leaflet/dist/images/marker.png
deleted file mode 100644
index bef032e6..00000000
--- a/extlib/leaflet/dist/images/marker.png
+++ /dev/null
diff --git a/extlib/leaflet/dist/images/popup-close.png b/extlib/leaflet/dist/images/popup-close.png
deleted file mode 100644
index c8faec5e..00000000
--- a/extlib/leaflet/dist/images/popup-close.png
+++ /dev/null
diff --git a/extlib/leaflet/dist/images/zoom-in.png b/extlib/leaflet/dist/images/zoom-in.png
deleted file mode 100644
index 9f473d64..00000000
--- a/extlib/leaflet/dist/images/zoom-in.png
+++ /dev/null
diff --git a/extlib/leaflet/dist/images/zoom-out.png b/extlib/leaflet/dist/images/zoom-out.png
deleted file mode 100644
index f0a5b5d6..00000000
--- a/extlib/leaflet/dist/images/zoom-out.png
+++ /dev/null
diff --git a/extlib/leaflet/dist/leaflet.css b/extlib/leaflet/dist/leaflet.css
deleted file mode 100644
index 4bc0b769..00000000
--- a/extlib/leaflet/dist/leaflet.css
+++ /dev/null
@@ -1,273 +0,0 @@
-/* required styles */

-

-.leaflet-map-pane,

-.leaflet-tile,

-.leaflet-marker-icon, 

-.leaflet-marker-shadow,

-.leaflet-tile-pane, 

-.leaflet-overlay-pane,

-.leaflet-shadow-pane,

-.leaflet-marker-pane,

-.leaflet-popup-pane,

-.leaflet-overlay-pane svg,

-.leaflet-zoom-box,

-.leaflet-image-layer { /* TODO optimize classes */ 

-	position: absolute;

-	}

-.leaflet-container {

-	overflow: hidden;

-	}

-.leaflet-tile-pane {

-	-webkit-transform: translate3d(0,0,0);

-	}

-.leaflet-tile, 

-.leaflet-marker-icon, 

-.leaflet-marker-shadow {

-	-moz-user-select: none;

-	-webkit-user-select: none;

-	user-select: none;

-	}

-.leaflet-marker-icon, 

-.leaflet-marker-shadow {

-	display: block;

-	}

-.leaflet-clickable {

-	cursor: pointer;

-	}

-.leaflet-container img {

-	max-width: auto;

-	}

-

-.leaflet-tile-pane { z-index: 2; }

-.leaflet-overlay-pane { z-index: 3; }

-.leaflet-shadow-pane { z-index: 4; }

-.leaflet-marker-pane { z-index: 5; }

-.leaflet-popup-pane { z-index: 6; }

-

-.leaflet-zoom-box {

-	width: 0;

-	height: 0;

-	}

-

-.leaflet-tile {

-	visibility: hidden;

-	}

-.leaflet-tile-loaded {

-	visibility: inherit;

-	}

-

-a.leaflet-active {

-	outline: 2px solid orange;

-	}

-

-

-/* Leaflet controls */

-

-.leaflet-control {

-	position: relative;

-	z-index: 7;

-	}

-.leaflet-top,

-.leaflet-bottom {

-	position: absolute;

-	}

-.leaflet-top {

-	top: 0;

-	}

-.leaflet-right {

-	right: 0;

-	}

-.leaflet-bottom {

-	bottom: 0;

-	}	

-.leaflet-left {

-	left: 0;

-	}

-.leaflet-control {

-	float: left;

-	clear: both;

-	}

-.leaflet-right .leaflet-control {

-	float: right;

-	}

-.leaflet-top .leaflet-control {

-	margin-top: 10px;

-	}

-.leaflet-bottom .leaflet-control {

-	margin-bottom: 10px;

-	}

-.leaflet-left .leaflet-control {

-	margin-left: 10px;

-	}

-.leaflet-right .leaflet-control {

-	margin-right: 10px;

-	}

-

-.leaflet-control-zoom {

-	padding: 5px;

-	background: rgba(0, 0, 0, 0.25);

-	

-	-moz-border-radius: 7px;

-	-webkit-border-radius: 7px;

-	border-radius: 7px;

-	}

-.leaflet-control-zoom a {

-	display: block;

-	width: 19px;

-	height: 19px;

-	background-position: 50% 50%;

-	background-repeat: no-repeat;

-	background-color: rgba(255, 255, 255, 0.75);

-	

-	-moz-border-radius: 4px;

-	-webkit-border-radius: 4px;

-	border-radius: 4px;

-	}

-.leaflet-control-zoom a:hover {

-	background-color: #fff;

-	}

-.leaflet-big-buttons .leaflet-control-zoom a {

-	width: 27px;

-	height: 27px;

-	}

-.leaflet-control-zoom-in {

-	background-image: url(images/zoom-in.png);

-	margin-bottom: 5px;

-	}

-.leaflet-control-zoom-out {

-	background-image: url(images/zoom-out.png);

-	}

-	

-.leaflet-container .leaflet-control-attribution {

-	margin: 0;

-	padding: 0 5px;

-	

-	font: 11px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;

-	color: #333;

-	

-	background-color: rgba(255, 255, 255, 0.7);

-            

-	-moz-box-shadow: 0 0 7px #ccc;

-	-webkit-box-shadow: 0 0 7px #ccc;

-	box-shadow: 0 0 7px #ccc;

-	}

-

-

-/* Fade animations */

-

-.leaflet-fade-anim .leaflet-tile {

-	opacity: 0;

-	

-	-webkit-transition: opacity 0.2s linear;

-	-moz-transition: opacity 0.2s linear;

-	-o-transition: opacity 0.2s linear;

-	transition: opacity 0.2s linear;

-	}

-.leaflet-fade-anim .leaflet-tile-loaded {

-	opacity: 1;

-	}

-

-.leaflet-fade-anim .leaflet-popup {

-	opacity: 0;

-

-	-webkit-transition: opacity 0.2s linear;

-	-moz-transition: opacity 0.2s linear;

-	-o-transition: opacity 0.2s linear;

-	transition: opacity 0.2s linear;

-	}

-.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {

-	opacity: 1;

-	}

-

-.leaflet-zoom-anim .leaflet-tile {

-	-webkit-transition: none;

-	-moz-transition: none;

-	-o-transition: none;

-	transition: none;

-	}

-

-.leaflet-zoom-anim .leaflet-objects-pane {

-	visibility: hidden;

-	}

-

-

-/* Popup layout */

-

-.leaflet-popup {

-	position: absolute;

-	text-align: center;

-	-webkit-transform: translate3d(0,0,0);

-	}

-.leaflet-popup-content-wrapper {

-	padding: 1px;

-	text-align: left;

-	}

-.leaflet-popup-content {

-	margin: 19px;

-	}

-.leaflet-popup-tip-container {

-	margin: 0 auto;

-	width: 40px;

-	height: 16px;

-	position: relative;

-	overflow: hidden;

-	}

-.leaflet-popup-tip {

-	width: 15px;

-	height: 15px;

-	padding: 1px;

-	

-	margin: -8px auto 0;

-	

-	-moz-transform: rotate(45deg);

-	-webkit-transform: rotate(45deg);

-	-ms-transform: rotate(45deg);

-	-o-transform: rotate(45deg);

-	transform: rotate(45deg);

-	}

-.leaflet-popup-close-button {

-	position: absolute;

-	top: 9px;

-	right: 9px;

-	

-	width: 10px;

-	height: 10px;

-	

-	overflow: hidden;

-	}

-.leaflet-popup-content p {

-	margin: 18px 0;

-	}

-

-

-/* Visual appearance */

-

-.leaflet-container {

-	background: #ddd;

-	}

-.leaflet-container a {

-	color: #0078A8;

-	}

-.leaflet-zoom-box {

-	border: 2px dotted #05f;

-	background: white;

-	opacity: 0.5;

-	}

-.leaflet-popup-content-wrapper, .leaflet-popup-tip {

-	background: white;

-	

-	box-shadow: 0 1px 10px #888;

-	-moz-box-shadow: 0 1px 10px #888;

-	 -webkit-box-shadow: 0 1px 14px #999;

-	}

-.leaflet-popup-content-wrapper {

-	-moz-border-radius: 20px; 

-	-webkit-border-radius: 20px;

-	border-radius: 20px;

-	}

-.leaflet-popup-content {

-	font: 12px/1.4 "Helvetica Neue", Arial, Helvetica, sans-serif;

-	}

-.leaflet-popup-close-button {

-	background: white url(images/popup-close.png);

-	}
\ No newline at end of file
diff --git a/extlib/leaflet/dist/leaflet.ie.css b/extlib/leaflet/dist/leaflet.ie.css
deleted file mode 100644
index 141a16f5..00000000
--- a/extlib/leaflet/dist/leaflet.ie.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.leaflet-tile {

-	filter: inherit;

-	}

-

-.leaflet-vml-shape {

-	width: 1px;

-	height: 1px;

-	}

-.lvml {

-	behavior: url(#default#VML); 

-	display: inline-block; 

-	position: absolute;

-	}

-	

-.leaflet-control {

-	display: inline;

-	}

-

-.leaflet-popup-tip {

-	width: 21px;

-	_width: 27px;

-	margin: 0 auto;

-	_margin-top: -3px;

-	

-	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);

-	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";

-	}

-.leaflet-popup-tip-container {

-	margin-top: -1px;

-	}

-.leaflet-popup-content-wrapper, .leaflet-popup-tip {

-	border: 1px solid #bbb;

-	}

-

-.leaflet-control-zoom {

-	filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#3F000000',EndColorStr='#3F000000');

-	}

-.leaflet-control-zoom a {

-	background-color: #eee;

-	}

-.leaflet-control-zoom a:hover {

-	background-color: #fff;

-	}

-.leaflet-control-attribution {

-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2FFFFFF,endColorstr=#B2FFFFFF);

-	}
\ No newline at end of file
diff --git a/extlib/leaflet/dist/leaflet.js b/extlib/leaflet/dist/leaflet.js
deleted file mode 100644
index d4ed26a4..00000000
--- a/extlib/leaflet/dist/leaflet.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- Copyright (c) 2010-2011, CloudMade, Vladimir Agafonkin
- Leaflet is a BSD-licensed JavaScript library for map display and interaction.
- See http://cloudmade.github.com/Leaflet/ for more information.
-*/
-(function(a){var b={VERSION:"0.2",ROOT_URL:function(){for(var a=document.getElementsByTagName("script"),b=/^(.*\/)leaflet-?([\w-]*)\.js.*$/,e=0,f=a.length;e<f;e++){var g=a[e].src;if(g=g&&g.match(b)){if(g[2]=="include")break;return g[1]}}return"../../dist/"}(),noConflict:function(){a.L=this._originalL;return this},_originalL:a.L};window.L=b})(this);L.Util={extend:function(a){for(var b=Array.prototype.slice.call(arguments,1),c=0,d=b.length,e;c<d;c++){e=b[c]||{};for(var f in e)e.hasOwnProperty(f)&&(a[f]=e[f])}return a},bind:function(a,b){return function(){return a.apply(b,arguments)}},stamp:function(){var a=0;return function(b){b._leaflet_id=b._leaflet_id||++a;return b._leaflet_id}}(),requestAnimFrame:function(){function a(a){window.setTimeout(a,1E3/60)}var b=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||
-window.oRequestAnimationFrame||window.msRequestAnimationFrame||a;return function(c,d,e){c=d?L.Util.bind(c,d):d;e&&b===a?c():b(c)}}(),limitExecByInterval:function(a,b,c){function d(){e=!1;f&&(g.callee.apply(c,g),f=!1)}var e,f,g;return function(){g=arguments;e?f=!0:(e=!0,setTimeout(d,b),a.apply(c,g))}},falseFn:function(){return!1},formatNum:function(a,b){var c=Math.pow(10,b||5);return Math.round(a*c)/c},setOptions:function(a,b){a.options=L.Util.extend({},a.options,b)},getParamString:function(a){var b=
-[],c;for(c in a)a.hasOwnProperty(c)&&b.push(c+"="+a[c]);return"?"+b.join("&")}};L.Class=function(){};
-L.Class.extend=function(a){var b=function(){!L.Class._prototyping&&this.initialize&&this.initialize.apply(this,arguments)};L.Class._prototyping=!0;var c=new this;L.Class._prototyping=!1;c.constructor=b;b.prototype=c;c.superclass=this.prototype;a.statics&&(L.Util.extend(b,a.statics),delete a.statics);a.includes&&(L.Util.extend.apply(null,[c].concat(a.includes)),delete a.includes);if(a.options&&c.options)a.options=L.Util.extend({},c.options,a.options);L.Util.extend(c,a);b.extend=arguments.callee;b.include=
-function(a){L.Util.extend(this.prototype,a)};for(var d in this)this.hasOwnProperty(d)&&d!="prototype"&&(b[d]=this[d]);return b};L.Mixin={};
-L.Mixin.Events={addEventListener:function(a,b,c){var d=this._leaflet_events=this._leaflet_events||{};d[a]=d[a]||[];d[a].push({action:b,context:c});return this},hasEventListeners:function(a){return"_leaflet_events"in this&&a in this._leaflet_events&&this._leaflet_events[a].length>0},removeEventListener:function(a,b,c){if(!this.hasEventListeners(a))return this;for(var d=0,e=this._leaflet_events,f=e[a].length;d<f;d++)if(e[a][d].action===b&&(!c||e[a][d].context===c)){e[a].splice(d,1);break}return this},fireEvent:function(a,
-b){if(this.hasEventListeners(a)){for(var c=L.Util.extend({type:a,target:this},b),d=this._leaflet_events[a].slice(),e=0,f=d.length;e<f;e++)d[e].action.call(d[e].context||this,c);return this}}};L.Mixin.Events.on=L.Mixin.Events.addEventListener;L.Mixin.Events.off=L.Mixin.Events.removeEventListener;L.Mixin.Events.fire=L.Mixin.Events.fireEvent;(function(){var a=navigator.userAgent.toLowerCase(),b=!!window.ActiveXObject,c=a.indexOf("webkit")!=-1,d=a.indexOf("mobi")!=-1,e=a.indexOf("android")!=-1,f=window.opera;L.Browser={ie:b,ie6:b&&!window.XMLHttpRequest,webkit:c,webkit3d:c&&"WebKitCSSMatrix"in window&&"m11"in new WebKitCSSMatrix,mobileWebkit:c&&(d||e),mobileOpera:d&&f,gecko:a.indexOf("gecko")!=-1,android:e};L.Browser.touch=L.Browser.mobileWebkit||L.Browser.mobileOpera})();L.Point=function(a,b,c){this.x=c?Math.round(a):a;this.y=c?Math.round(b):b};
-L.Point.prototype={add:function(a){return this.clone()._add(a)},_add:function(a){this.x+=a.x;this.y+=a.y;return this},subtract:function(a){return this.clone()._subtract(a)},_subtract:function(a){this.x-=a.x;this.y-=a.y;return this},divideBy:function(a,b){return new L.Point(this.x/a,this.y/a,b)},multiplyBy:function(a){return new L.Point(this.x*a,this.y*a)},distanceTo:function(a){var b=a.x-this.x,a=a.y-this.y;return Math.sqrt(b*b+a*a)},round:function(){return this.clone()._round()},_round:function(){this.x=
-Math.round(this.x);this.y=Math.round(this.y);return this},clone:function(){return new L.Point(this.x,this.y)},toString:function(){return"Point("+L.Util.formatNum(this.x)+", "+L.Util.formatNum(this.y)+")"}};L.Bounds=L.Class.extend({initialize:function(a,b){if(a)for(var c=a instanceof Array?a:[a,b],d=0,e=c.length;d<e;d++)this.extend(c[d])},extend:function(a){!this.min&&!this.max?(this.min=new L.Point(a.x,a.y),this.max=new L.Point(a.x,a.y)):(this.min.x=Math.min(a.x,this.min.x),this.max.x=Math.max(a.x,this.max.x),this.min.y=Math.min(a.y,this.min.y),this.max.y=Math.max(a.y,this.max.y))},getCenter:function(a){return new L.Point((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,a)},contains:function(a){var b;
-if(a instanceof L.Bounds)b=a.min,a=a.max;return b.x>=this.min.x&&a.x<=this.max.x&&b.y>=this.min.y&&a.y<=this.max.y}});L.Transformation=L.Class.extend({initialize:function(a,b,c,d){this._a=a;this._b=b;this._c=c;this._d=d},transform:function(a,b){return this._transform(a.clone(),b)},_transform:function(a,b){b=b||1;a.x=b*(this._a*a.x+this._b);a.y=b*(this._c*a.y+this._d);return a},untransform:function(a,b){b=b||1;return new L.Point((a.x/b-this._b)/this._a,(a.y/b-this._d)/this._c)}});L.LineUtil={simplify:function(a,b){if(!b)return a.slice();a=this.reducePoints(a,b);return a=this.simplifyDP(a,b)},pointToSegmentDistance:function(a,b,c){return Math.sqrt(this._sqPointToSegmentDist(a,b,c))},simplifyDP:function(a,b){for(var c=0,d=0,e=b*b,f=1,g=a.length,h;f<g-1;f++)h=this._sqPointToSegmentDist(a[f],a[0],a[g-1]),h>c&&(d=f,c=h);return c>=e?(c=a.slice(0,d),d=a.slice(d),g=this.simplifyDP(c,b).slice(0,g-2),d=this.simplifyDP(d,b),g.concat(d)):[a[0],a[g-1]]},reducePoints:function(a,b){for(var c=
-[a[0]],d=b*b,e=1,f=0,g=a.length;e<g;e++)this._sqDist(a[e],a[f])<d||(c.push(a[e]),f=e);f<g-1&&c.push(a[g-1]);return c},clipSegment:function(a,b,c,d){var d=d?this._lastCode:this._getBitCode(a,c),e=this._getBitCode(b,c);for(this._lastCode=e;;)if(d|e)if(d&e)return!1;else{var f=d||e,g=this._getEdgeIntersection(a,b,f,c),h=this._getBitCode(g,c);f==d?(a=g,d=h):(b=g,e=h)}else return[a,b]},_getEdgeIntersection:function(a,b,c,d){var e=b.x-a.x,b=b.y-a.y,f=d.min,d=d.max;if(c&8)return new L.Point(a.x+e*(d.y-a.y)/
-b,d.y);else if(c&4)return new L.Point(a.x+e*(f.y-a.y)/b,f.y);else if(c&2)return new L.Point(d.x,a.y+b*(d.x-a.x)/e);else if(c&1)return new L.Point(f.x,a.y+b*(f.x-a.x)/e)},_getBitCode:function(a,b){var c=0;a.x<b.min.x?c|=1:a.x>b.max.x&&(c|=2);a.y<b.min.y?c|=4:a.y>b.max.y&&(c|=8);return c},_sqDist:function(a,b){var c=b.x-a.x,d=b.y-a.y;return c*c+d*d},_sqPointToSegmentDist:function(a,b,c){var d=c.x-b.x,e=c.y-b.y;if(!d&&!e)return this._sqDist(a,b);var f=((a.x-b.x)*d+(a.y-b.y)*e)/this._sqDist(b,c);if(f<
-0)return this._sqDist(a,b);if(f>1)return this._sqDist(a,c);b=new L.Point(b.x+d*f,b.y+e*f);return this._sqDist(a,b)}};L.PolyUtil={};L.PolyUtil.clipPolygon=function(a,b){var c,d=[1,4,2,8],e,f,g,h,j,k,l=L.LineUtil;e=0;for(j=a.length;e<j;e++)a[e]._code=l._getBitCode(a[e],b);for(g=0;g<4;g++){k=d[g];c=[];e=0;j=a.length;for(f=j-1;e<j;f=e++)if(h=a[e],f=a[f],h._code&k){if(!(f._code&k))f=l._getEdgeIntersection(f,h,k,b),f._code=l._getBitCode(f,b),c.push(f)}else{if(f._code&k)f=l._getEdgeIntersection(f,h,k,b),f._code=l._getBitCode(f,b),c.push(f);c.push(h)}a=c}return a};L.DomEvent={addListener:function(a,b,c,d){function e(b){return c.call(d||a,b||L.DomEvent._getEvent())}var f=L.Util.stamp(c);if(L.Browser.touch&&b=="dblclick"&&this.addDoubleTapListener)this.addDoubleTapListener(a,e,f);else if("addEventListener"in a)if(b=="mousewheel")a.addEventListener("DOMMouseScroll",e,!1),a.addEventListener(b,e,!1);else if(b=="mouseenter"||b=="mouseleave"){var g=e,e=function(b){if(L.DomEvent._checkMouse(a,b))return g(b)};a.addEventListener(b=="mouseenter"?"mouseover":"mouseout",
-e,!1)}else a.addEventListener(b,e,!1);else"attachEvent"in a&&a.attachEvent("on"+b,e);a["_leaflet_"+b+f]=e},removeListener:function(a,b,c){var c=L.Util.stamp(c),d="_leaflet_"+b+c;handler=a[d];L.Browser.mobileWebkit&&b=="dblclick"&&this.removeDoubleTapListener?this.removeDoubleTapListener(a,c):"removeEventListener"in a?b=="mousewheel"?(a.removeEventListener("DOMMouseScroll",handler,!1),a.removeEventListener(b,handler,!1)):b=="mouseenter"||b=="mouseleave"?a.removeEventListener(b=="mouseenter"?"mouseover":
-"mouseout",handler,!1):a.removeEventListener(b,handler,!1):"detachEvent"in a&&a.detachEvent("on"+b,handler);a[d]=null},_checkMouse:function(a,b){var c=b.relatedTarget;if(!c)return!0;try{for(;c&&c!=a;)c=c.parentNode}catch(d){return!1}return c!=a},_getEvent:function(){var a=window.event;if(!a)for(var b=arguments.callee.caller;b;){if((a=b.arguments[0])&&Event==a.constructor)break;b=b.caller}return a},stopPropagation:function(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},disableClickPropagation:function(a){L.DomEvent.addListener(a,
-"mousedown",L.DomEvent.stopPropagation);L.DomEvent.addListener(a,"click",L.DomEvent.stopPropagation);L.DomEvent.addListener(a,"dblclick",L.DomEvent.stopPropagation)},preventDefault:function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},stop:function(a){L.DomEvent.preventDefault(a);L.DomEvent.stopPropagation(a)},getMousePosition:function(a,b){var c=new L.Point(a.pageX?a.pageX:a.clientX+document.body.scrollLeft+document.documentElement.scrollLeft,a.pageY?a.pageY:a.clientY+document.body.scrollTop+
-document.documentElement.scrollTop);return b?c.subtract(L.DomUtil.getCumulativeOffset(b)):c},getWheelDelta:function(a){var b=0;a.wheelDelta&&(b=a.wheelDelta/120);a.detail&&(b=-a.detail/3);return b}};L.Util.extend(L.DomEvent,{addDoubleTapListener:function(a,b,c){function d(a){if(a.touches.length==1){var b=Date.now(),c=b-(f||b);j=a.touches[0];g=c>0&&c<=h;f=b}}function e(){if(g)j.type="dblclick",b(j),f=null}var f,g=!1,h=250,j;a["_leaflet_touchstart"+c]=d;a["_leaflet_touchend"+c]=e;a.addEventListener("touchstart",d,!1);a.addEventListener("touchend",e,!1)},removeDoubleTapListener:function(a,b){a.removeEventListener(a,a["_leaflet_touchstart"+b],!1);a.removeEventListener(a,a["_leaflet_touchend"+b],
-!1)}});L.DomUtil={get:function(a){return typeof a=="string"?document.getElementById(a):a},getStyle:function(a,b){var c=a.style[b];!c&&a.currentStyle&&(c=a.currentStyle[b]);if(!c||c=="auto")c=(c=document.defaultView.getComputedStyle(a,null))?c[b]:null;return c=="auto"?null:c},getCumulativeOffset:function(a){var b=0,c=0;do b+=a.offsetTop||0,c+=a.offsetLeft||0,a=a.offsetParent;while(a);return new L.Point(c,b)},create:function(a,b,c){a=document.createElement(a);a.className=b;c&&c.appendChild(a);return a},disableTextSelection:function(){document.selection&&
-document.selection.empty&&document.selection.empty();if(!this._onselectstart)this._onselectstart=document.onselectstart,document.onselectstart=L.Util.falseFn},enableTextSelection:function(){document.onselectstart=this._onselectstart;this._onselectstart=null},CLASS_RE:/(\\s|^)'+cls+'(\\s|$)/,hasClass:function(a,b){return a.className.length>0&&RegExp("(^|\\s)"+b+"(\\s|$)").test(a.className)},addClass:function(a,b){L.DomUtil.hasClass(a,b)||(a.className+=(a.className?" ":"")+b)},setOpacity:function(a,
-b){L.Browser.ie?a.style.filter="alpha(opacity="+Math.round(b*100)+")":a.style.opacity=b},testProp:function(a){for(var b=document.documentElement.style,c=0;c<a.length;c++)if(a[c]in b)return a[c];return!1},getTranslateString:function(a){return L.DomUtil.TRANSLATE_OPEN+a.x+"px,"+a.y+"px"+L.DomUtil.TRANSLATE_CLOSE},getScaleString:function(a,b){return L.DomUtil.getTranslateString(b)+" scale("+a+") "+L.DomUtil.getTranslateString(b.multiplyBy(-1))},setPosition:function(a,b){a._leaflet_pos=b;L.Browser.webkit?
-a.style[L.DomUtil.TRANSFORM]=L.DomUtil.getTranslateString(b):(a.style.left=b.x+"px",a.style.top=b.y+"px")},getPosition:function(a){return a._leaflet_pos}};
-L.Util.extend(L.DomUtil,{TRANSITION:L.DomUtil.testProp(["transition","webkitTransition","OTransition","MozTransition","msTransition"]),TRANSFORM:L.DomUtil.testProp(["transformProperty","WebkitTransform","OTransform","MozTransform","msTransform"]),TRANSLATE_OPEN:"translate"+(L.Browser.webkit3d?"3d(":"("),TRANSLATE_CLOSE:L.Browser.webkit3d?",0)":")"});L.Draggable=L.Class.extend({includes:L.Mixin.Events,statics:{START:L.Browser.touch?"touchstart":"mousedown",END:L.Browser.touch?"touchend":"mouseup",MOVE:L.Browser.touch?"touchmove":"mousemove",TAP_TOLERANCE:15},initialize:function(a,b){this._element=a;this._dragStartTarget=b||a},enable:function(){if(!this._enabled)L.DomEvent.addListener(this._dragStartTarget,L.Draggable.START,this._onDown,this),this._enabled=!0},disable:function(){if(this._enabled)L.DomEvent.removeListener(this._dragStartTarget,
-L.Draggable.START,this._onDown),this._enabled=!1},_onDown:function(a){if(!(a.shiftKey||a.which!=1&&a.button!=1&&!a.touches)&&!(a.touches&&a.touches.length>1)){var b=a.touches&&a.touches.length==1?a.touches[0]:a;L.DomEvent.preventDefault(a);L.Browser.mobileWebkit&&(b.target.className+=" leaflet-active");this._moved=!1;L.DomUtil.disableTextSelection();this._setMovingCursor();this._startPos=this._newPos=L.DomUtil.getPosition(this._element);this._startPoint=new L.Point(b.clientX,b.clientY);L.DomEvent.addListener(document,
-L.Draggable.MOVE,this._onMove,this);L.DomEvent.addListener(document,L.Draggable.END,this._onUp,this)}},_onMove:function(a){if(!(a.touches&&a.touches.length>1)){L.DomEvent.preventDefault(a);a=a.touches&&a.touches.length==1?a.touches[0]:a;if(!this._moved)this.fire("dragstart"),this._moved=!0;this._newPos=this._startPos.add(new L.Point(a.clientX,a.clientY)).subtract(this._startPoint);L.Util.requestAnimFrame(this._updatePosition,this,!0);this.fire("drag")}},_updatePosition:function(){L.DomUtil.setPosition(this._element,
-this._newPos)},_onUp:function(a){if(a.changedTouches){var a=a.changedTouches[0],b=a.target,c=this._newPos&&this._newPos.distanceTo(this._startPos)||0;b.className=b.className.replace(" leaflet-active","");c<L.Draggable.TAP_TOLERANCE&&this._simulateEvent("click",a)}L.DomUtil.enableTextSelection();this._restoreCursor();L.DomEvent.removeListener(document,L.Draggable.MOVE,this._onMove);L.DomEvent.removeListener(document,L.Draggable.END,this._onUp);this._moved&&this.fire("dragend")},_removeActiveClass:function(){},
-_setMovingCursor:function(){this._bodyCursor=document.body.style.cursor;document.body.style.cursor="move"},_restoreCursor:function(){document.body.style.cursor=this._bodyCursor},_simulateEvent:function(a,b){var c=document.createEvent("MouseEvent");c.initMouseEvent(a,!0,!0,window,1,b.screenX,b.screenY,b.clientX,b.clientY,!1,!1,!1,!1,0,null);b.target.dispatchEvent(c)}});L.Transition=L.Class.extend({includes:L.Mixin.Events,statics:{CUSTOM_PROPS_SETTERS:{position:L.DomUtil.setPosition},implemented:function(){return L.Transition.NATIVE||L.Transition.TIMER}},options:{easing:"ease",duration:0.5},_setProperty:function(a,b){var c=L.Transition.CUSTOM_PROPS_SETTERS;if(a in c)c[a](this._el,b);else this._el.style[a]=b}});L.Transition=L.Transition.extend({statics:function(){var a=L.DomUtil.TRANSITION;return{NATIVE:!!a,TRANSITION:a,PROPERTY:a+"Property",DURATION:a+"Duration",EASING:a+"TimingFunction",END:a=="webkitTransition"||a=="OTransition"?a+"End":"transitionend",CUSTOM_PROPS_PROPERTIES:{position:L.Browser.webkit?L.DomUtil.TRANSFORM:"top, left"}}}(),options:{fakeStepInterval:100},initialize:function(a,b){this._el=a;L.Util.setOptions(this,b);L.DomEvent.addListener(a,L.Transition.END,this._onTransitionEnd,this);this._onFakeStep=
-L.Util.bind(this._onFakeStep,this)},run:function(a){var b,c=[],d=L.Transition.CUSTOM_PROPS_PROPERTIES;for(b in a)a.hasOwnProperty(b)&&(b=d[b]?d[b]:b,b=b.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()}),c.push(b));this._el.style[L.Transition.DURATION]=this.options.duration+"s";this._el.style[L.Transition.EASING]=this.options.easing;this._el.style[L.Transition.PROPERTY]=c.join(", ");for(b in a)a.hasOwnProperty(b)&&this._setProperty(b,a[b]);this._inProgress=!0;this.fire("start");L.Transition.NATIVE?
-this._timer=setInterval(this._onFakeStep,this.options.fakeStepInterval):this._onTransitionEnd()},_onFakeStep:function(){this.fire("step")},_onTransitionEnd:function(){if(this._inProgress)this._inProgress=!1,clearInterval(this._timer),this._el.style[L.Transition.PROPERTY]="none",this.fire("step"),this.fire("end")}});L.Transition=L.Transition.NATIVE?L.Transition:L.Transition.extend({statics:{getTime:Date.now||function(){return+new Date},TIMER:!0,EASINGS:{ease:[0.25,0.1,0.25,1],linear:[0,0,1,1],"ease-in":[0.42,0,1,1],"ease-out":[0,0,0.58,1],"ease-in-out":[0.42,0,0.58,1]},CUSTOM_PROPS_GETTERS:{position:L.DomUtil.getPosition},UNIT_RE:/^[\d\.]+(\D*)$/},options:{fps:50},initialize:function(a,b){this._el=a;L.Util.extend(this.options,b);var c=L.Transition.EASINGS[this.options.easing]||L.Transition.EASINGS.ease;this._p1=
-new L.Point(0,0);this._p2=new L.Point(c[0],c[1]);this._p3=new L.Point(c[2],c[3]);this._p4=new L.Point(1,1);this._step=L.Util.bind(this._step,this);this._interval=Math.round(1E3/this.options.fps)},run:function(a){this._props={};var b=L.Transition.CUSTOM_PROPS_GETTERS,c=L.Transition.UNIT_RE;this.fire("start");for(var d in a)if(a.hasOwnProperty(d)){var e={};if(d in b)e.from=b[d](this._el);else{var f=this._el.style[d].match(c);e.from=parseFloat(f[0]);e.unit=f[1]}e.to=a[d];this._props[d]=e}clearInterval(this._timer);
-this._timer=setInterval(this._step,this._interval);this._startTime=L.Transition.getTime()},_step:function(){var a=L.Transition.getTime()-this._startTime,b=this.options.duration*1E3;a<b?this._runFrame(this._cubicBezier(a/b)):(this._runFrame(1),this._complete())},_runFrame:function(a){var b=L.Transition.CUSTOM_PROPS_SETTERS,c,d;for(c in this._props)this._props.hasOwnProperty(c)&&(d=this._props[c],c in b?(d=d.to.subtract(d.from).multiplyBy(a).add(d.from),b[c](this._el,d)):this._el.style[c]=(d.to-d.from)*
-a+d.from+d.unit);this.fire("step")},_complete:function(){clearInterval(this._timer);this.fire("end")},_cubicBezier:function(a){var b=3*Math.pow(1-a,2)*a,c=3*(1-a)*Math.pow(a,2),d=Math.pow(a,3),a=this._p1.multiplyBy(Math.pow(1-a,3)),b=this._p2.multiplyBy(b),c=this._p3.multiplyBy(c),d=this._p4.multiplyBy(d);return a.add(b).add(c).add(d).y}});L.LatLng=function(a,b,c){c!==!0&&(a=Math.max(Math.min(a,90),-90),b=(b+180)%360+(b<-180?180:-180));this.lat=a;this.lng=b};L.Util.extend(L.LatLng,{DEG_TO_RAD:Math.PI/180,RAD_TO_DEG:180/Math.PI,MAX_MARGIN:1.0E-9});L.LatLng.prototype={equals:function(a){if(!(a instanceof L.LatLng))return!1;return Math.max(Math.abs(this.lat-a.lat),Math.abs(this.lng-a.lng))<=L.LatLng.MAX_MARGIN},toString:function(){return"LatLng("+L.Util.formatNum(this.lat)+", "+L.Util.formatNum(this.lng)+")"}};L.LatLngBounds=L.Class.extend({initialize:function(a,b){if(a)for(var c=a instanceof Array?a:[a,b],d=0,e=c.length;d<e;d++)this.extend(c[d])},extend:function(a){!this._southWest&&!this._northEast?(this._southWest=new L.LatLng(a.lat,a.lng),this._northEast=new L.LatLng(a.lat,a.lng)):(this._southWest.lat=Math.min(a.lat,this._southWest.lat),this._southWest.lng=Math.min(a.lng,this._southWest.lng),this._northEast.lat=Math.max(a.lat,this._northEast.lat),this._northEast.lng=Math.max(a.lng,this._northEast.lng))},
-getCenter:function(){return new L.LatLng((this._southWest.lat+this._northEast.lat)/2,(this._southWest.lng+this._northEast.lng)/2)},getSouthWest:function(){return this._southWest},getNorthEast:function(){return this._northEast},getNorthWest:function(){return new L.LatLng(this._northEast.lat,this._southWest.lng)},getSouthEast:function(){return new L.LatLng(this._southWest.lat,this._northEast.lng)},contains:function(a){var b=this._southWest,c=this._northEast,d;a instanceof L.LatLngBounds?(d=a.getSouthWest(),
-a=a.getNorthEast()):d=a;return d.lat>=b.lat&&a.lat<=c.lat&&d.lng>=b.lng&&a.lng<=c.lng}});L.Projection={};L.Projection.SphericalMercator={MAX_LATITUDE:85.0511287798,project:function(a){var b=L.LatLng.DEG_TO_RAD,c=this.MAX_LATITUDE,d=a.lng*b,a=Math.max(Math.min(c,a.lat),-c)*b,a=Math.log(Math.tan(Math.PI/4+a/2));return new L.Point(d,a)},unproject:function(a,b){var c=L.LatLng.RAD_TO_DEG;return new L.LatLng((2*Math.atan(Math.exp(a.y))-Math.PI/2)*c,a.x*c,b)}};L.Projection.LonLat={project:function(a){return new L.Point(a.lng,a.lat)},unproject:function(a,b){return new L.LatLng(a.y,a.x,b)}};L.Projection.Mercator={MAX_LATITUDE:85.0840591556,R_MINOR:6356752.3142,R_MAJOR:6378137,project:function(a){var b=L.LatLng.DEG_TO_RAD,c=this.MAX_LATITUDE,d=this.R_MAJOR,e=a.lng*b*d,a=Math.max(Math.min(c,a.lat),-c)*b,b=this.R_MINOR/d,b=Math.sqrt(1-b*b),c=b*Math.sin(a),c=Math.pow((1-c)/(1+c),b*0.5),a=-d*Math.log(Math.tan(0.5*(Math.PI*0.5-a))/c);return new L.Point(e,a)},unproject:function(a,b){for(var c=L.LatLng.RAD_TO_DEG,d=this.R_MAJOR,e=a.x*c/d,f=this.R_MINOR/d,f=Math.sqrt(1-f*f),d=Math.exp(-a.y/d),
-g=Math.PI/2-2*Math.atan(d),h=15,j=0.1;Math.abs(j)>1.0E-7&&--h>0;)j=f*Math.sin(g),j=Math.PI/2-2*Math.atan(d*Math.pow((1-j)/(1+j),0.5*f))-g,g+=j;return new L.LatLng(g*c,e,b)}};L.CRS={latLngToPoint:function(a,b){return this.transformation._transform(this.projection.project(a),b)},pointToLatLng:function(a,b,c){return this.projection.unproject(this.transformation.untransform(a,b),c)},project:function(a){return this.projection.project(a)}};L.CRS.EPSG3857=L.Util.extend({},L.CRS,{code:"EPSG:3857",projection:L.Projection.SphericalMercator,transformation:new L.Transformation(0.5/Math.PI,0.5,-0.5/Math.PI,0.5),project:function(a){return this.projection.project(a).multiplyBy(6378137)}});L.CRS.EPSG900913=L.Util.extend({},L.CRS.EPSG3857,{code:"EPSG:900913"});L.CRS.EPSG4326=L.Util.extend({},L.CRS,{code:"EPSG:4326",projection:L.Projection.LonLat,transformation:new L.Transformation(1/360,0.5,-1/360,0.5)});L.CRS.EPSG3395=L.Util.extend({},L.CRS,{code:"EPSG:3395",projection:L.Projection.Mercator,transformation:function(){var a=L.Projection.Mercator;return new L.Transformation(0.5/(Math.PI*a.R_MAJOR),0.5,-0.5/(Math.PI*a.R_MINOR),0.5)}()});L.LayerGroup=L.Class.extend({initialize:function(a){this._layers={};if(a)for(var b=0,c=a.length;b<c;b++)this.addLayer(a[b])},addLayer:function(a){this._layers[L.Util.stamp(a)]=a;this._map&&this._map.addLayer(a);return this},removeLayer:function(a){delete this._layers[L.Util.stamp(a)];this._map&&this._map.removeLayer(a);return this},clearLayers:function(){this._iterateLayers(this.removeLayer,this);return this},onAdd:function(a){this._map=a;this._iterateLayers(a.addLayer,a)},onRemove:function(a){this._iterateLayers(a.removeLayer,
-a);delete this._map},_iterateLayers:function(a,b){for(var c in this._layers)this._layers.hasOwnProperty(c)&&a.call(b,this._layers[c])}});L.FeatureGroup=L.LayerGroup.extend({includes:L.Mixin.Events,addLayer:function(a){this._initEvents(a);L.LayerGroup.prototype.addLayer.call(this,a);this._popupContent&&a.bindPopup&&a.bindPopup(this._popupContent)},bindPopup:function(a){this._popupContent=a;for(var b in this._layers)this._layers.hasOwnProperty(b)&&this._layers[b].bindPopup&&this._layers[b].bindPopup(a)},_events:["click","dblclick","mouseover","mouseout"],_initEvents:function(a){for(var b=0,c=this._events.length;b<c;b++)a.on(this._events[b],
-this._propagateEvent,this)},_propagateEvent:function(a){a.layer=a.target;a.target=this;this.fire(a.type,a)}});L.TileLayer=L.Class.extend({includes:L.Mixin.Events,options:{minZoom:0,maxZoom:18,tileSize:256,subdomains:"abc",errorTileUrl:"",attribution:"",opacity:1,scheme:"xyz",noWrap:!1,unloadInvisibleTiles:L.Browser.mobileWebkit,updateWhenIdle:L.Browser.mobileWebkit},initialize:function(a,b){L.Util.setOptions(this,b);this._url=a;if(typeof this.options.subdomains=="string")this.options.subdomains=this.options.subdomains.split("")},onAdd:function(a){this._map=a;this._initContainer();this._createTileProto();
-a.on("viewreset",this._reset,this);if(this.options.updateWhenIdle)a.on("moveend",this._update,this);else this._limitedUpdate=L.Util.limitExecByInterval(this._update,100,this),a.on("move",this._limitedUpdate,this);this._reset();this._update()},onRemove:function(){this._map.getPanes().tilePane.removeChild(this._container);this._container=null;this._map.off("viewreset",this._reset,this);this.options.updateWhenIdle?this._map.off("moveend",this._update,this):this._map.off("move",this._limitedUpdate,this)},
-getAttribution:function(){return this.options.attribution},setOpacity:function(a){this.options.opacity=a;this._setOpacity(a);if(L.Browser.webkit)for(i in this._tiles)this._tiles[i].style.webkitTransform+=" translate(0,0)"},_setOpacity:function(a){a<1&&L.DomUtil.setOpacity(this._container,a)},_initContainer:function(){var a=this._map.getPanes().tilePane;if(!this._container||a.empty)this._container=L.DomUtil.create("div","leaflet-layer",a),this._setOpacity(this.options.opacity)},_reset:function(){this._tiles=
-{};this._initContainer();this._container.innerHTML=""},_update:function(){var a=this._map.getPixelBounds(),b=this.options.tileSize,c=new L.Point(Math.floor(a.min.x/b),Math.floor(a.min.y/b)),a=new L.Point(Math.floor(a.max.x/b),Math.floor(a.max.y/b)),c=new L.Bounds(c,a);this._addTilesFromCenterOut(c);this.options.unloadInvisibleTiles&&this._removeOtherTiles(c)},_addTilesFromCenterOut:function(a){for(var b=[],c=a.getCenter(),d=a.min.y;d<=a.max.y;d++)for(var e=a.min.x;e<=a.max.x;e++)e+":"+d in this._tiles||
-b.push(new L.Point(e,d));b.sort(function(a,b){return a.distanceTo(c)-b.distanceTo(c)});this._tilesToLoad=b.length;a=0;for(d=this._tilesToLoad;a<d;a++)this._addTile(b[a])},_removeOtherTiles:function(a){var b,c,d;for(d in this._tiles)if(this._tiles.hasOwnProperty(d)&&(b=d.split(":"),c=parseInt(b[0],10),b=parseInt(b[1],10),c<a.min.x||c>a.max.x||b<a.min.y||b>a.max.y))this._tiles[d].src="",this._tiles[d].parentNode==this._container&&this._container.removeChild(this._tiles[d]),delete this._tiles[d]},_addTile:function(a){var b=
-this._getTilePos(a),c=this._map.getZoom(),d=a.x+":"+a.y,e=1<<c;if(!this.options.noWrap)a.x=(a.x%e+e)%e;if(!(a.y<0||a.y>=e)){var f=this._createTile();L.DomUtil.setPosition(f,b);this._tiles[d]=f;if(this.options.scheme=="tms")a.y=e-a.y-1;this._loadTile(f,a,c);this._container.appendChild(f)}},_getTilePos:function(a){var b=this._map.getPixelOrigin();return a.multiplyBy(this.options.tileSize).subtract(b)},getTileUrl:function(a,b){return this._url.replace("{s}",this.options.subdomains[(a.x+a.y)%this.options.subdomains.length]).replace("{z}",
-b).replace("{x}",a.x).replace("{y}",a.y)},_createTileProto:function(){this._tileImg=L.DomUtil.create("img","leaflet-tile");this._tileImg.galleryimg="no";var a=this.options.tileSize;this._tileImg.style.width=a+"px";this._tileImg.style.height=a+"px"},_createTile:function(){var a=this._tileImg.cloneNode(!1);a.onselectstart=a.onmousemove=L.Util.falseFn;return a},_loadTile:function(a,b,c){a._layer=this;a.onload=this._tileOnLoad;a.onerror=this._tileOnError;a.src=this.getTileUrl(b,c)},_tileOnLoad:function(){var a=
-this._layer;this.className+=" leaflet-tile-loaded";a.fire("tileload",{tile:this,url:this.src});a._tilesToLoad--;a._tilesToLoad||a.fire("load")},_tileOnError:function(){var a=this._layer;a.fire("tileerror",{tile:this,url:this.src});if(a=a.options.errorTileUrl)this.src=a}});L.TileLayer.WMS=L.TileLayer.extend({defaultWmsParams:{service:"WMS",request:"GetMap",version:"1.1.1",layers:"",styles:"",format:"image/jpeg",transparent:!1},initialize:function(a,b){this._url=a;this.wmsParams=L.Util.extend({},this.defaultWmsParams);this.wmsParams.width=this.wmsParams.height=this.options.tileSize;for(var c in b)this.options.hasOwnProperty(c)||(this.wmsParams[c]=b[c]);L.Util.setOptions(this,b)},onAdd:function(a){this.wmsParams[parseFloat(this.wmsParams.version)>=1.3?"crs":"srs"]=a.options.crs.code;
-L.TileLayer.prototype.onAdd.call(this,a)},getTileUrl:function(a){var b=this.options.tileSize,a=a.multiplyBy(b),b=a.add(new L.Point(b,b)),a=this._map.unproject(a,this._zoom,!0),b=this._map.unproject(b,this._zoom,!0),a=this._map.options.crs.project(a),b=this._map.options.crs.project(b),b=[a.x,b.y,b.x,a.y].join(",");return this._url+L.Util.getParamString(this.wmsParams)+"&bbox="+b}});L.TileLayer.Canvas=L.TileLayer.extend({options:{async:!1},initialize:function(a){L.Util.setOptions(this,a)},_createTileProto:function(){this._canvasProto=L.DomUtil.create("canvas","leaflet-tile");var a=this.options.tileSize;this._canvasProto.width=a;this._canvasProto.height=a},_createTile:function(){var a=this._canvasProto.cloneNode(!1);a.onselectstart=a.onmousemove=L.Util.falseFn;return a},_loadTile:function(a,b,c){a._layer=this;this.drawTile(a,b,c);this.options.async||this.tileDrawn(a)},drawTile:function(){},
-tileDrawn:function(a){this._tileOnLoad.call(a)}});L.ImageOverlay=L.Class.extend({includes:L.Mixin.Events,initialize:function(a,b){this._url=a;this._bounds=b},onAdd:function(a){this._map=a;this._image||this._initImage();a.getPanes().overlayPane.appendChild(this._image);a.on("viewreset",this._reset,this);this._reset()},onRemove:function(a){a.getPanes().overlayPane.removeChild(this._image);a.off("viewreset",this._reset,this)},_initImage:function(){this._image=L.DomUtil.create("img","leaflet-image-layer");this._image.style.visibility="hidden";L.Util.extend(this._image,
-{galleryimg:"no",onselectstart:L.Util.falseFn,onmousemove:L.Util.falseFn,onload:this._onImageLoad,src:this._url})},_reset:function(){var a=this._map.latLngToLayerPoint(this._bounds.getNorthWest()),b=this._map.latLngToLayerPoint(this._bounds.getSouthEast()).subtract(a);L.DomUtil.setPosition(this._image,a);this._image.style.width=b.x+"px";this._image.style.height=b.y+"px"},_onImageLoad:function(){this.style.visibility=""}});L.Popup=L.Class.extend({includes:L.Mixin.Events,options:{maxWidth:300,autoPan:!0,closeButton:!0,offset:new L.Point(0,2),autoPanPadding:new L.Point(5,5)},initialize:function(a){L.Util.setOptions(this,a)},onAdd:function(a){this._map=a;this._container||this._initLayout();this._updateContent();this._container.style.opacity="0";this._map._panes.popupPane.appendChild(this._container);this._map.on("viewreset",this._updatePosition,this);if(this._map.options.closePopupOnClick)this._map.on("preclick",this._close,
-this);this._update();this._container.style.opacity="1";this._opened=!0},onRemove:function(a){a._panes.popupPane.removeChild(this._container);a.off("viewreset",this._updatePosition,this);a.off("click",this._close,this);this._container.style.opacity="0";this._opened=!1},setLatLng:function(a){this._latlng=a;this._opened&&this._update();return this},setContent:function(a){this._content=a;this._opened&&this._update();return this},_close:function(){this._opened&&this._map.removeLayer(this)},_initLayout:function(){this._container=
-L.DomUtil.create("div","leaflet-popup");this._closeButton=L.DomUtil.create("a","leaflet-popup-close-button",this._container);this._closeButton.href="#close";this._closeButton.onclick=L.Util.bind(this._onCloseButtonClick,this);this._wrapper=L.DomUtil.create("div","leaflet-popup-content-wrapper",this._container);L.DomEvent.disableClickPropagation(this._wrapper);this._contentNode=L.DomUtil.create("div","leaflet-popup-content",this._wrapper);this._tipContainer=L.DomUtil.create("div","leaflet-popup-tip-container",
-this._container);this._tip=L.DomUtil.create("div","leaflet-popup-tip",this._tipContainer)},_update:function(){this._container.style.visibility="hidden";this._updateContent();this._updateLayout();this._updatePosition();this._container.style.visibility="";this._adjustPan()},_updateContent:function(){if(this._content)typeof this._content=="string"?this._contentNode.innerHTML=this._content:(this._contentNode.innerHTML="",this._contentNode.appendChild(this._content))},_updateLayout:function(){this._container.style.width=
-"";this._container.style.whiteSpace="nowrap";var a=this._container.offsetWidth;this._container.style.width=(a>this.options.maxWidth?this.options.maxWidth:a)+"px";this._container.style.whiteSpace="";this._containerWidth=this._container.offsetWidth},_updatePosition:function(){var a=this._map.latLngToLayerPoint(this._latlng);this._containerBottom=-a.y-this.options.offset.y;this._containerLeft=a.x-Math.round(this._containerWidth/2)+this.options.offset.x;this._container.style.bottom=this._containerBottom+
-"px";this._container.style.left=this._containerLeft+"px"},_adjustPan:function(){if(this.options.autoPan){var a=this._container.offsetHeight,b=this._map.layerPointToContainerPoint(new L.Point(this._containerLeft,-a-this._containerBottom)),c=new L.Point(0,0),d=this.options.autoPanPadding,e=this._map.getSize();if(b.x<0)c.x=b.x-d.x;if(b.x+this._containerWidth>e.x)c.x=b.x+this._containerWidth-e.x+d.x;if(b.y<0)c.y=b.y-d.y;if(b.y+a>e.y)c.y=b.y+a-e.y+d.y;(c.x||c.y)&&this._map.panBy(c)}},_onCloseButtonClick:function(a){this._close();
-L.DomEvent.stop(a)}});L.Icon=L.Class.extend({iconUrl:L.ROOT_URL+"images/marker.png",shadowUrl:L.ROOT_URL+"images/marker-shadow.png",iconSize:new L.Point(25,41),shadowSize:new L.Point(41,41),iconAnchor:new L.Point(13,41),popupAnchor:new L.Point(0,-33),initialize:function(a){if(a)this.iconUrl=a},createIcon:function(){return this._createIcon("icon")},createShadow:function(){return this._createIcon("shadow")},_createIcon:function(a){var b=this[a+"Size"],c=this[a+"Url"],d=this._createImg(c);if(!c)return null;d.className="leaflet-marker-"+
-a;d.style.marginLeft=-this.iconAnchor.x+"px";d.style.marginTop=-this.iconAnchor.y+"px";if(b)d.style.width=b.x+"px",d.style.height=b.y+"px";return d},_createImg:function(a){var b;L.Browser.ie6?(b=document.createElement("div"),b.style.filter='progid:DXImageTransform.Microsoft.AlphaImageLoader(src="'+a+'")'):(b=document.createElement("img"),b.src=a);return b}});L.Marker=L.Class.extend({includes:L.Mixin.Events,options:{icon:new L.Icon,title:"",clickable:!0,draggable:!1},initialize:function(a,b){L.Util.setOptions(this,b);this._latlng=a},onAdd:function(a){this._map=a;this._initIcon();a.on("viewreset",this._reset,this);this._reset()},onRemove:function(a){this._removeIcon();a.off("viewreset",this._reset,this)},getLatLng:function(){return this._latlng},setLatLng:function(a){this._latlng=a;this._reset()},setIcon:function(a){this._removeIcon();this._icon=this._shadow=
-null;this.options.icon=a;this._initIcon()},_initIcon:function(){if(!this._icon){this._icon=this.options.icon.createIcon();if(this.options.title)this._icon.title=this.options.title;this._initInteraction()}if(!this._shadow)this._shadow=this.options.icon.createShadow();this._map._panes.markerPane.appendChild(this._icon);this._shadow&&this._map._panes.shadowPane.appendChild(this._shadow)},_removeIcon:function(){this._map._panes.markerPane.removeChild(this._icon);this._shadow&&this._map._panes.shadowPane.removeChild(this._shadow)},
-_reset:function(){var a=this._map.latLngToLayerPoint(this._latlng).round();L.DomUtil.setPosition(this._icon,a);this._shadow&&L.DomUtil.setPosition(this._shadow,a);this._icon.style.zIndex=a.y},_initInteraction:function(){if(this.options.clickable){this._icon.className+=" leaflet-clickable";L.DomEvent.addListener(this._icon,"click",this._onMouseClick,this);for(var a=["dblclick","mousedown","mouseover","mouseout"],b=0;b<a.length;b++)L.DomEvent.addListener(this._icon,a[b],this._fireMouseEvent,this)}if(L.Handler.MarkerDrag)this.dragging=
-new L.Handler.MarkerDrag(this),this.options.draggable&&this.dragging.enable()},_onMouseClick:function(a){L.DomEvent.stopPropagation(a);(!this.dragging||!this.dragging.moved())&&this.fire(a.type)},_fireMouseEvent:function(a){this.fire(a.type);L.DomEvent.stopPropagation(a)}});L.Marker.include({openPopup:function(){this._popup.setLatLng(this._latlng);this._map.openPopup(this._popup);return this},closePopup:function(){this._popup&&this._popup._close()},bindPopup:function(a,b){b=L.Util.extend({offset:this.options.icon.popupAnchor},b);this._popup=new L.Popup(b);this._popup.setContent(a);this.on("click",this.openPopup,this);return this}});L.Path=L.Class.extend({includes:[L.Mixin.Events],statics:function(){return{SVG_NS:"http://www.w3.org/2000/svg",SVG:!(!document.createElementNS||!document.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect),CLIP_PADDING:0.5}}(),options:{stroke:!0,color:"#0033ff",weight:5,opacity:0.5,fill:!1,fillColor:null,fillOpacity:0.2,clickable:!0,updateOnMoveEnd:!1},initialize:function(a){L.Util.setOptions(this,a)},onAdd:function(a){this._map=a;this._initElements();this._initEvents();this.projectLatlngs();
-this._updatePath();a.on("viewreset",this.projectLatlngs,this);this._updateTrigger=this.options.updateOnMoveEnd?"moveend":"viewreset";a.on(this._updateTrigger,this._updatePath,this)},onRemove:function(a){a._pathRoot.removeChild(this._container);a.off("viewreset",this._projectLatlngs,this);a.off(this._updateTrigger,this._updatePath,this)},projectLatlngs:function(){},getPathString:function(){},setStyle:function(a){L.Util.setOptions(this,a);this._path&&this._updateStyle()},_initElements:function(){this._initRoot();
-this._initPath();this._initStyle()},_initRoot:function(){if(!this._map._pathRoot)this._map._pathRoot=this._createElement("svg"),this._map._panes.overlayPane.appendChild(this._map._pathRoot),this._map.on("moveend",this._updateSvgViewport,this),this._updateSvgViewport()},_updateSvgViewport:function(){this._updateViewport();var a=this._map._pathViewport,b=a.min,c=a.max,a=c.x-b.x,c=c.y-b.y,d=this._map._pathRoot,e=this._map._panes.overlayPane;L.Browser.mobileWebkit&&e.removeChild(d);L.DomUtil.setPosition(d,
-b);d.setAttribute("width",a);d.setAttribute("height",c);d.setAttribute("viewBox",[b.x,b.y,a,c].join(" "));L.Browser.mobileWebkit&&e.appendChild(d)},_updateViewport:function(){var a=L.Path.CLIP_PADDING,b=this._map.getSize(),c=L.DomUtil.getPosition(this._map._mapPane).multiplyBy(-1).subtract(b.multiplyBy(a)),a=c.add(b.multiplyBy(1+a*2));this._map._pathViewport=new L.Bounds(c,a)},_initPath:function(){this._container=this._createElement("g");this._path=this._createElement("path");this._container.appendChild(this._path);
-this._map._pathRoot.appendChild(this._container)},_initStyle:function(){this.options.stroke&&(this._path.setAttribute("stroke-linejoin","round"),this._path.setAttribute("stroke-linecap","round"));this.options.fill?this._path.setAttribute("fill-rule","evenodd"):this._path.setAttribute("fill","none");this._updateStyle()},_updateStyle:function(){this.options.stroke&&(this._path.setAttribute("stroke",this.options.color),this._path.setAttribute("stroke-opacity",this.options.opacity),this._path.setAttribute("stroke-width",
-this.options.weight));this.options.fill&&(this._path.setAttribute("fill",this.options.fillColor||this.options.color),this._path.setAttribute("fill-opacity",this.options.fillOpacity))},_updatePath:function(){var a=this.getPathString();a||(a="M0 0");this._path.setAttribute("d",a)},_createElement:function(a){return document.createElementNS(L.Path.SVG_NS,a)},_initEvents:function(){if(this.options.clickable){L.Path.VML||this._path.setAttribute("class","leaflet-clickable");L.DomEvent.addListener(this._container,
-"click",this._onMouseClick,this);for(var a=["dblclick","mousedown","mouseover","mouseout"],b=0;b<a.length;b++)L.DomEvent.addListener(this._container,a[b],this._fireMouseEvent,this)}},_onMouseClick:function(a){(!this._map.dragging||!this._map.dragging.moved())&&this._fireMouseEvent(a)},_fireMouseEvent:function(a){this.hasEventListeners(a.type)&&(this.fire(a.type,{latlng:this._map.mouseEventToLatLng(a),layerPoint:this._map.mouseEventToLayerPoint(a)}),L.DomEvent.stopPropagation(a))},_redraw:function(){this.projectLatlngs();
-this._updatePath()}});L.Path.VML=function(){var a=document.createElement("div");a.innerHTML='<v:shape adj="1"/>';a=a.firstChild;a.style.behavior="url(#default#VML)";return a&&typeof a.adj=="object"}();
-L.Path=L.Path.SVG||!L.Path.VML?L.Path:L.Path.extend({statics:{CLIP_PADDING:0.02},_createElement:function(){try{return document.namespaces.add("lvml","urn:schemas-microsoft-com:vml"),function(a){return document.createElement("<lvml:"+a+' class="lvml">')}}catch(a){return function(a){return document.createElement("<"+a+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),_initRoot:function(){if(!this._map._pathRoot)this._map._pathRoot=document.createElement("div"),this._map._pathRoot.className=
-"leaflet-vml-container",this._map._panes.overlayPane.appendChild(this._map._pathRoot),this._map.on("moveend",this._updateViewport,this),this._updateViewport()},_initPath:function(){this._container=this._createElement("shape");this._container.className+=" leaflet-vml-shape"+(this.options.clickable?" leaflet-clickable":"");this._container.coordsize="1 1";this._path=this._createElement("path");this._container.appendChild(this._path);this._map._pathRoot.appendChild(this._container)},_initStyle:function(){this.options.stroke?
-(this._stroke=this._createElement("stroke"),this._stroke.endcap="round",this._container.appendChild(this._stroke)):this._container.stroked=!1;this.options.fill?(this._container.filled=!0,this._fill=this._createElement("fill"),this._container.appendChild(this._fill)):this._container.filled=!1;this._updateStyle()},_updateStyle:function(){if(this.options.stroke)this._stroke.weight=this.options.weight+"px",this._stroke.color=this.options.color,this._stroke.opacity=this.options.opacity;if(this.options.fill)this._fill.color=
-this.options.fillColor||this.options.color,this._fill.opacity=this.options.fillOpacity},_updatePath:function(){this._container.style.display="none";this._path.v=this.getPathString()+" ";this._container.style.display=""}});L.Path.include({bindPopup:function(a,b){if(!this._popup||this._popup.options!==b)this._popup=new L.Popup(b);this._popup.setContent(a);if(!this._openPopupAdded)this.on("click",this._openPopup,this),this._openPopupAdded=!0;return this},_openPopup:function(a){this._popup.setLatLng(a.latlng);this._map.openPopup(this._popup)}});L.Polyline=L.Path.extend({initialize:function(a,b){L.Path.prototype.initialize.call(this,b);this._latlngs=a},options:{smoothFactor:1,noClip:!1,updateOnMoveEnd:!0},projectLatlngs:function(){this._originalPoints=[];for(var a=0,b=this._latlngs.length;a<b;a++)this._originalPoints[a]=this._map.latLngToLayerPoint(this._latlngs[a])},getPathString:function(){for(var a=0,b=this._parts.length,c="";a<b;a++)c+=this._getPathPartStr(this._parts[a]);return c},getLatLngs:function(){return this._latlngs},setLatLngs:function(a){this._latlngs=
-a;this._redraw();return this},addLatLng:function(a){this._latlngs.push(a);this._redraw();return this},spliceLatLngs:function(){var a=[].splice.apply(this._latlngs,arguments);this._redraw();return a},_getPathPartStr:function(a){for(var b=L.Path.VML,c=0,d=a.length,e="",f;c<d;c++)f=a[c],b&&f._round(),e+=(c?"L":"M")+f.x+" "+f.y;return e},_clipPoints:function(){var a=this._originalPoints,b=a.length,c,d,e;if(this.options.noClip)this._parts=[a];else{var f=this._parts=[],g=this._map._pathViewport,h=L.LineUtil;
-for(d=c=0;c<b-1;c++)if(e=h.clipSegment(a[c],a[c+1],g,c))if(f[d]=f[d]||[],f[d].push(e[0]),e[1]!=a[c+1]||c==b-2)f[d].push(e[1]),d++}},_simplifyPoints:function(){for(var a=this._parts,b=L.LineUtil,c=0,d=a.length;c<d;c++)a[c]=b.simplify(a[c],this.options.smoothFactor)},_updatePath:function(){this._clipPoints();this._simplifyPoints();L.Path.prototype._updatePath.call(this)}});L.Polygon=L.Polyline.extend({options:{fill:!0},initialize:function(a,b){L.Polyline.prototype.initialize.call(this,a,b);if(a[0]instanceof Array)this._latlngs=a[0],this._holes=a.slice(1)},projectLatlngs:function(){L.Polyline.prototype.projectLatlngs.call(this);this._holePoints=[];if(this._holes)for(var a=0,b=this._holes.length;a<b;a++){this._holePoints[a]=[];for(var c=0,d=this._holes[a].length;c<d;c++)this._holePoints[a][c]=this._map.latLngToLayerPoint(this._holes[a][c])}},_clipPoints:function(){var a=
-[];this._parts=[this._originalPoints].concat(this._holePoints);if(!this.options.noClip){for(var b=0,c=this._parts.length;b<c;b++){var d=L.PolyUtil.clipPolygon(this._parts[b],this._map._pathViewport);d.length&&a.push(d)}this._parts=a}},_getPathPartStr:function(a){return L.Polyline.prototype._getPathPartStr.call(this,a)+(L.Path.SVG?"z":"x")}});(function(){function a(a){return L.FeatureGroup.extend({initialize:function(c,d){this._layers={};for(var e=0,f=c.length;e<f;e++)this.addLayer(new a(c[e],d))},setStyle:function(a){for(var b in this._layers)this._layers.hasOwnProperty(b)&&this._layers[b].setStyle&&this._layers[b].setStyle(a)}})}L.MultiPolyline=a(L.Polyline);L.MultiPolygon=a(L.Polygon)})();L.Circle=L.Path.extend({initialize:function(a,b,c){L.Path.prototype.initialize.call(this,c);this._latlng=a;this._mRadius=b},options:{fill:!0},setLatLng:function(a){this._latlng=a;this._redraw();return this},setRadius:function(a){this._mRadius=a;this._redraw();return this},projectLatlngs:function(){var a=this._map.options.scale(this._map._zoom);this._point=this._map.latLngToLayerPoint(this._latlng);this._radius=this._mRadius/40075017*a},getPathString:function(){var a=this._point,b=this._radius;return L.Path.SVG?
-"M"+a.x+","+(a.y-b)+"A"+b+","+b+",0,1,1,"+(a.x-0.1)+","+(a.y-b)+" z":(a._round(),b=Math.round(b),"AL "+a.x+","+a.y+" "+b+","+b+" 0,23592600")}});L.CircleMarker=L.Circle.extend({options:{radius:10,weight:2},initialize:function(a,b){L.Circle.prototype.initialize.call(this,a,null,b);this._radius=this.options.radius},projectLatlngs:function(){this._point=this._map.latLngToLayerPoint(this._latlng)},setRadius:function(a){this._radius=a;this._redraw();return this}});L.GeoJSON=L.LayerGroup.extend({includes:L.Mixin.Events,initialize:function(a,b){L.Util.setOptions(this,b);this._geojson=a;this._layers={};a&&this.addGeoJSON(a)},addGeoJSON:function(a){if(a.features)for(var b=0,c=a.features.length;b<c;b++)this.addGeoJSON(a.features[b]);else b=a.type=="Feature"?a.geometry:a,c=L.GeoJSON.geometryToLayer(b,this.options.pointToLayer),this.fire("featureparse",{layer:c,properties:a.properties,geometryType:b.type,bbox:a.bbox,id:a.id}),this.addLayer(c)}});
-L.Util.extend(L.GeoJSON,{geometryToLayer:function(a,b){var c=a.coordinates,d,e,f,g=[];switch(a.type){case "Point":return d=this.coordsToLatLng(c),b?b(d):new L.Marker(d);case "MultiPoint":e=0;for(f=c.length;e<f;e++)d=this.coordsToLatLng(c[e]),d=b?b(d):new L.Marker(d),g.push(d);return new L.FeatureGroup(g);case "LineString":return c=this.coordsToLatLngs(c),new L.Polyline(c);case "Polygon":return c=this.coordsToLatLngs(c,1),new L.Polygon(c);case "MultiLineString":return c=this.coordsToLatLngs(c,1),new L.MultiPolyline(c);
-case "MultiPolygon":return c=this.coordsToLatLngs(c,2),new L.MultiPolygon(c);case "GeometryCollection":e=0;for(f=a.geometries.length;e<f;e++)d=this.geometryToLayer(a.geometries[e]),g.push(d);return new L.FeatureGroup(g);default:throw Error("Invalid GeoJSON object.");}},coordsToLatLng:function(a,b){var c=parseFloat(a[b?0:1]),d=parseFloat(a[b?1:0]);return new L.LatLng(c,d)},coordsToLatLngs:function(a,b,c){var d,e=[],f,g=a.length;for(f=0;f<g;f++)d=b?this.coordsToLatLngs(a[f],b-1,c):this.coordsToLatLng(a[f],
-c),e.push(d);return e}});L.Handler=L.Class.extend({initialize:function(a){this._map=a},enabled:function(){return!!this._enabled}});L.Handler.MapDrag=L.Handler.extend({enable:function(){if(!this._enabled){if(!this._draggable)this._draggable=new L.Draggable(this._map._mapPane,this._map._container),this._draggable.on("dragstart",this._onDragStart,this),this._draggable.on("drag",this._onDrag,this),this._draggable.on("dragend",this._onDragEnd,this);this._draggable.enable();this._enabled=!0}},disable:function(){if(this._enabled)this._draggable.disable(),this._enabled=!1},moved:function(){return this._draggable._moved},_onDragStart:function(){this._map.fire("movestart");
-this._map.fire("dragstart")},_onDrag:function(){this._map.fire("move");this._map.fire("drag")},_onDragEnd:function(){this._map.fire("moveend");this._map.fire("dragend")}});L.Handler.TouchZoom=L.Handler.extend({enable:function(){if(L.Browser.mobileWebkit&&!this._enabled)L.DomEvent.addListener(this._map._container,"touchstart",this._onTouchStart,this),this._enabled=!0},disable:function(){if(this._enabled)L.DomEvent.removeListener(this._map._container,"touchstart",this._onTouchStart,this),this._enabled=!1},_onTouchStart:function(a){if(a.touches&&!(a.touches.length!=2||this._map._animatingZoom)){var b=this._map.mouseEventToLayerPoint(a.touches[0]),c=this._map.mouseEventToLayerPoint(a.touches[1]),
-d=this._map.containerPointToLayerPoint(this._map.getSize().divideBy(2));this._startCenter=b.add(c).divideBy(2,!0);this._startDist=b.distanceTo(c);this._moved=!1;this._zooming=!0;this._centerOffset=d.subtract(this._startCenter);L.DomEvent.addListener(document,"touchmove",this._onTouchMove,this);L.DomEvent.addListener(document,"touchend",this._onTouchEnd,this);L.DomEvent.preventDefault(a)}},_onTouchMove:function(a){if(a.touches&&a.touches.length==2){if(!this._moved)this._map._mapPane.className+=" leaflet-zoom-anim",
-this._map._prepareTileBg(),this._moved=!0;var b=this._map.mouseEventToLayerPoint(a.touches[0]),c=this._map.mouseEventToLayerPoint(a.touches[1]);this._scale=b.distanceTo(c)/this._startDist;this._delta=b.add(c).divideBy(2,!0).subtract(this._startCenter);this._map._tileBg.style.webkitTransform=[L.DomUtil.getTranslateString(this._delta),L.DomUtil.getScaleString(this._scale,this._startCenter)].join(" ");L.DomEvent.preventDefault(a)}},_onTouchEnd:function(){if(this._moved&&this._zooming){this._zooming=
-!1;var a=this._map.getZoom(),b=Math.log(this._scale)/Math.LN2,b=this._map._limitZoom(a+(b>0?Math.ceil(b):Math.floor(b))),a=b-a,c=this._centerOffset.subtract(this._delta).divideBy(this._scale),d=this._map.unproject(this._map.getPixelOrigin().add(this._startCenter).add(c));L.DomEvent.removeListener(document,"touchmove",this._onTouchMove);L.DomEvent.removeListener(document,"touchend",this._onTouchEnd);this._map._runAnimation(d,b,Math.pow(2,a)/this._scale,this._startCenter.add(c))}}});L.Handler.ScrollWheelZoom=L.Handler.extend({enable:function(){if(!this._enabled)L.DomEvent.addListener(this._map._container,"mousewheel",this._onWheelScroll,this),this._delta=0,this._enabled=!0},disable:function(){if(this._enabled)L.DomEvent.removeListener(this._map._container,"mousewheel",this._onWheelScroll),this._enabled=!1},_onWheelScroll:function(a){this._delta+=L.DomEvent.getWheelDelta(a);this._lastMousePos=this._map.mouseEventToContainerPoint(a);clearTimeout(this._timer);this._timer=setTimeout(L.Util.bind(this._performZoom,
-this),50);L.DomEvent.preventDefault(a)},_performZoom:function(){var a=Math.round(this._delta);this._delta=0;if(a){var b=this._getCenterForScrollWheelZoom(this._lastMousePos,a),a=this._map.getZoom()+a;this._map._limitZoom(a)!=this._map._zoom&&this._map.setView(b,a)}},_getCenterForScrollWheelZoom:function(a,b){var c=this._map.getPixelBounds().getCenter(),d=this._map.getSize().divideBy(2),d=a.subtract(d).multiplyBy(1-Math.pow(2,-b));return this._map.unproject(c.add(d),this._map._zoom,!0)}});L.Handler.DoubleClickZoom=L.Handler.extend({enable:function(){if(!this._enabled)this._map.on("dblclick",this._onDoubleClick,this._map),this._enabled=!0},disable:function(){if(this._enabled)this._map.off("dblclick",this._onDoubleClick,this._map),this._enabled=!1},_onDoubleClick:function(a){this.setView(a.latlng,this._zoom+1)}});L.Handler.ShiftDragZoom=L.Handler.extend({initialize:function(a){this._map=a;this._container=a._container;this._pane=a._panes.overlayPane},enable:function(){if(!this._enabled)L.DomEvent.addListener(this._container,"mousedown",this._onMouseDown,this),this._enabled=!0},disable:function(){if(this._enabled)L.DomEvent.removeListener(this._container,"mousedown",this._onMouseDown),this._enabled=!1},_onMouseDown:function(a){if(!a.shiftKey||a.which!=1&&a.button!=1)return!1;L.DomUtil.disableTextSelection();
-this._startLayerPoint=this._map.mouseEventToLayerPoint(a);this._box=L.DomUtil.create("div","leaflet-zoom-box",this._pane);L.DomUtil.setPosition(this._box,this._startLayerPoint);this._container.style.cursor="crosshair";L.DomEvent.addListener(document,"mousemove",this._onMouseMove,this);L.DomEvent.addListener(document,"mouseup",this._onMouseUp,this);L.DomEvent.preventDefault(a)},_onMouseMove:function(a){var b=this._map.mouseEventToLayerPoint(a),a=b.x-this._startLayerPoint.x,c=b.y-this._startLayerPoint.y,
-b=new L.Point(Math.min(b.x,this._startLayerPoint.x),Math.min(b.y,this._startLayerPoint.y));L.DomUtil.setPosition(this._box,b);this._box.style.width=Math.abs(a)-4+"px";this._box.style.height=Math.abs(c)-4+"px"},_onMouseUp:function(a){this._pane.removeChild(this._box);this._container.style.cursor="";L.DomUtil.enableTextSelection();L.DomEvent.removeListener(document,"mousemove",this._onMouseMove);L.DomEvent.removeListener(document,"mouseup",this._onMouseUp);a=this._map.mouseEventToLayerPoint(a);this._map.fitBounds(new L.LatLngBounds(this._map.layerPointToLatLng(this._startLayerPoint),
-this._map.layerPointToLatLng(a)))}});L.Handler.MarkerDrag=L.Handler.extend({initialize:function(a){this._marker=a},enable:function(){if(!this._enabled){if(!this._draggable)this._draggable=new L.Draggable(this._marker._icon,this._marker._icon),this._draggable.on("dragstart",this._onDragStart,this),this._draggable.on("drag",this._onDrag,this),this._draggable.on("dragend",this._onDragEnd,this);this._draggable.enable();this._enabled=!0}},disable:function(){if(this._enabled)this._draggable.disable(),this._enabled=!1},moved:function(){return this._draggable&&
-this._draggable._moved},_onDragStart:function(){this._marker.closePopup();this._marker.fire("movestart");this._marker.fire("dragstart")},_onDrag:function(){var a=L.DomUtil.getPosition(this._marker._icon);L.DomUtil.setPosition(this._marker._shadow,a);this._marker._latlng=this._marker._map.layerPointToLatLng(a);this._marker.fire("move");this._marker.fire("drag")},_onDragEnd:function(){this._marker.fire("moveend");this._marker.fire("dragend")}});L.Control={};L.Control.Position={TOP_LEFT:"topLeft",TOP_RIGHT:"topRight",BOTTOM_LEFT:"bottomLeft",BOTTOM_RIGHT:"bottomRight"};L.Control.Zoom=L.Class.extend({onAdd:function(a){this._map=a;this._container=L.DomUtil.create("div","leaflet-control-zoom");this._zoomInButton=this._createButton("Zoom in","leaflet-control-zoom-in",this._map.zoomIn,this._map);this._zoomOutButton=this._createButton("Zoom out","leaflet-control-zoom-out",this._map.zoomOut,this._map);this._container.appendChild(this._zoomInButton);this._container.appendChild(this._zoomOutButton)},getContainer:function(){return this._container},getPosition:function(){return L.Control.Position.TOP_LEFT},
-_createButton:function(a,b,c,d){var e=document.createElement("a");e.href="#";e.title=a;e.className=b;L.DomEvent.disableClickPropagation(e);L.DomEvent.addListener(e,"click",L.DomEvent.preventDefault);L.DomEvent.addListener(e,"click",c,d);return e}});L.Control.Attribution=L.Class.extend({onAdd:function(a){this._container=L.DomUtil.create("div","leaflet-control-attribution");this._map=a;this._prefix='Powered by <a href="http://leaflet.cloudmade.com">Leaflet</a>';this._attributions={};this._update()},getPosition:function(){return L.Control.Position.BOTTOM_RIGHT},getContainer:function(){return this._container},setPrefix:function(a){this._prefix=a},addAttribution:function(a){a&&(this._attributions[a]=!0,this._update())},removeAttribution:function(a){a&&
-(delete this._attributions[a],this._update())},_update:function(){if(this._map){var a=[],b;for(b in this._attributions)this._attributions.hasOwnProperty(b)&&a.push(b);b=[];this._prefix&&b.push(this._prefix);a.length&&b.push(a.join(", "));this._container.innerHTML=b.join(" &mdash; ")}}});L.Map=L.Class.extend({includes:L.Mixin.Events,options:{crs:L.CRS.EPSG3857||L.CRS.EPSG4326,scale:function(a){return 256*(1<<a)},center:null,zoom:null,layers:[],dragging:!0,touchZoom:L.Browser.mobileWebkit&&!L.Browser.android,scrollWheelZoom:!L.Browser.mobileWebkit,doubleClickZoom:!0,shiftDragZoom:!0,zoomControl:!0,attributionControl:!0,fadeAnimation:L.DomUtil.TRANSITION&&!L.Browser.android,zoomAnimation:L.DomUtil.TRANSITION&&!L.Browser.android&&!L.Browser.mobileOpera,trackResize:!0,closePopupOnClick:!0},
-initialize:function(a,b){L.Util.setOptions(this,b);this._container=L.DomUtil.get(a);this._initLayout();L.DomEvent&&(this._initEvents(),L.Handler&&this._initInteraction(),L.Control&&this._initControls());var c=this.options.center,d=this.options.zoom;c!==null&&d!==null&&this.setView(c,d,!0);c=this.options.layers;c=c instanceof Array?c:[c];this._tileLayersNum=0;this._initLayers(c)},setView:function(a,b){this._resetView(a,this._limitZoom(b));return this},setZoom:function(a){return this.setView(this.getCenter(),
-a)},zoomIn:function(){return this.setZoom(this._zoom+1)},zoomOut:function(){return this.setZoom(this._zoom-1)},fitBounds:function(a){var b=this.getBoundsZoom(a);return this.setView(a.getCenter(),b)},fitWorld:function(){var a=new L.LatLng(-60,-170),b=new L.LatLng(85,179);return this.fitBounds(new L.LatLngBounds(a,b))},panTo:function(a){return this.setView(a,this._zoom)},panBy:function(a){this.fire("movestart");this._rawPanBy(a);this.fire("move");this.fire("moveend");return this},addLayer:function(a){var b=
-L.Util.stamp(a);if(this._layers[b])return this;this._layers[b]=a;if(a.options&&!isNaN(a.options.maxZoom))this._layersMaxZoom=Math.max(this._layersMaxZoom||0,a.options.maxZoom);if(a.options&&!isNaN(a.options.minZoom))this._layersMinZoom=Math.min(this._layersMinZoom||Infinity,a.options.minZoom);this.options.zoomAnimation&&L.TileLayer&&a instanceof L.TileLayer&&(this._tileLayersNum++,a.on("load",this._onTileLayerLoad,this));this.attributionControl&&a.getAttribution&&this.attributionControl.addAttribution(a.getAttribution());
-b=function(){a.onAdd(this);this.fire("layeradd",{layer:a})};if(this._loaded)b.call(this);else this.on("load",b,this);return this},removeLayer:function(a){var b=L.Util.stamp(a);this._layers[b]&&(a.onRemove(this),delete this._layers[b],this.options.zoomAnimation&&L.TileLayer&&a instanceof L.TileLayer&&(this._tileLayersNum--,a.off("load",this._onTileLayerLoad,this)),this.attributionControl&&a.getAttribution&&this.attributionControl.removeAttribution(a.getAttribution()),this.fire("layerremove",{layer:a}));
-return this},invalidateSize:function(){this._sizeChanged=!0;this.fire("move");clearTimeout(this._sizeTimer);this._sizeTimer=setTimeout(L.Util.bind(function(){this.fire("moveend")},this),200);return this},getCenter:function(a){var b=this.getSize().divideBy(2);return this.unproject(this._getTopLeftPoint().add(b),this._zoom,a)},getZoom:function(){return this._zoom},getBounds:function(){var a=this.getPixelBounds(),b=this.unproject(new L.Point(a.min.x,a.max.y)),a=this.unproject(new L.Point(a.max.x,a.min.y));
-return new L.LatLngBounds(b,a)},getMinZoom:function(){return isNaN(this.options.minZoom)?this._layersMinZoom||0:this.options.minZoom},getMaxZoom:function(){return isNaN(this.options.maxZoom)?this._layersMaxZoom||Infinity:this.options.maxZoom},getBoundsZoom:function(a){var b=this.getSize(),c=this.getMinZoom(),d=this.getMaxZoom(),e=a.getNorthEast(),a=a.getSouthWest(),f,g;do c++,f=this.project(e,c),g=this.project(a,c),f=new L.Point(f.x-g.x,g.y-f.y);while(f.x<=b.x&&f.y<=b.y&&c<=d);return c-1},getSize:function(){if(!this._size||
-this._sizeChanged)this._size=new L.Point(this._container.clientWidth,this._container.clientHeight),this._sizeChanged=!1;return this._size},getPixelBounds:function(){var a=this._getTopLeftPoint(),b=this.getSize();return new L.Bounds(a,a.add(b))},getPixelOrigin:function(){return this._initialTopLeftPoint},getPanes:function(){return this._panes},mouseEventToContainerPoint:function(a){return L.DomEvent.getMousePosition(a,this._container)},mouseEventToLayerPoint:function(a){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(a))},
-mouseEventToLatLng:function(a){return this.layerPointToLatLng(this.mouseEventToLayerPoint(a))},containerPointToLayerPoint:function(a){return a.subtract(L.DomUtil.getPosition(this._mapPane))},layerPointToContainerPoint:function(a){return a.add(L.DomUtil.getPosition(this._mapPane))},layerPointToLatLng:function(a){return this.unproject(a.add(this._initialTopLeftPoint))},latLngToLayerPoint:function(a){return this.project(a)._subtract(this._initialTopLeftPoint)},project:function(a,b){b=typeof b=="undefined"?
-this._zoom:b;return this.options.crs.latLngToPoint(a,this.options.scale(b))},unproject:function(a,b,c){b=typeof b=="undefined"?this._zoom:b;return this.options.crs.pointToLatLng(a,this.options.scale(b),c)},_initLayout:function(){var a=this._container;a.className+=" leaflet-container";this.options.fadeAnimation&&(a.className+=" leaflet-fade-anim");var b=L.DomUtil.getStyle(a,"position");if(b!="absolute"&&b!="relative")a.style.position="relative";this._initPanes();this._initControlPos&&this._initControlPos()},
-_initPanes:function(){var a=this._panes={};this._mapPane=a.mapPane=this._createPane("leaflet-map-pane",this._container);this._tilePane=a.tilePane=this._createPane("leaflet-tile-pane",this._mapPane);this._objectsPane=a.objectsPane=this._createPane("leaflet-objects-pane",this._mapPane);a.shadowPane=this._createPane("leaflet-shadow-pane");a.overlayPane=this._createPane("leaflet-overlay-pane");a.markerPane=this._createPane("leaflet-marker-pane");a.popupPane=this._createPane("leaflet-popup-pane")},_createPane:function(a,
-b){return L.DomUtil.create("div",a,b||this._objectsPane)},_resetView:function(a,b,c){var d=this._zoom!=b;this.fire("movestart");this._zoom=b;this._initialTopLeftPoint=this._getNewTopLeftPoint(a);c?this._initialTopLeftPoint._add(L.DomUtil.getPosition(this._mapPane)):L.DomUtil.setPosition(this._mapPane,new L.Point(0,0));this._tileLayersToLoad=this._tileLayersNum;this.fire("viewreset");this.fire("move");d&&this.fire("zoomend");this.fire("moveend");if(!this._loaded)this._loaded=!0,this.fire("load")},
-_initLayers:function(a){this._layers={};for(var b=0,c=a.length;b<c;b++)this.addLayer(a[b])},_initControls:function(){this.options.zoomControl&&this.addControl(new L.Control.Zoom);if(this.options.attributionControl)this.attributionControl=new L.Control.Attribution,this.addControl(this.attributionControl)},_rawPanBy:function(a){var b=L.DomUtil.getPosition(this._mapPane);L.DomUtil.setPosition(this._mapPane,b.subtract(a))},_initEvents:function(){L.DomEvent.addListener(this._container,"click",this._onMouseClick,
-this);for(var a=["dblclick","mousedown","mouseenter","mouseleave","mousemove"],b=0;b<a.length;b++)L.DomEvent.addListener(this._container,a[b],this._fireMouseEvent,this);this.options.trackResize&&L.DomEvent.addListener(window,"resize",this.invalidateSize,this)},_onMouseClick:function(a){if(!this.dragging||!this.dragging.moved())this.fire("pre"+a.type),this._fireMouseEvent(a)},_fireMouseEvent:function(a){var b=a.type,b=b=="mouseenter"?"mouseover":b=="mouseleave"?"mouseout":b;this.hasEventListeners(b)&&
-this.fire(b,{latlng:this.mouseEventToLatLng(a),layerPoint:this.mouseEventToLayerPoint(a)})},_initInteraction:function(){var a={dragging:L.Handler.MapDrag,touchZoom:L.Handler.TouchZoom,doubleClickZoom:L.Handler.DoubleClickZoom,scrollWheelZoom:L.Handler.ScrollWheelZoom,shiftDragZoom:L.Handler.ShiftDragZoom},b;for(b in a)a.hasOwnProperty(b)&&a[b]&&(this[b]=new a[b](this),this.options[b]&&this[b].enable())},_onTileLayerLoad:function(){this._tileLayersToLoad--;if(this._tileLayersNum&&!this._tileLayersToLoad&&
-this._tileBg)clearTimeout(this._clearTileBgTimer),this._clearTileBgTimer=setTimeout(L.Util.bind(this._clearTileBg,this),500)},_getTopLeftPoint:function(){if(!this._loaded)throw Error("Set map center and zoom first.");return this._initialTopLeftPoint.subtract(L.DomUtil.getPosition(this._mapPane))},_getNewTopLeftPoint:function(a){var b=this.getSize().divideBy(2);return this.project(a).subtract(b).round()},_limitZoom:function(a){var b=this.getMinZoom(),c=this.getMaxZoom();return Math.max(b,Math.min(c,
-a))}});L.Map.include({locate:function(a){var b={timeout:1E4};L.Util.extend(b,a);navigator.geolocation?navigator.geolocation.getCurrentPosition(L.Util.bind(this._handleGeolocationResponse,this),L.Util.bind(this._handleGeolocationError,this),b):this.fire("locationerror",{code:0,message:"Geolocation not supported."});return this},locateAndSetView:function(a,b){this._setViewOnLocate=!0;this._maxLocateZoom=a||Infinity;return this.locate(b)},_handleGeolocationError:function(a){var a=a.code,b=a==1?"permission denied":
-a==2?"position unavailable":"timeout";if(this._setViewOnLocate)this.fitWorld(),this._setViewOnLocate=!1;this.fire("locationerror",{code:a,message:"Geolocation error: "+b+"."})},_handleGeolocationResponse:function(a){var b=180*a.coords.accuracy/4E7,c=b*2,d=a.coords.latitude,e=a.coords.longitude,f=new L.LatLng(d-b,e-c),b=new L.LatLng(d+b,e+c),f=new L.LatLngBounds(f,b);if(this._setViewOnLocate)b=Math.min(this.getBoundsZoom(f),this._maxLocateZoom),this.setView(f.getCenter(),b),this._setViewOnLocate=!1;
-this.fire("locationfound",{latlng:new L.LatLng(d,e),bounds:f,accuracy:a.coords.accuracy})}});L.Map.include({openPopup:function(a){this.closePopup();this._popup=a;return this.addLayer(a)},closePopup:function(){this._popup&&this.removeLayer(this._popup);return this}});L.Map.include(!L.Transition||!L.Transition.implemented()?{}:{setView:function(a,b,c){var b=this._limitZoom(b),d=this._zoom!=b;if(this._loaded&&!c&&this._layers&&(c=this._getNewTopLeftPoint(a).subtract(this._getTopLeftPoint()),d?this._zoomToIfCenterInView&&this._zoomToIfCenterInView(a,b,c):this._panByIfClose(c)))return this;this._resetView(a,b);return this},panBy:function(a){if(!this._panTransition)this._panTransition=new L.Transition(this._mapPane,{duration:0.3}),this._panTransition.on("step",this._onPanTransitionStep,
-this),this._panTransition.on("end",this._onPanTransitionEnd,this);this.fire(this,"movestart");this._panTransition.run({position:L.DomUtil.getPosition(this._mapPane).subtract(a)});return this},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){this.fire("moveend")},_panByIfClose:function(a){if(this._offsetIsWithinView(a))return this.panBy(a),!0;return!1},_offsetIsWithinView:function(a,b){var c=b||1,d=this.getSize();return Math.abs(a.x)<=d.x*c&&Math.abs(a.y)<=d.y*c}});L.Map.include(!L.DomUtil.TRANSITION?{}:{_zoomToIfCenterInView:function(a,b,c){if(this._animatingZoom)return!0;if(!this.options.zoomAnimation)return!1;var d=Math.pow(2,b-this._zoom),c=c.divideBy(1-1/d);if(!this._offsetIsWithinView(c,1))return!1;this._mapPane.className+=" leaflet-zoom-anim";c=this.containerPointToLayerPoint(this.getSize().divideBy(2)).add(c);this._prepareTileBg();this._runAnimation(a,b,d,c);return!0},_runAnimation:function(a,b,c,d){this._animatingZoom=!0;this._animateToCenter=a;this._animateToZoom=
-b;a=L.DomUtil.TRANSFORM;if(L.Browser.gecko||window.opera)this._tileBg.style[a]+=" translate(0,0)";L.Browser.android?(this._tileBg.style[a+"Origin"]=d.x+"px "+d.y+"px",c="scale("+c+")"):c=L.DomUtil.getScaleString(c,d);L.Util.falseFn(this._tileBg.offsetWidth);d={};d[a]=this._tileBg.style[a]+" "+c;this._tileBg.transition.run(d)},_prepareTileBg:function(){if(!this._tileBg)this._tileBg=this._createPane("leaflet-tile-pane",this._mapPane),this._tileBg.style.zIndex=1;var a=this._tilePane,b=this._tileBg;b.style[L.DomUtil.TRANSFORM]=
-"";b.style.visibility="hidden";b.empty=!0;a.empty=!1;this._tilePane=this._panes.tilePane=b;this._tileBg=a;if(!this._tileBg.transition)this._tileBg.transition=new L.Transition(this._tileBg,{duration:0.3,easing:"cubic-bezier(0.25,0.1,0.25,0.75)"}),this._tileBg.transition.on("end",this._onZoomTransitionEnd,this);this._stopLoadingBgTiles()},_stopLoadingBgTiles:function(){for(var a=[].slice.call(this._tileBg.getElementsByTagName("img")),b=0,c=a.length;b<c;b++)if(!a[b].complete)a[b].src="",a[b].parentNode.removeChild(a[b])},
-_onZoomTransitionEnd:function(){this._restoreTileFront();L.Util.falseFn(this._tileBg.offsetWidth);this._resetView(this._animateToCenter,this._animateToZoom,!0);this._mapPane.className=this._mapPane.className.replace(" leaflet-zoom-anim","");this._animatingZoom=!1},_restoreTileFront:function(){this._tilePane.innerHTML="";this._tilePane.style.visibility="";this._tilePane.style.zIndex=2;this._tileBg.style.zIndex=1},_clearTileBg:function(){if(!this._animatingZoom&&!this.touchZoom._zooming)this._tileBg.innerHTML=
-""}});L.Map.include({addControl:function(a){a.onAdd(this);var b=a.getPosition(),c=this._controlCorners[b],a=a.getContainer();L.DomUtil.addClass(a,"leaflet-control");b.indexOf("bottom")!=-1?c.insertBefore(a,c.firstChild):c.appendChild(a);return this},removeControl:function(a){var b=this._controlCorners[a.getPosition()],c=a.getContainer();b.removeChild(c);if(a.onRemove)a.onRemove(this);return this},_initControlPos:function(){var a=this._controlCorners={},b=L.DomUtil.create("div","leaflet-control-container",
-this._container);L.Browser.mobileWebkit&&(b.className+=" leaflet-big-buttons");a.topLeft=L.DomUtil.create("div","leaflet-top leaflet-left",b);a.topRight=L.DomUtil.create("div","leaflet-top leaflet-right",b);a.bottomLeft=L.DomUtil.create("div","leaflet-bottom leaflet-left",b);a.bottomRight=L.DomUtil.create("div","leaflet-bottom leaflet-right",b)}});
diff --git a/extlib/leaflet/lib/closure-compiler/COPYING b/extlib/leaflet/lib/closure-compiler/COPYING
deleted file mode 100644
index d6456956..00000000
--- a/extlib/leaflet/lib/closure-compiler/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/extlib/leaflet/lib/closure-compiler/README b/extlib/leaflet/lib/closure-compiler/README
deleted file mode 100644
index ece71758..00000000
--- a/extlib/leaflet/lib/closure-compiler/README
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2009 The Closure Compiler Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//
-// Contents
-//
-
-The Closure Compiler performs checking, instrumentation, and
-optimizations on JavaScript code. The purpose of this README is to
-explain how to build and run the Closure Compiler.
-
-The Closure Compiler requires Java 6 or higher.
-http://www.java.com/
-
-
-//
-// Building The Closure Compiler
-//
-
-There are three ways to get a Closure Compiler executable.
-
-1) Use one we built for you.
-
-Pre-built Closure binaries can be found at
-http://code.google.com/p/closure-compiler/downloads/list
-
-
-2) Check out the source and build it with Apache Ant.
-
-First, check out the full source tree of the Closure Compiler. There
-are instructions on how to do this at the project site.
-http://code.google.com/p/closure-compiler/source/checkout
-
-Apache Ant is a cross-platform build tool.
-http://ant.apache.org/
-
-At the root of the source tree, there is an Ant file named
-build.xml. To use it, navigate to the same directory and type the
-command
-
-ant jar
-
-This will produce a jar file called "build/compiler.jar".
-
-
-3) Check out the source and build it with Eclipse.
-
-Eclipse is a cross-platform IDE.
-http://www.eclipse.org/
-
-Under Eclipse's File menu, click "New > Project ..." and create a
-"Java Project."  You will see an options screen. Give the project a
-name, select "Create project from existing source," and choose the
-root of the checked-out source tree as the existing directory. Verify
-that you are using JRE version 6 or higher.
-
-Eclipse can use the build.xml file to discover rules. When you
-navigate to the build.xml file, you will see all the build rules in
-the "Outline" pane. Run the "jar" rule to build the compiler in
-build/compiler.jar.
-
-
-//
-// Running The Closure Compiler
-//
-
-Once you have the jar binary, running the Closure Compiler is straightforward.
-
-On the command line, type
-
-java -jar compiler.jar
-
-This starts the compiler in interactive mode. Type
-
-var x = 17 + 25;
-
-then hit "Enter", then hit "Ctrl-Z" (on Windows) or "Ctrl-D" (on Mac or Linux)
-and "Enter" again. The Compiler will respond:
-
-var x=42;
-
-The Closure Compiler has many options for reading input from a file,
-writing output to a file, checking your code, and running
-optimizations. To learn more, type
-
-java -jar compiler.jar --help
-
-You can read more detailed documentation about the many flags at
-http://code.google.com/closure/compiler/docs/gettingstarted_app.html
-
-
-//
-// Compiling Multiple Scripts
-//
-
-If you have multiple scripts, you should compile them all together with
-one compile command.
-
-java -jar compiler.jar --js=in1.js --js=in2.js ... --js_output_file=out.js
-
-The Closure Compiler will concatenate the files in the order they're
-passed at the command line.
-
-If you need to compile many, many scripts together, you may start to
-run into problems with managing dependencies between scripts. You
-should check out the Closure Library. It contains functions for
-enforcing dependencies between scripts, and a tool called calcdeps.py
-that knows how to give scripts to the Closure Compiler in the right
-order.
-
-http://code.google.com/p/closure-library/
-
-//
-// Licensing
-//
-
-Unless otherwise stated, all source files are licensed under
-the Apache License, Version 2.0.
-
-
------
-Code under:
-src/com/google/javascript/rhino
-test/com/google/javascript/rhino
-
-URL: http://www.mozilla.org/rhino
-Version:  1.5R3, with heavy modifications
-License:  Netscape Public License and MPL / GPL dual license
-
-Description: A partial copy of Mozilla Rhino. Mozilla Rhino is an
-implementation of JavaScript for the JVM.  The JavaScript parser and
-the parse tree data structures were extracted and modified
-significantly for use by Google's JavaScript compiler.
-
-Local Modifications: The packages have been renamespaced. All code not
-relavant to parsing has been removed. A JSDoc parser and static typing
-system have been added.
-
-
------
-Code in:
-lib/libtrunk_rhino_parser_jarjared.jar
-
-Rhino
-URL: http://www.mozilla.org/rhino
-Version:  Trunk
-License:  Netscape Public License and MPL / GPL dual license
-
-Description: Mozilla Rhino is an implementation of JavaScript for the JVM.
-
-Local Modifications: None. We've used JarJar to renamespace the code
-post-compilation. See:
-http://code.google.com/p/jarjar/
-
-
------
-Code in:
-lib/args4j.jar
-
-Args4j
-URL: https://args4j.dev.java.net/
-Version: 2.0.12
-License: MIT
-
-Description:
-args4j is a small Java class library that makes it easy to parse command line
-options/arguments in your CUI application.
-
-Local Modifications: None.
-
-
------
-Code in:
-lib/guava.jar
-
-Guava Libraries
-URL: http://code.google.com/p/guava-libraries/
-Version:  r08
-License: Apache License 2.0
-
-Description: Google's core Java libraries.
-
-Local Modifications: None.
-
-
------
-Code in:
-lib/jsr305.jar
-
-Annotations for software defect detection
-URL: http://code.google.com/p/jsr-305/
-Version: svn revision 47
-License: BSD License
-
-Description: Annotations for software defect detection.
-
-Local Modifications: None.
-
-
-----
-Code in:
-lib/junit.jar
-
-JUnit
-URL:  http://sourceforge.net/projects/junit/
-Version:  4.8.2
-License:  Common Public License 1.0
-
-Description: A framework for writing and running automated tests in Java.
-
-Local Modifications: None.
-
-
----
-Code in:
-lib/protobuf-java.jar
-
-Protocol Buffers
-URL: http://code.google.com/p/protobuf/
-Version: 2.3.0
-License: New BSD License
-
-Description: Supporting libraries for protocol buffers,
-an encoding of structured data.
-
-Local Modifications: None
-
-
----
-Code in:
-lib/ant.jar
-lib/ant-launcher.jar
-
-URL: http://ant.apache.org/bindownload.cgi
-Version: 1.8.1
-License: Apache License 2.0
-Description:
-  Ant is a Java based build tool. In theory it is kind of like "make"
-  without make's wrinkles and with the full portability of pure java code.
-
-Local Modifications: None
-
-
----
-Code in:
-lib/json.jar
-URL: http://json.org/java/index.html
-Version: JSON version 20090211
-License: MIT license
-Description:
-JSON is a set of java files for use in transmitting data in JSON format.
-
-Local Modifications: None
-
----
-Code in:
-tools/maven-ant-tasks-2.1.1.jar
-URL: http://maven.apache.org
-Version 2.1.1
-License: Apache License 2.0
-Description:
-  Maven Ant tasks are used to manage dependencies and to install/deploy to
-  maven repositories.
-
-Local Modifications: None
diff --git a/extlib/leaflet/lib/closure-compiler/compiler.jar b/extlib/leaflet/lib/closure-compiler/compiler.jar
deleted file mode 100644
index 2f6837d3..00000000
--- a/extlib/leaflet/lib/closure-compiler/compiler.jar
+++ /dev/null
diff --git a/extlib/leaflet/lib/jasmine/jasmine-html.js b/extlib/leaflet/lib/jasmine/jasmine-html.js
deleted file mode 100644
index b4058216..00000000
--- a/extlib/leaflet/lib/jasmine/jasmine-html.js
+++ /dev/null
@@ -1,182 +0,0 @@
-jasmine.TrivialReporter = function(doc) {
-  this.document = doc || document;
-  this.suiteDivs = {};
-  this.logRunningSpecs = false;
-};
-
-jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
-  var el = document.createElement(type);
-
-  for (var i = 2; i < arguments.length; i++) {
-    var child = arguments[i];
-
-    if (typeof child === 'string') {
-      el.appendChild(document.createTextNode(child));
-    } else {
-      if (child) { el.appendChild(child); }
-    }
-  }
-
-  for (var attr in attrs) {
-    if (attr == "className") {
-      el[attr] = attrs[attr];
-    } else {
-      el.setAttribute(attr, attrs[attr]);
-    }
-  }
-
-  return el;
-};
-
-jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
-  var showPassed, showSkipped;
-
-  this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' },
-      this.createDom('div', { className: 'banner' },
-        this.createDom('div', { className: 'logo' },
-            "Jasmine",
-            this.createDom('span', { className: 'version' }, runner.env.versionString())),
-        this.createDom('div', { className: 'options' },
-            "Show ",
-            showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }),
-            this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "),
-            showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }),
-            this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped")
-            )
-          ),
-
-      this.runnerDiv = this.createDom('div', { className: 'runner running' },
-          this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
-          this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
-          this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, ""))
-      );
-
-  this.document.body.appendChild(this.outerDiv);
-
-  var suites = runner.suites();
-  for (var i = 0; i < suites.length; i++) {
-    var suite = suites[i];
-    var suiteDiv = this.createDom('div', { className: 'suite' },
-        this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"),
-        this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description));
-    this.suiteDivs[suite.id] = suiteDiv;
-    var parentDiv = this.outerDiv;
-    if (suite.parentSuite) {
-      parentDiv = this.suiteDivs[suite.parentSuite.id];
-    }
-    parentDiv.appendChild(suiteDiv);
-  }
-
-  this.startedAt = new Date();
-
-  var self = this;
-  showPassed.onchange = function(evt) {
-    if (evt.target.checked) {
-      self.outerDiv.className += ' show-passed';
-    } else {
-      self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
-    }
-  };
-
-  showSkipped.onchange = function(evt) {
-    if (evt.target.checked) {
-      self.outerDiv.className += ' show-skipped';
-    } else {
-      self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
-    }
-  };
-};
-
-jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
-  var results = runner.results();
-  var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
-  this.runnerDiv.setAttribute("class", className);
-  //do it twice for IE
-  this.runnerDiv.setAttribute("className", className);
-  var specs = runner.specs();
-  var specCount = 0;
-  for (var i = 0; i < specs.length; i++) {
-    if (this.specFilter(specs[i])) {
-      specCount++;
-    }
-  }
-  var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
-  message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
-  this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild);
-
-  this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
-};
-
-jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
-  var results = suite.results();
-  var status = results.passed() ? 'passed' : 'failed';
-  if (results.totalCount == 0) { // todo: change this to check results.skipped
-    status = 'skipped';
-  }
-  this.suiteDivs[suite.id].className += " " + status;
-};
-
-jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) {
-  if (this.logRunningSpecs) {
-    this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
-  }
-};
-
-jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
-  var results = spec.results();
-  var status = results.passed() ? 'passed' : 'failed';
-  if (results.skipped) {
-    status = 'skipped';
-  }
-  var specDiv = this.createDom('div', { className: 'spec '  + status },
-      this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"),
-      this.createDom('a', {
-        className: 'description',
-        href: '?spec=' + encodeURIComponent(spec.getFullName()),
-        title: spec.getFullName()
-      }, spec.description));
-
-
-  var resultItems = results.getItems();
-  var messagesDiv = this.createDom('div', { className: 'messages' });
-  for (var i = 0; i < resultItems.length; i++) {
-    var result = resultItems[i];
-
-    if (result.type == 'log') {
-      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
-    } else if (result.type == 'expect' && result.passed && !result.passed()) {
-      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
-
-      if (result.trace.stack) {
-        messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
-      }
-    }
-  }
-
-  if (messagesDiv.childNodes.length > 0) {
-    specDiv.appendChild(messagesDiv);
-  }
-
-  this.suiteDivs[spec.suite.id].appendChild(specDiv);
-};
-
-jasmine.TrivialReporter.prototype.log = function() {
-  var console = jasmine.getGlobal().console;
-  if (console && console.log) console.log.apply(console, arguments);
-};
-
-jasmine.TrivialReporter.prototype.getLocation = function() {
-  return this.document.location;
-};
-
-jasmine.TrivialReporter.prototype.specFilter = function(spec) {
-  var paramMap = {};
-  var params = this.getLocation().search.substring(1).split('&');
-  for (var i = 0; i < params.length; i++) {
-    var p = params[i].split('=');
-    paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
-  }
-
-  if (!paramMap["spec"]) return true;
-  return spec.getFullName().indexOf(paramMap["spec"]) == 0;
-};
diff --git a/extlib/leaflet/lib/jasmine/jasmine.css b/extlib/leaflet/lib/jasmine/jasmine.css
deleted file mode 100644
index 6583fe7c..00000000
--- a/extlib/leaflet/lib/jasmine/jasmine.css
+++ /dev/null
@@ -1,166 +0,0 @@
-body {
-  font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
-}
-
-
-.jasmine_reporter a:visited, .jasmine_reporter a {
-  color: #303; 
-}
-
-.jasmine_reporter a:hover, .jasmine_reporter a:active {
-  color: blue; 
-}
-
-.run_spec {
-  float:right;
-  padding-right: 5px;
-  font-size: .8em;
-  text-decoration: none;
-}
-
-.jasmine_reporter {
-  margin: 0 5px;
-}
-
-.banner {
-  color: #303;
-  background-color: #fef;
-  padding: 5px;
-}
-
-.logo {
-  float: left;
-  font-size: 1.1em;
-  padding-left: 5px;
-}
-
-.logo .version {
-  font-size: .6em;
-  padding-left: 1em;
-}
-
-.runner.running {
-  background-color: yellow;
-}
-
-
-.options {
-  text-align: right;
-  font-size: .8em;
-}
-
-
-
-
-.suite {
-  border: 1px outset gray;
-  margin: 5px 0;
-  padding-left: 1em;
-}
-
-.suite .suite {
-  margin: 5px; 
-}
-
-.suite.passed {
-  background-color: #dfd;
-}
-
-.suite.failed {
-  background-color: #fdd;
-}
-
-.spec {
-  margin: 5px;
-  padding-left: 1em;
-  clear: both;
-}
-
-.spec.failed, .spec.passed, .spec.skipped {
-  padding-bottom: 5px;
-  border: 1px solid gray;
-}
-
-.spec.failed {
-  background-color: #fbb;
-  border-color: red;
-}
-
-.spec.passed {
-  background-color: #bfb;
-  border-color: green;
-}
-
-.spec.skipped {
-  background-color: #bbb;
-}
-
-.messages {
-  border-left: 1px dashed gray;
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-.passed {
-  background-color: #cfc;
-  display: none;
-}
-
-.failed {
-  background-color: #fbb;
-}
-
-.skipped {
-  color: #777;
-  background-color: #eee;
-  display: none;
-}
-
-
-/*.resultMessage {*/
-  /*white-space: pre;*/
-/*}*/
-
-.resultMessage span.result {
-  display: block;
-  line-height: 2em;
-  color: black;
-}
-
-.resultMessage .mismatch {
-  color: black;
-}
-
-.stackTrace {
-  white-space: pre;
-  font-size: .8em;
-  margin-left: 10px;
-  max-height: 5em;
-  overflow: auto;
-  border: 1px inset red;
-  padding: 1em;
-  background: #eef;
-}
-
-.finished-at {
-  padding-left: 1em;
-  font-size: .6em;
-}
-
-.show-passed .passed,
-.show-skipped .skipped {
-  display: block;
-}
-
-
-#jasmine_content {
-  position:fixed;
-  right: 100%;
-}
-
-.runner {
-  border: 1px solid gray;
-  display: block;
-  margin: 5px 0;
-  padding: 2px 0 2px 10px;
-}
diff --git a/extlib/leaflet/lib/jasmine/jasmine.js b/extlib/leaflet/lib/jasmine/jasmine.js
deleted file mode 100644
index 3ace3bc4..00000000
--- a/extlib/leaflet/lib/jasmine/jasmine.js
+++ /dev/null
@@ -1,2421 +0,0 @@
-/**
- * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.
- *
- * @namespace
- */
-var jasmine = {};
-
-/**
- * @private
- */
-jasmine.unimplementedMethod_ = function() {
-  throw new Error("unimplemented method");
-};
-
-/**
- * Use <code>jasmine.undefined</code> instead of <code>undefined</code>, since <code>undefined</code> is just
- * a plain old variable and may be redefined by somebody else.
- *
- * @private
- */
-jasmine.undefined = jasmine.___undefined___;
-
-/**
- * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed.
- *
- */
-jasmine.DEFAULT_UPDATE_INTERVAL = 250;
-
-/**
- * Default timeout interval in milliseconds for waitsFor() blocks.
- */
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
-
-jasmine.getGlobal = function() {
-  function getGlobal() {
-    return this;
-  }
-
-  return getGlobal();
-};
-
-/**
- * Allows for bound functions to be compared.  Internal use only.
- *
- * @ignore
- * @private
- * @param base {Object} bound 'this' for the function
- * @param name {Function} function to find
- */
-jasmine.bindOriginal_ = function(base, name) {
-  var original = base[name];
-  if (original.apply) {
-    return function() {
-      return original.apply(base, arguments);
-    };
-  } else {
-    // IE support
-    return jasmine.getGlobal()[name];
-  }
-};
-
-jasmine.setTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'setTimeout');
-jasmine.clearTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearTimeout');
-jasmine.setInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'setInterval');
-jasmine.clearInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearInterval');
-
-jasmine.MessageResult = function(values) {
-  this.type = 'log';
-  this.values = values;
-  this.trace = new Error(); // todo: test better
-};
-
-jasmine.MessageResult.prototype.toString = function() {
-  var text = "";
-  for(var i = 0; i < this.values.length; i++) {
-    if (i > 0) text += " ";
-    if (jasmine.isString_(this.values[i])) {
-      text += this.values[i];
-    } else {
-      text += jasmine.pp(this.values[i]);
-    }
-  }
-  return text;
-};
-
-jasmine.ExpectationResult = function(params) {
-  this.type = 'expect';
-  this.matcherName = params.matcherName;
-  this.passed_ = params.passed;
-  this.expected = params.expected;
-  this.actual = params.actual;
-
-  this.message = this.passed_ ? 'Passed.' : params.message;
-  this.trace = this.passed_ ? '' : new Error(this.message);
-};
-
-jasmine.ExpectationResult.prototype.toString = function () {
-  return this.message;
-};
-
-jasmine.ExpectationResult.prototype.passed = function () {
-  return this.passed_;
-};
-
-/**
- * Getter for the Jasmine environment. Ensures one gets created
- */
-jasmine.getEnv = function() {
-  return jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env();
-};
-
-/**
- * @ignore
- * @private
- * @param value
- * @returns {Boolean}
- */
-jasmine.isArray_ = function(value) {
-  return jasmine.isA_("Array", value);  
-};
-
-/**
- * @ignore
- * @private
- * @param value
- * @returns {Boolean}
- */
-jasmine.isString_ = function(value) {
-  return jasmine.isA_("String", value);
-};
-
-/**
- * @ignore
- * @private
- * @param value
- * @returns {Boolean}
- */
-jasmine.isNumber_ = function(value) {
-  return jasmine.isA_("Number", value);
-};
-
-/**
- * @ignore
- * @private
- * @param {String} typeName
- * @param value
- * @returns {Boolean}
- */
-jasmine.isA_ = function(typeName, value) {
-  return Object.prototype.toString.apply(value) === '[object ' + typeName + ']';
-};
-
-/**
- * Pretty printer for expecations.  Takes any object and turns it into a human-readable string.
- *
- * @param value {Object} an object to be outputted
- * @returns {String}
- */
-jasmine.pp = function(value) {
-  var stringPrettyPrinter = new jasmine.StringPrettyPrinter();
-  stringPrettyPrinter.format(value);
-  return stringPrettyPrinter.string;
-};
-
-/**
- * Returns true if the object is a DOM Node.
- *
- * @param {Object} obj object to check
- * @returns {Boolean}
- */
-jasmine.isDomNode = function(obj) {
-  return obj['nodeType'] > 0;
-};
-
-/**
- * Returns a matchable 'generic' object of the class type.  For use in expecations of type when values don't matter.
- *
- * @example
- * // don't care about which function is passed in, as long as it's a function
- * expect(mySpy).toHaveBeenCalledWith(jasmine.any(Function));
- *
- * @param {Class} clazz
- * @returns matchable object of the type clazz
- */
-jasmine.any = function(clazz) {
-  return new jasmine.Matchers.Any(clazz);
-};
-
-/**
- * Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks.
- *
- * Spies should be created in test setup, before expectations.  They can then be checked, using the standard Jasmine
- * expectation syntax. Spies can be checked if they were called or not and what the calling params were.
- *
- * A Spy has the following fields: wasCalled, callCount, mostRecentCall, and argsForCall (see docs).
- *
- * Spies are torn down at the end of every spec.
- *
- * Note: Do <b>not</b> call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj.
- *
- * @example
- * // a stub
- * var myStub = jasmine.createSpy('myStub');  // can be used anywhere
- *
- * // spy example
- * var foo = {
- *   not: function(bool) { return !bool; }
- * }
- *
- * // actual foo.not will not be called, execution stops
- * spyOn(foo, 'not');
-
- // foo.not spied upon, execution will continue to implementation
- * spyOn(foo, 'not').andCallThrough();
- *
- * // fake example
- * var foo = {
- *   not: function(bool) { return !bool; }
- * }
- *
- * // foo.not(val) will return val
- * spyOn(foo, 'not').andCallFake(function(value) {return value;});
- *
- * // mock example
- * foo.not(7 == 7);
- * expect(foo.not).toHaveBeenCalled();
- * expect(foo.not).toHaveBeenCalledWith(true);
- *
- * @constructor
- * @see spyOn, jasmine.createSpy, jasmine.createSpyObj
- * @param {String} name
- */
-jasmine.Spy = function(name) {
-  /**
-   * The name of the spy, if provided.
-   */
-  this.identity = name || 'unknown';
-  /**
-   *  Is this Object a spy?
-   */
-  this.isSpy = true;
-  /**
-   * The actual function this spy stubs.
-   */
-  this.plan = function() {
-  };
-  /**
-   * Tracking of the most recent call to the spy.
-   * @example
-   * var mySpy = jasmine.createSpy('foo');
-   * mySpy(1, 2);
-   * mySpy.mostRecentCall.args = [1, 2];
-   */
-  this.mostRecentCall = {};
-
-  /**
-   * Holds arguments for each call to the spy, indexed by call count
-   * @example
-   * var mySpy = jasmine.createSpy('foo');
-   * mySpy(1, 2);
-   * mySpy(7, 8);
-   * mySpy.mostRecentCall.args = [7, 8];
-   * mySpy.argsForCall[0] = [1, 2];
-   * mySpy.argsForCall[1] = [7, 8];
-   */
-  this.argsForCall = [];
-  this.calls = [];
-};
-
-/**
- * Tells a spy to call through to the actual implemenatation.
- *
- * @example
- * var foo = {
- *   bar: function() { // do some stuff }
- * }
- *
- * // defining a spy on an existing property: foo.bar
- * spyOn(foo, 'bar').andCallThrough();
- */
-jasmine.Spy.prototype.andCallThrough = function() {
-  this.plan = this.originalValue;
-  return this;
-};
-
-/**
- * For setting the return value of a spy.
- *
- * @example
- * // defining a spy from scratch: foo() returns 'baz'
- * var foo = jasmine.createSpy('spy on foo').andReturn('baz');
- *
- * // defining a spy on an existing property: foo.bar() returns 'baz'
- * spyOn(foo, 'bar').andReturn('baz');
- *
- * @param {Object} value
- */
-jasmine.Spy.prototype.andReturn = function(value) {
-  this.plan = function() {
-    return value;
-  };
-  return this;
-};
-
-/**
- * For throwing an exception when a spy is called.
- *
- * @example
- * // defining a spy from scratch: foo() throws an exception w/ message 'ouch'
- * var foo = jasmine.createSpy('spy on foo').andThrow('baz');
- *
- * // defining a spy on an existing property: foo.bar() throws an exception w/ message 'ouch'
- * spyOn(foo, 'bar').andThrow('baz');
- *
- * @param {String} exceptionMsg
- */
-jasmine.Spy.prototype.andThrow = function(exceptionMsg) {
-  this.plan = function() {
-    throw exceptionMsg;
-  };
-  return this;
-};
-
-/**
- * Calls an alternate implementation when a spy is called.
- *
- * @example
- * var baz = function() {
- *   // do some stuff, return something
- * }
- * // defining a spy from scratch: foo() calls the function baz
- * var foo = jasmine.createSpy('spy on foo').andCall(baz);
- *
- * // defining a spy on an existing property: foo.bar() calls an anonymnous function
- * spyOn(foo, 'bar').andCall(function() { return 'baz';} );
- *
- * @param {Function} fakeFunc
- */
-jasmine.Spy.prototype.andCallFake = function(fakeFunc) {
-  this.plan = fakeFunc;
-  return this;
-};
-
-/**
- * Resets all of a spy's the tracking variables so that it can be used again.
- *
- * @example
- * spyOn(foo, 'bar');
- *
- * foo.bar();
- *
- * expect(foo.bar.callCount).toEqual(1);
- *
- * foo.bar.reset();
- *
- * expect(foo.bar.callCount).toEqual(0);
- */
-jasmine.Spy.prototype.reset = function() {
-  this.wasCalled = false;
-  this.callCount = 0;
-  this.argsForCall = [];
-  this.calls = [];
-  this.mostRecentCall = {};
-};
-
-jasmine.createSpy = function(name) {
-
-  var spyObj = function() {
-    spyObj.wasCalled = true;
-    spyObj.callCount++;
-    var args = jasmine.util.argsToArray(arguments);
-    spyObj.mostRecentCall.object = this;
-    spyObj.mostRecentCall.args = args;
-    spyObj.argsForCall.push(args);
-    spyObj.calls.push({object: this, args: args});
-    return spyObj.plan.apply(this, arguments);
-  };
-
-  var spy = new jasmine.Spy(name);
-
-  for (var prop in spy) {
-    spyObj[prop] = spy[prop];
-  }
-
-  spyObj.reset();
-
-  return spyObj;
-};
-
-/**
- * Determines whether an object is a spy.
- *
- * @param {jasmine.Spy|Object} putativeSpy
- * @returns {Boolean}
- */
-jasmine.isSpy = function(putativeSpy) {
-  return putativeSpy && putativeSpy.isSpy;
-};
-
-/**
- * Creates a more complicated spy: an Object that has every property a function that is a spy.  Used for stubbing something
- * large in one call.
- *
- * @param {String} baseName name of spy class
- * @param {Array} methodNames array of names of methods to make spies
- */
-jasmine.createSpyObj = function(baseName, methodNames) {
-  if (!jasmine.isArray_(methodNames) || methodNames.length == 0) {
-    throw new Error('createSpyObj requires a non-empty array of method names to create spies for');
-  }
-  var obj = {};
-  for (var i = 0; i < methodNames.length; i++) {
-    obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]);
-  }
-  return obj;
-};
-
-/**
- * All parameters are pretty-printed and concatenated together, then written to the current spec's output.
- *
- * Be careful not to leave calls to <code>jasmine.log</code> in production code.
- */
-jasmine.log = function() {
-  var spec = jasmine.getEnv().currentSpec;
-  spec.log.apply(spec, arguments);
-};
-
-/**
- * Function that installs a spy on an existing object's method name.  Used within a Spec to create a spy.
- *
- * @example
- * // spy example
- * var foo = {
- *   not: function(bool) { return !bool; }
- * }
- * spyOn(foo, 'not'); // actual foo.not will not be called, execution stops
- *
- * @see jasmine.createSpy
- * @param obj
- * @param methodName
- * @returns a Jasmine spy that can be chained with all spy methods
- */
-var spyOn = function(obj, methodName) {
-  return jasmine.getEnv().currentSpec.spyOn(obj, methodName);
-};
-
-/**
- * Creates a Jasmine spec that will be added to the current suite.
- *
- * // TODO: pending tests
- *
- * @example
- * it('should be true', function() {
- *   expect(true).toEqual(true);
- * });
- *
- * @param {String} desc description of this specification
- * @param {Function} func defines the preconditions and expectations of the spec
- */
-var it = function(desc, func) {
-  return jasmine.getEnv().it(desc, func);
-};
-
-/**
- * Creates a <em>disabled</em> Jasmine spec.
- *
- * A convenience method that allows existing specs to be disabled temporarily during development.
- *
- * @param {String} desc description of this specification
- * @param {Function} func defines the preconditions and expectations of the spec
- */
-var xit = function(desc, func) {
-  return jasmine.getEnv().xit(desc, func);
-};
-
-/**
- * Starts a chain for a Jasmine expectation.
- *
- * It is passed an Object that is the actual value and should chain to one of the many
- * jasmine.Matchers functions.
- *
- * @param {Object} actual Actual value to test against and expected value
- */
-var expect = function(actual) {
-  return jasmine.getEnv().currentSpec.expect(actual);
-};
-
-/**
- * Defines part of a jasmine spec.  Used in cominbination with waits or waitsFor in asynchrnous specs.
- *
- * @param {Function} func Function that defines part of a jasmine spec.
- */
-var runs = function(func) {
-  jasmine.getEnv().currentSpec.runs(func);
-};
-
-/**
- * Waits a fixed time period before moving to the next block.
- *
- * @deprecated Use waitsFor() instead
- * @param {Number} timeout milliseconds to wait
- */
-var waits = function(timeout) {
-  jasmine.getEnv().currentSpec.waits(timeout);
-};
-
-/**
- * Waits for the latchFunction to return true before proceeding to the next block.
- *
- * @param {Function} latchFunction
- * @param {String} optional_timeoutMessage
- * @param {Number} optional_timeout
- */
-var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
-  jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments);
-};
-
-/**
- * A function that is called before each spec in a suite.
- *
- * Used for spec setup, including validating assumptions.
- *
- * @param {Function} beforeEachFunction
- */
-var beforeEach = function(beforeEachFunction) {
-  jasmine.getEnv().beforeEach(beforeEachFunction);
-};
-
-/**
- * A function that is called after each spec in a suite.
- *
- * Used for restoring any state that is hijacked during spec execution.
- *
- * @param {Function} afterEachFunction
- */
-var afterEach = function(afterEachFunction) {
-  jasmine.getEnv().afterEach(afterEachFunction);
-};
-
-/**
- * Defines a suite of specifications.
- *
- * Stores the description and all defined specs in the Jasmine environment as one suite of specs. Variables declared
- * are accessible by calls to beforeEach, it, and afterEach. Describe blocks can be nested, allowing for specialization
- * of setup in some tests.
- *
- * @example
- * // TODO: a simple suite
- *
- * // TODO: a simple suite with a nested describe block
- *
- * @param {String} description A string, usually the class under test.
- * @param {Function} specDefinitions function that defines several specs.
- */
-var describe = function(description, specDefinitions) {
-  return jasmine.getEnv().describe(description, specDefinitions);
-};
-
-/**
- * Disables a suite of specifications.  Used to disable some suites in a file, or files, temporarily during development.
- *
- * @param {String} description A string, usually the class under test.
- * @param {Function} specDefinitions function that defines several specs.
- */
-var xdescribe = function(description, specDefinitions) {
-  return jasmine.getEnv().xdescribe(description, specDefinitions);
-};
-
-
-// Provide the XMLHttpRequest class for IE 5.x-6.x:
-jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() {
-  try {
-    return new ActiveXObject("Msxml2.XMLHTTP.6.0");
-  } catch(e) {
-  }
-  try {
-    return new ActiveXObject("Msxml2.XMLHTTP.3.0");
-  } catch(e) {
-  }
-  try {
-    return new ActiveXObject("Msxml2.XMLHTTP");
-  } catch(e) {
-  }
-  try {
-    return new ActiveXObject("Microsoft.XMLHTTP");
-  } catch(e) {
-  }
-  throw new Error("This browser does not support XMLHttpRequest.");
-} : XMLHttpRequest;
-/**
- * @namespace
- */
-jasmine.util = {};
-
-/**
- * Declare that a child class inherit it's prototype from the parent class.
- *
- * @private
- * @param {Function} childClass
- * @param {Function} parentClass
- */
-jasmine.util.inherit = function(childClass, parentClass) {
-  /**
-   * @private
-   */
-  var subclass = function() {
-  };
-  subclass.prototype = parentClass.prototype;
-  childClass.prototype = new subclass;
-};
-
-jasmine.util.formatException = function(e) {
-  var lineNumber;
-  if (e.line) {
-    lineNumber = e.line;
-  }
-  else if (e.lineNumber) {
-    lineNumber = e.lineNumber;
-  }
-
-  var file;
-
-  if (e.sourceURL) {
-    file = e.sourceURL;
-  }
-  else if (e.fileName) {
-    file = e.fileName;
-  }
-
-  var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString();
-
-  if (file && lineNumber) {
-    message += ' in ' + file + ' (line ' + lineNumber + ')';
-  }
-
-  return message;
-};
-
-jasmine.util.htmlEscape = function(str) {
-  if (!str) return str;
-  return str.replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;');
-};
-
-jasmine.util.argsToArray = function(args) {
-  var arrayOfArgs = [];
-  for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]);
-  return arrayOfArgs;
-};
-
-jasmine.util.extend = function(destination, source) {
-  for (var property in source) destination[property] = source[property];
-  return destination;
-};
-
-/**
- * Environment for Jasmine
- *
- * @constructor
- */
-jasmine.Env = function() {
-  this.currentSpec = null;
-  this.currentSuite = null;
-  this.currentRunner_ = new jasmine.Runner(this);
-
-  this.reporter = new jasmine.MultiReporter();
-
-  this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL;
-  this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-  this.lastUpdate = 0;
-  this.specFilter = function() {
-    return true;
-  };
-
-  this.nextSpecId_ = 0;
-  this.nextSuiteId_ = 0;
-  this.equalityTesters_ = [];
-
-  // wrap matchers
-  this.matchersClass = function() {
-    jasmine.Matchers.apply(this, arguments);
-  };
-  jasmine.util.inherit(this.matchersClass, jasmine.Matchers);
-
-  jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass);
-};
-
-
-jasmine.Env.prototype.setTimeout = jasmine.setTimeout;
-jasmine.Env.prototype.clearTimeout = jasmine.clearTimeout;
-jasmine.Env.prototype.setInterval = jasmine.setInterval;
-jasmine.Env.prototype.clearInterval = jasmine.clearInterval;
-
-/**
- * @returns an object containing jasmine version build info, if set.
- */
-jasmine.Env.prototype.version = function () {
-  if (jasmine.version_) {
-    return jasmine.version_;
-  } else {
-    throw new Error('Version not set');
-  }
-};
-
-/**
- * @returns string containing jasmine version build info, if set.
- */
-jasmine.Env.prototype.versionString = function() {
-  if (jasmine.version_) {
-    var version = this.version();
-    return version.major + "." + version.minor + "." + version.build + " revision " + version.revision;
-  } else {
-    return "version unknown";
-  }
-};
-
-/**
- * @returns a sequential integer starting at 0
- */
-jasmine.Env.prototype.nextSpecId = function () {
-  return this.nextSpecId_++;
-};
-
-/**
- * @returns a sequential integer starting at 0
- */
-jasmine.Env.prototype.nextSuiteId = function () {
-  return this.nextSuiteId_++;
-};
-
-/**
- * Register a reporter to receive status updates from Jasmine.
- * @param {jasmine.Reporter} reporter An object which will receive status updates.
- */
-jasmine.Env.prototype.addReporter = function(reporter) {
-  this.reporter.addReporter(reporter);
-};
-
-jasmine.Env.prototype.execute = function() {
-  this.currentRunner_.execute();
-};
-
-jasmine.Env.prototype.describe = function(description, specDefinitions) {
-  var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite);
-
-  var parentSuite = this.currentSuite;
-  if (parentSuite) {
-    parentSuite.add(suite);
-  } else {
-    this.currentRunner_.add(suite);
-  }
-
-  this.currentSuite = suite;
-
-  var declarationError = null;
-  try {
-    specDefinitions.call(suite);
-  } catch(e) {
-    declarationError = e;
-  }
-
-  this.currentSuite = parentSuite;
-
-  if (declarationError) {
-    this.it("encountered a declaration exception", function() {
-      throw declarationError;
-    });
-  }
-
-  return suite;
-};
-
-jasmine.Env.prototype.beforeEach = function(beforeEachFunction) {
-  if (this.currentSuite) {
-    this.currentSuite.beforeEach(beforeEachFunction);
-  } else {
-    this.currentRunner_.beforeEach(beforeEachFunction);
-  }
-};
-
-jasmine.Env.prototype.currentRunner = function () {
-  return this.currentRunner_;
-};
-
-jasmine.Env.prototype.afterEach = function(afterEachFunction) {
-  if (this.currentSuite) {
-    this.currentSuite.afterEach(afterEachFunction);
-  } else {
-    this.currentRunner_.afterEach(afterEachFunction);
-  }
-
-};
-
-jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) {
-  return {
-    execute: function() {
-    }
-  };
-};
-
-jasmine.Env.prototype.it = function(description, func) {
-  var spec = new jasmine.Spec(this, this.currentSuite, description);
-  this.currentSuite.add(spec);
-  this.currentSpec = spec;
-
-  if (func) {
-    spec.runs(func);
-  }
-
-  return spec;
-};
-
-jasmine.Env.prototype.xit = function(desc, func) {
-  return {
-    id: this.nextSpecId(),
-    runs: function() {
-    }
-  };
-};
-
-jasmine.Env.prototype.compareObjects_ = function(a, b, mismatchKeys, mismatchValues) {
-  if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) {
-    return true;
-  }
-
-  a.__Jasmine_been_here_before__ = b;
-  b.__Jasmine_been_here_before__ = a;
-
-  var hasKey = function(obj, keyName) {
-    return obj != null && obj[keyName] !== jasmine.undefined;
-  };
-
-  for (var property in b) {
-    if (!hasKey(a, property) && hasKey(b, property)) {
-      mismatchKeys.push("expected has key '" + property + "', but missing from actual.");
-    }
-  }
-  for (property in a) {
-    if (!hasKey(b, property) && hasKey(a, property)) {
-      mismatchKeys.push("expected missing key '" + property + "', but present in actual.");
-    }
-  }
-  for (property in b) {
-    if (property == '__Jasmine_been_here_before__') continue;
-    if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) {
-      mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual.");
-    }
-  }
-
-  if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) {
-    mismatchValues.push("arrays were not the same length");
-  }
-
-  delete a.__Jasmine_been_here_before__;
-  delete b.__Jasmine_been_here_before__;
-  return (mismatchKeys.length == 0 && mismatchValues.length == 0);
-};
-
-jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) {
-  mismatchKeys = mismatchKeys || [];
-  mismatchValues = mismatchValues || [];
-
-  for (var i = 0; i < this.equalityTesters_.length; i++) {
-    var equalityTester = this.equalityTesters_[i];
-    var result = equalityTester(a, b, this, mismatchKeys, mismatchValues);
-    if (result !== jasmine.undefined) return result;
-  }
-
-  if (a === b) return true;
-
-  if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) {
-    return (a == jasmine.undefined && b == jasmine.undefined);
-  }
-
-  if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) {
-    return a === b;
-  }
-
-  if (a instanceof Date && b instanceof Date) {
-    return a.getTime() == b.getTime();
-  }
-
-  if (a instanceof jasmine.Matchers.Any) {
-    return a.matches(b);
-  }
-
-  if (b instanceof jasmine.Matchers.Any) {
-    return b.matches(a);
-  }
-
-  if (jasmine.isString_(a) && jasmine.isString_(b)) {
-    return (a == b);
-  }
-
-  if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) {
-    return (a == b);
-  }
-
-  if (typeof a === "object" && typeof b === "object") {
-    return this.compareObjects_(a, b, mismatchKeys, mismatchValues);
-  }
-
-  //Straight check
-  return (a === b);
-};
-
-jasmine.Env.prototype.contains_ = function(haystack, needle) {
-  if (jasmine.isArray_(haystack)) {
-    for (var i = 0; i < haystack.length; i++) {
-      if (this.equals_(haystack[i], needle)) return true;
-    }
-    return false;
-  }
-  return haystack.indexOf(needle) >= 0;
-};
-
-jasmine.Env.prototype.addEqualityTester = function(equalityTester) {
-  this.equalityTesters_.push(equalityTester);
-};
-/** No-op base class for Jasmine reporters.
- *
- * @constructor
- */
-jasmine.Reporter = function() {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportRunnerStarting = function(runner) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportRunnerResults = function(runner) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportSuiteResults = function(suite) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportSpecStarting = function(spec) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportSpecResults = function(spec) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.log = function(str) {
-};
-
-/**
- * Blocks are functions with executable code that make up a spec.
- *
- * @constructor
- * @param {jasmine.Env} env
- * @param {Function} func
- * @param {jasmine.Spec} spec
- */
-jasmine.Block = function(env, func, spec) {
-  this.env = env;
-  this.func = func;
-  this.spec = spec;
-};
-
-jasmine.Block.prototype.execute = function(onComplete) {  
-  try {
-    this.func.apply(this.spec);
-  } catch (e) {
-    this.spec.fail(e);
-  }
-  onComplete();
-};
-/** JavaScript API reporter.
- *
- * @constructor
- */
-jasmine.JsApiReporter = function() {
-  this.started = false;
-  this.finished = false;
-  this.suites_ = [];
-  this.results_ = {};
-};
-
-jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) {
-  this.started = true;
-  var suites = runner.topLevelSuites();
-  for (var i = 0; i < suites.length; i++) {
-    var suite = suites[i];
-    this.suites_.push(this.summarize_(suite));
-  }
-};
-
-jasmine.JsApiReporter.prototype.suites = function() {
-  return this.suites_;
-};
-
-jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) {
-  var isSuite = suiteOrSpec instanceof jasmine.Suite;
-  var summary = {
-    id: suiteOrSpec.id,
-    name: suiteOrSpec.description,
-    type: isSuite ? 'suite' : 'spec',
-    children: []
-  };
-  
-  if (isSuite) {
-    var children = suiteOrSpec.children();
-    for (var i = 0; i < children.length; i++) {
-      summary.children.push(this.summarize_(children[i]));
-    }
-  }
-  return summary;
-};
-
-jasmine.JsApiReporter.prototype.results = function() {
-  return this.results_;
-};
-
-jasmine.JsApiReporter.prototype.resultsForSpec = function(specId) {
-  return this.results_[specId];
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.reportRunnerResults = function(runner) {
-  this.finished = true;
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.reportSuiteResults = function(suite) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) {
-  this.results_[spec.id] = {
-    messages: spec.results().getItems(),
-    result: spec.results().failedCount > 0 ? "failed" : "passed"
-  };
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.log = function(str) {
-};
-
-jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){
-  var results = {};
-  for (var i = 0; i < specIds.length; i++) {
-    var specId = specIds[i];
-    results[specId] = this.summarizeResult_(this.results_[specId]);
-  }
-  return results;
-};
-
-jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){
-  var summaryMessages = [];
-  var messagesLength = result.messages.length;
-  for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) {
-    var resultMessage = result.messages[messageIndex];
-    summaryMessages.push({
-      text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined,
-      passed: resultMessage.passed ? resultMessage.passed() : true,
-      type: resultMessage.type,
-      message: resultMessage.message,
-      trace: {
-        stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined
-      }
-    });
-  }
-
-  return {
-    result : result.result,
-    messages : summaryMessages
-  };
-};
-
-/**
- * @constructor
- * @param {jasmine.Env} env
- * @param actual
- * @param {jasmine.Spec} spec
- */
-jasmine.Matchers = function(env, actual, spec, opt_isNot) {
-  this.env = env;
-  this.actual = actual;
-  this.spec = spec;
-  this.isNot = opt_isNot || false;
-  this.reportWasCalled_ = false;
-};
-
-// todo: @deprecated as of Jasmine 0.11, remove soon [xw]
-jasmine.Matchers.pp = function(str) {
-  throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!");
-};
-
-// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw]
-jasmine.Matchers.prototype.report = function(result, failing_message, details) {
-  throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs");
-};
-
-jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) {
-  for (var methodName in prototype) {
-    if (methodName == 'report') continue;
-    var orig = prototype[methodName];
-    matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig);
-  }
-};
-
-jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) {
-  return function() {
-    var matcherArgs = jasmine.util.argsToArray(arguments);
-    var result = matcherFunction.apply(this, arguments);
-
-    if (this.isNot) {
-      result = !result;
-    }
-
-    if (this.reportWasCalled_) return result;
-
-    var message;
-    if (!result) {
-      if (this.message) {
-        message = this.message.apply(this, arguments);
-        if (jasmine.isArray_(message)) {
-          message = message[this.isNot ? 1 : 0];
-        }
-      } else {
-        var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); });
-        message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate;
-        if (matcherArgs.length > 0) {
-          for (var i = 0; i < matcherArgs.length; i++) {
-            if (i > 0) message += ",";
-            message += " " + jasmine.pp(matcherArgs[i]);
-          }
-        }
-        message += ".";
-      }
-    }
-    var expectationResult = new jasmine.ExpectationResult({
-      matcherName: matcherName,
-      passed: result,
-      expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0],
-      actual: this.actual,
-      message: message
-    });
-    this.spec.addMatcherResult(expectationResult);
-    return jasmine.undefined;
-  };
-};
-
-
-
-
-/**
- * toBe: compares the actual to the expected using ===
- * @param expected
- */
-jasmine.Matchers.prototype.toBe = function(expected) {
-  return this.actual === expected;
-};
-
-/**
- * toNotBe: compares the actual to the expected using !==
- * @param expected
- * @deprecated as of 1.0. Use not.toBe() instead.
- */
-jasmine.Matchers.prototype.toNotBe = function(expected) {
-  return this.actual !== expected;
-};
-
-/**
- * toEqual: compares the actual to the expected using common sense equality. Handles Objects, Arrays, etc.
- *
- * @param expected
- */
-jasmine.Matchers.prototype.toEqual = function(expected) {
-  return this.env.equals_(this.actual, expected);
-};
-
-/**
- * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual
- * @param expected
- * @deprecated as of 1.0. Use not.toNotEqual() instead.
- */
-jasmine.Matchers.prototype.toNotEqual = function(expected) {
-  return !this.env.equals_(this.actual, expected);
-};
-
-/**
- * Matcher that compares the actual to the expected using a regular expression.  Constructs a RegExp, so takes
- * a pattern or a String.
- *
- * @param expected
- */
-jasmine.Matchers.prototype.toMatch = function(expected) {
-  return new RegExp(expected).test(this.actual);
-};
-
-/**
- * Matcher that compares the actual to the expected using the boolean inverse of jasmine.Matchers.toMatch
- * @param expected
- * @deprecated as of 1.0. Use not.toMatch() instead.
- */
-jasmine.Matchers.prototype.toNotMatch = function(expected) {
-  return !(new RegExp(expected).test(this.actual));
-};
-
-/**
- * Matcher that compares the actual to jasmine.undefined.
- */
-jasmine.Matchers.prototype.toBeDefined = function() {
-  return (this.actual !== jasmine.undefined);
-};
-
-/**
- * Matcher that compares the actual to jasmine.undefined.
- */
-jasmine.Matchers.prototype.toBeUndefined = function() {
-  return (this.actual === jasmine.undefined);
-};
-
-/**
- * Matcher that compares the actual to null.
- */
-jasmine.Matchers.prototype.toBeNull = function() {
-  return (this.actual === null);
-};
-
-/**
- * Matcher that boolean not-nots the actual.
- */
-jasmine.Matchers.prototype.toBeTruthy = function() {
-  return !!this.actual;
-};
-
-
-/**
- * Matcher that boolean nots the actual.
- */
-jasmine.Matchers.prototype.toBeFalsy = function() {
-  return !this.actual;
-};
-
-
-/**
- * Matcher that checks to see if the actual, a Jasmine spy, was called.
- */
-jasmine.Matchers.prototype.toHaveBeenCalled = function() {
-  if (arguments.length > 0) {
-    throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith');
-  }
-
-  if (!jasmine.isSpy(this.actual)) {
-    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
-  }
-
-  this.message = function() {
-    return [
-      "Expected spy " + this.actual.identity + " to have been called.",
-      "Expected spy " + this.actual.identity + " not to have been called."
-    ];
-  };
-
-  return this.actual.wasCalled;
-};
-
-/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */
-jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCalled;
-
-/**
- * Matcher that checks to see if the actual, a Jasmine spy, was not called.
- *
- * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead
- */
-jasmine.Matchers.prototype.wasNotCalled = function() {
-  if (arguments.length > 0) {
-    throw new Error('wasNotCalled does not take arguments');
-  }
-
-  if (!jasmine.isSpy(this.actual)) {
-    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
-  }
-
-  this.message = function() {
-    return [
-      "Expected spy " + this.actual.identity + " to not have been called.",
-      "Expected spy " + this.actual.identity + " to have been called."
-    ];
-  };
-
-  return !this.actual.wasCalled;
-};
-
-/**
- * Matcher that checks to see if the actual, a Jasmine spy, was called with a set of parameters.
- *
- * @example
- *
- */
-jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
-  var expectedArgs = jasmine.util.argsToArray(arguments);
-  if (!jasmine.isSpy(this.actual)) {
-    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
-  }
-  this.message = function() {
-    if (this.actual.callCount == 0) {
-      // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
-      return [
-        "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
-        "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
-      ];
-    } else {
-      return [
-        "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
-        "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
-      ];
-    }
-  };
-
-  return this.env.contains_(this.actual.argsForCall, expectedArgs);
-};
-
-/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */
-jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith;
-
-/** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */
-jasmine.Matchers.prototype.wasNotCalledWith = function() {
-  var expectedArgs = jasmine.util.argsToArray(arguments);
-  if (!jasmine.isSpy(this.actual)) {
-    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
-  }
-
-  this.message = function() {
-    return [
-      "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was",
-      "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was"
-    ]
-  };
-
-  return !this.env.contains_(this.actual.argsForCall, expectedArgs);
-};
-
-/**
- * Matcher that checks that the expected item is an element in the actual Array.
- *
- * @param {Object} expected
- */
-jasmine.Matchers.prototype.toContain = function(expected) {
-  return this.env.contains_(this.actual, expected);
-};
-
-/**
- * Matcher that checks that the expected item is NOT an element in the actual Array.
- *
- * @param {Object} expected
- * @deprecated as of 1.0. Use not.toNotContain() instead.
- */
-jasmine.Matchers.prototype.toNotContain = function(expected) {
-  return !this.env.contains_(this.actual, expected);
-};
-
-jasmine.Matchers.prototype.toBeLessThan = function(expected) {
-  return this.actual < expected;
-};
-
-jasmine.Matchers.prototype.toBeGreaterThan = function(expected) {
-  return this.actual > expected;
-};
-
-/**
- * Matcher that checks that the expected exception was thrown by the actual.
- *
- * @param {String} expected
- */
-jasmine.Matchers.prototype.toThrow = function(expected) {
-  var result = false;
-  var exception;
-  if (typeof this.actual != 'function') {
-    throw new Error('Actual is not a function');
-  }
-  try {
-    this.actual();
-  } catch (e) {
-    exception = e;
-  }
-  if (exception) {
-    result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected));
-  }
-
-  var not = this.isNot ? "not " : "";
-
-  this.message = function() {
-    if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) {
-      return ["Expected function " + not + "to throw", expected ? expected.message || expected : " an exception", ", but it threw", exception.message || exception].join(' ');
-    } else {
-      return "Expected function to throw an exception.";
-    }
-  };
-
-  return result;
-};
-
-jasmine.Matchers.Any = function(expectedClass) {
-  this.expectedClass = expectedClass;
-};
-
-jasmine.Matchers.Any.prototype.matches = function(other) {
-  if (this.expectedClass == String) {
-    return typeof other == 'string' || other instanceof String;
-  }
-
-  if (this.expectedClass == Number) {
-    return typeof other == 'number' || other instanceof Number;
-  }
-
-  if (this.expectedClass == Function) {
-    return typeof other == 'function' || other instanceof Function;
-  }
-
-  if (this.expectedClass == Object) {
-    return typeof other == 'object';
-  }
-
-  return other instanceof this.expectedClass;
-};
-
-jasmine.Matchers.Any.prototype.toString = function() {
-  return '<jasmine.any(' + this.expectedClass + ')>';
-};
-
-/**
- * @constructor
- */
-jasmine.MultiReporter = function() {
-  this.subReporters_ = [];
-};
-jasmine.util.inherit(jasmine.MultiReporter, jasmine.Reporter);
-
-jasmine.MultiReporter.prototype.addReporter = function(reporter) {
-  this.subReporters_.push(reporter);
-};
-
-(function() {
-  var functionNames = [
-    "reportRunnerStarting",
-    "reportRunnerResults",
-    "reportSuiteResults",
-    "reportSpecStarting",
-    "reportSpecResults",
-    "log"
-  ];
-  for (var i = 0; i < functionNames.length; i++) {
-    var functionName = functionNames[i];
-    jasmine.MultiReporter.prototype[functionName] = (function(functionName) {
-      return function() {
-        for (var j = 0; j < this.subReporters_.length; j++) {
-          var subReporter = this.subReporters_[j];
-          if (subReporter[functionName]) {
-            subReporter[functionName].apply(subReporter, arguments);
-          }
-        }
-      };
-    })(functionName);
-  }
-})();
-/**
- * Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults
- *
- * @constructor
- */
-jasmine.NestedResults = function() {
-  /**
-   * The total count of results
-   */
-  this.totalCount = 0;
-  /**
-   * Number of passed results
-   */
-  this.passedCount = 0;
-  /**
-   * Number of failed results
-   */
-  this.failedCount = 0;
-  /**
-   * Was this suite/spec skipped?
-   */
-  this.skipped = false;
-  /**
-   * @ignore
-   */
-  this.items_ = [];
-};
-
-/**
- * Roll up the result counts.
- *
- * @param result
- */
-jasmine.NestedResults.prototype.rollupCounts = function(result) {
-  this.totalCount += result.totalCount;
-  this.passedCount += result.passedCount;
-  this.failedCount += result.failedCount;
-};
-
-/**
- * Adds a log message.
- * @param values Array of message parts which will be concatenated later.
- */
-jasmine.NestedResults.prototype.log = function(values) {
-  this.items_.push(new jasmine.MessageResult(values));
-};
-
-/**
- * Getter for the results: message & results.
- */
-jasmine.NestedResults.prototype.getItems = function() {
-  return this.items_;
-};
-
-/**
- * Adds a result, tracking counts (total, passed, & failed)
- * @param {jasmine.ExpectationResult|jasmine.NestedResults} result
- */
-jasmine.NestedResults.prototype.addResult = function(result) {
-  if (result.type != 'log') {
-    if (result.items_) {
-      this.rollupCounts(result);
-    } else {
-      this.totalCount++;
-      if (result.passed()) {
-        this.passedCount++;
-      } else {
-        this.failedCount++;
-      }
-    }
-  }
-  this.items_.push(result);
-};
-
-/**
- * @returns {Boolean} True if <b>everything</b> below passed
- */
-jasmine.NestedResults.prototype.passed = function() {
-  return this.passedCount === this.totalCount;
-};
-/**
- * Base class for pretty printing for expectation results.
- */
-jasmine.PrettyPrinter = function() {
-  this.ppNestLevel_ = 0;
-};
-
-/**
- * Formats a value in a nice, human-readable string.
- *
- * @param value
- */
-jasmine.PrettyPrinter.prototype.format = function(value) {
-  if (this.ppNestLevel_ > 40) {
-    throw new Error('jasmine.PrettyPrinter: format() nested too deeply!');
-  }
-
-  this.ppNestLevel_++;
-  try {
-    if (value === jasmine.undefined) {
-      this.emitScalar('undefined');
-    } else if (value === null) {
-      this.emitScalar('null');
-    } else if (value === jasmine.getGlobal()) {
-      this.emitScalar('<global>');
-    } else if (value instanceof jasmine.Matchers.Any) {
-      this.emitScalar(value.toString());
-    } else if (typeof value === 'string') {
-      this.emitString(value);
-    } else if (jasmine.isSpy(value)) {
-      this.emitScalar("spy on " + value.identity);
-    } else if (value instanceof RegExp) {
-      this.emitScalar(value.toString());
-    } else if (typeof value === 'function') {
-      this.emitScalar('Function');
-    } else if (typeof value.nodeType === 'number') {
-      this.emitScalar('HTMLNode');
-    } else if (value instanceof Date) {
-      this.emitScalar('Date(' + value + ')');
-    } else if (value.__Jasmine_been_here_before__) {
-      this.emitScalar('<circular reference: ' + (jasmine.isArray_(value) ? 'Array' : 'Object') + '>');
-    } else if (jasmine.isArray_(value) || typeof value == 'object') {
-      value.__Jasmine_been_here_before__ = true;
-      if (jasmine.isArray_(value)) {
-        this.emitArray(value);
-      } else {
-        this.emitObject(value);
-      }
-      delete value.__Jasmine_been_here_before__;
-    } else {
-      this.emitScalar(value.toString());
-    }
-  } finally {
-    this.ppNestLevel_--;
-  }
-};
-
-jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) {
-  for (var property in obj) {
-    if (property == '__Jasmine_been_here_before__') continue;
-    fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) != null) : false);
-  }
-};
-
-jasmine.PrettyPrinter.prototype.emitArray = jasmine.unimplementedMethod_;
-jasmine.PrettyPrinter.prototype.emitObject = jasmine.unimplementedMethod_;
-jasmine.PrettyPrinter.prototype.emitScalar = jasmine.unimplementedMethod_;
-jasmine.PrettyPrinter.prototype.emitString = jasmine.unimplementedMethod_;
-
-jasmine.StringPrettyPrinter = function() {
-  jasmine.PrettyPrinter.call(this);
-
-  this.string = '';
-};
-jasmine.util.inherit(jasmine.StringPrettyPrinter, jasmine.PrettyPrinter);
-
-jasmine.StringPrettyPrinter.prototype.emitScalar = function(value) {
-  this.append(value);
-};
-
-jasmine.StringPrettyPrinter.prototype.emitString = function(value) {
-  this.append("'" + value + "'");
-};
-
-jasmine.StringPrettyPrinter.prototype.emitArray = function(array) {
-  this.append('[ ');
-  for (var i = 0; i < array.length; i++) {
-    if (i > 0) {
-      this.append(', ');
-    }
-    this.format(array[i]);
-  }
-  this.append(' ]');
-};
-
-jasmine.StringPrettyPrinter.prototype.emitObject = function(obj) {
-  var self = this;
-  this.append('{ ');
-  var first = true;
-
-  this.iterateObject(obj, function(property, isGetter) {
-    if (first) {
-      first = false;
-    } else {
-      self.append(', ');
-    }
-
-    self.append(property);
-    self.append(' : ');
-    if (isGetter) {
-      self.append('<getter>');
-    } else {
-      self.format(obj[property]);
-    }
-  });
-
-  this.append(' }');
-};
-
-jasmine.StringPrettyPrinter.prototype.append = function(value) {
-  this.string += value;
-};
-jasmine.Queue = function(env) {
-  this.env = env;
-  this.blocks = [];
-  this.running = false;
-  this.index = 0;
-  this.offset = 0;
-  this.abort = false;
-};
-
-jasmine.Queue.prototype.addBefore = function(block) {
-  this.blocks.unshift(block);
-};
-
-jasmine.Queue.prototype.add = function(block) {
-  this.blocks.push(block);
-};
-
-jasmine.Queue.prototype.insertNext = function(block) {
-  this.blocks.splice((this.index + this.offset + 1), 0, block);
-  this.offset++;
-};
-
-jasmine.Queue.prototype.start = function(onComplete) {
-  this.running = true;
-  this.onComplete = onComplete;
-  this.next_();
-};
-
-jasmine.Queue.prototype.isRunning = function() {
-  return this.running;
-};
-
-jasmine.Queue.LOOP_DONT_RECURSE = true;
-
-jasmine.Queue.prototype.next_ = function() {
-  var self = this;
-  var goAgain = true;
-
-  while (goAgain) {
-    goAgain = false;
-    
-    if (self.index < self.blocks.length && !this.abort) {
-      var calledSynchronously = true;
-      var completedSynchronously = false;
-
-      var onComplete = function () {
-        if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) {
-          completedSynchronously = true;
-          return;
-        }
-
-        if (self.blocks[self.index].abort) {
-          self.abort = true;
-        }
-
-        self.offset = 0;
-        self.index++;
-
-        var now = new Date().getTime();
-        if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) {
-          self.env.lastUpdate = now;
-          self.env.setTimeout(function() {
-            self.next_();
-          }, 0);
-        } else {
-          if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) {
-            goAgain = true;
-          } else {
-            self.next_();
-          }
-        }
-      };
-      self.blocks[self.index].execute(onComplete);
-
-      calledSynchronously = false;
-      if (completedSynchronously) {
-        onComplete();
-      }
-      
-    } else {
-      self.running = false;
-      if (self.onComplete) {
-        self.onComplete();
-      }
-    }
-  }
-};
-
-jasmine.Queue.prototype.results = function() {
-  var results = new jasmine.NestedResults();
-  for (var i = 0; i < this.blocks.length; i++) {
-    if (this.blocks[i].results) {
-      results.addResult(this.blocks[i].results());
-    }
-  }
-  return results;
-};
-
-
-/**
- * Runner
- *
- * @constructor
- * @param {jasmine.Env} env
- */
-jasmine.Runner = function(env) {
-  var self = this;
-  self.env = env;
-  self.queue = new jasmine.Queue(env);
-  self.before_ = [];
-  self.after_ = [];
-  self.suites_ = [];
-};
-
-jasmine.Runner.prototype.execute = function() {
-  var self = this;
-  if (self.env.reporter.reportRunnerStarting) {
-    self.env.reporter.reportRunnerStarting(this);
-  }
-  self.queue.start(function () {
-    self.finishCallback();
-  });
-};
-
-jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) {
-  beforeEachFunction.typeName = 'beforeEach';
-  this.before_.splice(0,0,beforeEachFunction);
-};
-
-jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
-  afterEachFunction.typeName = 'afterEach';
-  this.after_.splice(0,0,afterEachFunction);
-};
-
-
-jasmine.Runner.prototype.finishCallback = function() {
-  this.env.reporter.reportRunnerResults(this);
-};
-
-jasmine.Runner.prototype.addSuite = function(suite) {
-  this.suites_.push(suite);
-};
-
-jasmine.Runner.prototype.add = function(block) {
-  if (block instanceof jasmine.Suite) {
-    this.addSuite(block);
-  }
-  this.queue.add(block);
-};
-
-jasmine.Runner.prototype.specs = function () {
-  var suites = this.suites();
-  var specs = [];
-  for (var i = 0; i < suites.length; i++) {
-    specs = specs.concat(suites[i].specs());
-  }
-  return specs;
-};
-
-jasmine.Runner.prototype.suites = function() {
-  return this.suites_;
-};
-
-jasmine.Runner.prototype.topLevelSuites = function() {
-  var topLevelSuites = [];
-  for (var i = 0; i < this.suites_.length; i++) {
-    if (!this.suites_[i].parentSuite) {
-      topLevelSuites.push(this.suites_[i]);
-    }
-  }
-  return topLevelSuites;
-};
-
-jasmine.Runner.prototype.results = function() {
-  return this.queue.results();
-};
-/**
- * Internal representation of a Jasmine specification, or test.
- *
- * @constructor
- * @param {jasmine.Env} env
- * @param {jasmine.Suite} suite
- * @param {String} description
- */
-jasmine.Spec = function(env, suite, description) {
-  if (!env) {
-    throw new Error('jasmine.Env() required');
-  }
-  if (!suite) {
-    throw new Error('jasmine.Suite() required');
-  }
-  var spec = this;
-  spec.id = env.nextSpecId ? env.nextSpecId() : null;
-  spec.env = env;
-  spec.suite = suite;
-  spec.description = description;
-  spec.queue = new jasmine.Queue(env);
-
-  spec.afterCallbacks = [];
-  spec.spies_ = [];
-
-  spec.results_ = new jasmine.NestedResults();
-  spec.results_.description = description;
-  spec.matchersClass = null;
-};
-
-jasmine.Spec.prototype.getFullName = function() {
-  return this.suite.getFullName() + ' ' + this.description + '.';
-};
-
-
-jasmine.Spec.prototype.results = function() {
-  return this.results_;
-};
-
-/**
- * All parameters are pretty-printed and concatenated together, then written to the spec's output.
- *
- * Be careful not to leave calls to <code>jasmine.log</code> in production code.
- */
-jasmine.Spec.prototype.log = function() {
-  return this.results_.log(arguments);
-};
-
-jasmine.Spec.prototype.runs = function (func) {
-  var block = new jasmine.Block(this.env, func, this);
-  this.addToQueue(block);
-  return this;
-};
-
-jasmine.Spec.prototype.addToQueue = function (block) {
-  if (this.queue.isRunning()) {
-    this.queue.insertNext(block);
-  } else {
-    this.queue.add(block);
-  }
-};
-
-/**
- * @param {jasmine.ExpectationResult} result
- */
-jasmine.Spec.prototype.addMatcherResult = function(result) {
-  this.results_.addResult(result);
-};
-
-jasmine.Spec.prototype.expect = function(actual) {
-  var positive = new (this.getMatchersClass_())(this.env, actual, this);
-  positive.not = new (this.getMatchersClass_())(this.env, actual, this, true);
-  return positive;
-};
-
-/**
- * Waits a fixed time period before moving to the next block.
- *
- * @deprecated Use waitsFor() instead
- * @param {Number} timeout milliseconds to wait
- */
-jasmine.Spec.prototype.waits = function(timeout) {
-  var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this);
-  this.addToQueue(waitsFunc);
-  return this;
-};
-
-/**
- * Waits for the latchFunction to return true before proceeding to the next block.
- *
- * @param {Function} latchFunction
- * @param {String} optional_timeoutMessage
- * @param {Number} optional_timeout
- */
-jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
-  var latchFunction_ = null;
-  var optional_timeoutMessage_ = null;
-  var optional_timeout_ = null;
-
-  for (var i = 0; i < arguments.length; i++) {
-    var arg = arguments[i];
-    switch (typeof arg) {
-      case 'function':
-        latchFunction_ = arg;
-        break;
-      case 'string':
-        optional_timeoutMessage_ = arg;
-        break;
-      case 'number':
-        optional_timeout_ = arg;
-        break;
-    }
-  }
-
-  var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this);
-  this.addToQueue(waitsForFunc);
-  return this;
-};
-
-jasmine.Spec.prototype.fail = function (e) {
-  var expectationResult = new jasmine.ExpectationResult({
-    passed: false,
-    message: e ? jasmine.util.formatException(e) : 'Exception'
-  });
-  this.results_.addResult(expectationResult);
-};
-
-jasmine.Spec.prototype.getMatchersClass_ = function() {
-  return this.matchersClass || this.env.matchersClass;
-};
-
-jasmine.Spec.prototype.addMatchers = function(matchersPrototype) {
-  var parent = this.getMatchersClass_();
-  var newMatchersClass = function() {
-    parent.apply(this, arguments);
-  };
-  jasmine.util.inherit(newMatchersClass, parent);
-  jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass);
-  this.matchersClass = newMatchersClass;
-};
-
-jasmine.Spec.prototype.finishCallback = function() {
-  this.env.reporter.reportSpecResults(this);
-};
-
-jasmine.Spec.prototype.finish = function(onComplete) {
-  this.removeAllSpies();
-  this.finishCallback();
-  if (onComplete) {
-    onComplete();
-  }
-};
-
-jasmine.Spec.prototype.after = function(doAfter) {
-  if (this.queue.isRunning()) {
-    this.queue.add(new jasmine.Block(this.env, doAfter, this));
-  } else {
-    this.afterCallbacks.unshift(doAfter);
-  }
-};
-
-jasmine.Spec.prototype.execute = function(onComplete) {
-  var spec = this;
-  if (!spec.env.specFilter(spec)) {
-    spec.results_.skipped = true;
-    spec.finish(onComplete);
-    return;
-  }
-
-  this.env.reporter.reportSpecStarting(this);
-
-  spec.env.currentSpec = spec;
-
-  spec.addBeforesAndAftersToQueue();
-
-  spec.queue.start(function () {
-    spec.finish(onComplete);
-  });
-};
-
-jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() {
-  var runner = this.env.currentRunner();
-  var i;
-
-  for (var suite = this.suite; suite; suite = suite.parentSuite) {
-    for (i = 0; i < suite.before_.length; i++) {
-      this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this));
-    }
-  }
-  for (i = 0; i < runner.before_.length; i++) {
-    this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this));
-  }
-  for (i = 0; i < this.afterCallbacks.length; i++) {
-    this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this));
-  }
-  for (suite = this.suite; suite; suite = suite.parentSuite) {
-    for (i = 0; i < suite.after_.length; i++) {
-      this.queue.add(new jasmine.Block(this.env, suite.after_[i], this));
-    }
-  }
-  for (i = 0; i < runner.after_.length; i++) {
-    this.queue.add(new jasmine.Block(this.env, runner.after_[i], this));
-  }
-};
-
-jasmine.Spec.prototype.explodes = function() {
-  throw 'explodes function should not have been called';
-};
-
-jasmine.Spec.prototype.spyOn = function(obj, methodName, ignoreMethodDoesntExist) {
-  if (obj == jasmine.undefined) {
-    throw "spyOn could not find an object to spy upon for " + methodName + "()";
-  }
-
-  if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) {
-    throw methodName + '() method does not exist';
-  }
-
-  if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) {
-    throw new Error(methodName + ' has already been spied upon');
-  }
-
-  var spyObj = jasmine.createSpy(methodName);
-
-  this.spies_.push(spyObj);
-  spyObj.baseObj = obj;
-  spyObj.methodName = methodName;
-  spyObj.originalValue = obj[methodName];
-
-  obj[methodName] = spyObj;
-
-  return spyObj;
-};
-
-jasmine.Spec.prototype.removeAllSpies = function() {
-  for (var i = 0; i < this.spies_.length; i++) {
-    var spy = this.spies_[i];
-    spy.baseObj[spy.methodName] = spy.originalValue;
-  }
-  this.spies_ = [];
-};
-
-/**
- * Internal representation of a Jasmine suite.
- *
- * @constructor
- * @param {jasmine.Env} env
- * @param {String} description
- * @param {Function} specDefinitions
- * @param {jasmine.Suite} parentSuite
- */
-jasmine.Suite = function(env, description, specDefinitions, parentSuite) {
-  var self = this;
-  self.id = env.nextSuiteId ? env.nextSuiteId() : null;
-  self.description = description;
-  self.queue = new jasmine.Queue(env);
-  self.parentSuite = parentSuite;
-  self.env = env;
-  self.before_ = [];
-  self.after_ = [];
-  self.children_ = [];
-  self.suites_ = [];
-  self.specs_ = [];
-};
-
-jasmine.Suite.prototype.getFullName = function() {
-  var fullName = this.description;
-  for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) {
-    fullName = parentSuite.description + ' ' + fullName;
-  }
-  return fullName;
-};
-
-jasmine.Suite.prototype.finish = function(onComplete) {
-  this.env.reporter.reportSuiteResults(this);
-  this.finished = true;
-  if (typeof(onComplete) == 'function') {
-    onComplete();
-  }
-};
-
-jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) {
-  beforeEachFunction.typeName = 'beforeEach';
-  this.before_.unshift(beforeEachFunction);
-};
-
-jasmine.Suite.prototype.afterEach = function(afterEachFunction) {
-  afterEachFunction.typeName = 'afterEach';
-  this.after_.unshift(afterEachFunction);
-};
-
-jasmine.Suite.prototype.results = function() {
-  return this.queue.results();
-};
-
-jasmine.Suite.prototype.add = function(suiteOrSpec) {
-  this.children_.push(suiteOrSpec);
-  if (suiteOrSpec instanceof jasmine.Suite) {
-    this.suites_.push(suiteOrSpec);
-    this.env.currentRunner().addSuite(suiteOrSpec);
-  } else {
-    this.specs_.push(suiteOrSpec);
-  }
-  this.queue.add(suiteOrSpec);
-};
-
-jasmine.Suite.prototype.specs = function() {
-  return this.specs_;
-};
-
-jasmine.Suite.prototype.suites = function() {
-  return this.suites_;
-};
-
-jasmine.Suite.prototype.children = function() {
-  return this.children_;
-};
-
-jasmine.Suite.prototype.execute = function(onComplete) {
-  var self = this;
-  this.queue.start(function () {
-    self.finish(onComplete);
-  });
-};
-jasmine.WaitsBlock = function(env, timeout, spec) {
-  this.timeout = timeout;
-  jasmine.Block.call(this, env, null, spec);
-};
-
-jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block);
-
-jasmine.WaitsBlock.prototype.execute = function (onComplete) {
-  this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
-  this.env.setTimeout(function () {
-    onComplete();
-  }, this.timeout);
-};
-/**
- * A block which waits for some condition to become true, with timeout.
- *
- * @constructor
- * @extends jasmine.Block
- * @param {jasmine.Env} env The Jasmine environment.
- * @param {Number} timeout The maximum time in milliseconds to wait for the condition to become true.
- * @param {Function} latchFunction A function which returns true when the desired condition has been met.
- * @param {String} message The message to display if the desired condition hasn't been met within the given time period.
- * @param {jasmine.Spec} spec The Jasmine spec.
- */
-jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) {
-  this.timeout = timeout || env.defaultTimeoutInterval;
-  this.latchFunction = latchFunction;
-  this.message = message;
-  this.totalTimeSpentWaitingForLatch = 0;
-  jasmine.Block.call(this, env, null, spec);
-};
-jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block);
-
-jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10;
-
-jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
-  this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
-  var latchFunctionResult;
-  try {
-    latchFunctionResult = this.latchFunction.apply(this.spec);
-  } catch (e) {
-    this.spec.fail(e);
-    onComplete();
-    return;
-  }
-
-  if (latchFunctionResult) {
-    onComplete();
-  } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) {
-    var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen');
-    this.spec.fail({
-      name: 'timeout',
-      message: message
-    });
-
-    this.abort = true;
-    onComplete();
-  } else {
-    this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
-    var self = this;
-    this.env.setTimeout(function() {
-      self.execute(onComplete);
-    }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
-  }
-};
-// Mock setTimeout, clearTimeout
-// Contributed by Pivotal Computer Systems, www.pivotalsf.com
-
-jasmine.FakeTimer = function() {
-  this.reset();
-
-  var self = this;
-  self.setTimeout = function(funcToCall, millis) {
-    self.timeoutsMade++;
-    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
-    return self.timeoutsMade;
-  };
-
-  self.setInterval = function(funcToCall, millis) {
-    self.timeoutsMade++;
-    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
-    return self.timeoutsMade;
-  };
-
-  self.clearTimeout = function(timeoutKey) {
-    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
-  };
-
-  self.clearInterval = function(timeoutKey) {
-    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
-  };
-
-};
-
-jasmine.FakeTimer.prototype.reset = function() {
-  this.timeoutsMade = 0;
-  this.scheduledFunctions = {};
-  this.nowMillis = 0;
-};
-
-jasmine.FakeTimer.prototype.tick = function(millis) {
-  var oldMillis = this.nowMillis;
-  var newMillis = oldMillis + millis;
-  this.runFunctionsWithinRange(oldMillis, newMillis);
-  this.nowMillis = newMillis;
-};
-
-jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
-  var scheduledFunc;
-  var funcsToRun = [];
-  for (var timeoutKey in this.scheduledFunctions) {
-    scheduledFunc = this.scheduledFunctions[timeoutKey];
-    if (scheduledFunc != jasmine.undefined &&
-        scheduledFunc.runAtMillis >= oldMillis &&
-        scheduledFunc.runAtMillis <= nowMillis) {
-      funcsToRun.push(scheduledFunc);
-      this.scheduledFunctions[timeoutKey] = jasmine.undefined;
-    }
-  }
-
-  if (funcsToRun.length > 0) {
-    funcsToRun.sort(function(a, b) {
-      return a.runAtMillis - b.runAtMillis;
-    });
-    for (var i = 0; i < funcsToRun.length; ++i) {
-      try {
-        var funcToRun = funcsToRun[i];
-        this.nowMillis = funcToRun.runAtMillis;
-        funcToRun.funcToCall();
-        if (funcToRun.recurring) {
-          this.scheduleFunction(funcToRun.timeoutKey,
-              funcToRun.funcToCall,
-              funcToRun.millis,
-              true);
-        }
-      } catch(e) {
-      }
-    }
-    this.runFunctionsWithinRange(oldMillis, nowMillis);
-  }
-};
-
-jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
-  this.scheduledFunctions[timeoutKey] = {
-    runAtMillis: this.nowMillis + millis,
-    funcToCall: funcToCall,
-    recurring: recurring,
-    timeoutKey: timeoutKey,
-    millis: millis
-  };
-};
-
-/**
- * @namespace
- */
-jasmine.Clock = {
-  defaultFakeTimer: new jasmine.FakeTimer(),
-
-  reset: function() {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.defaultFakeTimer.reset();
-  },
-
-  tick: function(millis) {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.defaultFakeTimer.tick(millis);
-  },
-
-  runFunctionsWithinRange: function(oldMillis, nowMillis) {
-    jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
-  },
-
-  scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
-    jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
-  },
-
-  useMock: function() {
-    if (!jasmine.Clock.isInstalled()) {
-      var spec = jasmine.getEnv().currentSpec;
-      spec.after(jasmine.Clock.uninstallMock);
-
-      jasmine.Clock.installMock();
-    }
-  },
-
-  installMock: function() {
-    jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
-  },
-
-  uninstallMock: function() {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.installed = jasmine.Clock.real;
-  },
-
-  real: {
-    setTimeout: jasmine.getGlobal().setTimeout,
-    clearTimeout: jasmine.getGlobal().clearTimeout,
-    setInterval: jasmine.getGlobal().setInterval,
-    clearInterval: jasmine.getGlobal().clearInterval
-  },
-
-  assertInstalled: function() {
-    if (!jasmine.Clock.isInstalled()) {
-      throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
-    }
-  },
-
-  isInstalled: function() {
-    return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer;
-  },
-
-  installed: null
-};
-jasmine.Clock.installed = jasmine.Clock.real;
-
-//else for IE support
-jasmine.getGlobal().setTimeout = function(funcToCall, millis) {
-  if (jasmine.Clock.installed.setTimeout.apply) {
-    return jasmine.Clock.installed.setTimeout.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.setTimeout(funcToCall, millis);
-  }
-};
-
-jasmine.getGlobal().setInterval = function(funcToCall, millis) {
-  if (jasmine.Clock.installed.setInterval.apply) {
-    return jasmine.Clock.installed.setInterval.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.setInterval(funcToCall, millis);
-  }
-};
-
-jasmine.getGlobal().clearTimeout = function(timeoutKey) {
-  if (jasmine.Clock.installed.clearTimeout.apply) {
-    return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.clearTimeout(timeoutKey);
-  }
-};
-
-jasmine.getGlobal().clearInterval = function(timeoutKey) {
-  if (jasmine.Clock.installed.clearTimeout.apply) {
-    return jasmine.Clock.installed.clearInterval.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.clearInterval(timeoutKey);
-  }
-};
-
-
-jasmine.version_= {
-  "major": 1,
-  "minor": 0,
-  "build": "0.rc1",
-  "revision": 1282853377
-};
diff --git a/extlib/leaflet/spec/runner.html b/extlib/leaflet/spec/runner.html
deleted file mode 100644
index 6931d2c9..00000000
--- a/extlib/leaflet/spec/runner.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>Jasmine Test Runner</title>
-	<link rel="stylesheet" type="text/css" href="../lib/jasmine/jasmine.css">
-	<script type="text/javascript" src="../lib/jasmine/jasmine.js"></script>
-	<script type="text/javascript" src="../lib/jasmine/jasmine-html.js"></script>
-	
-	<!-- source files -->
-		
-		<script type="text/javascript">
-			L = 'test'; //to test L#noConflict later
-		</script>
-		
-		<script type="text/javascript" src="../src/Leaflet.js"></script>
-	  
-		<!-- /core -->
-		<script type="text/javascript" src="../src/core/Util.js"></script>
-		<script type="text/javascript" src="../src/core/Class.js"></script>
-		<script type="text/javascript" src="../src/core/Events.js"></script>
-		<script type="text/javascript" src="../src/core/Browser.js"></script>
-
-		<!-- /dom -->
-		<script type="text/javascript" src="../src/dom/DomEvent.js"></script>
-		<script type="text/javascript" src="../src/dom/DomUtil.js"></script>
-	
-		<!-- /geo -->
-		<script type="text/javascript" src="../src/geo/LatLng.js"></script>
-		<script type="text/javascript" src="../src/geo/LatLngBounds.js"></script>
-		<script type="text/javascript" src="../src/geo/Projection.js"></script>
-
-		<!-- /geometry -->
-		<script type="text/javascript" src="../src/geometry/Point.js"></script>
-		<script type="text/javascript" src="../src/geometry/Bounds.js"></script>
-		<script type="text/javascript" src="../src/geometry/Transformation.js"></script>
-
-		<!-- /layer -->
-		<script type="text/javascript" src="../src/layer/TileLayer.js"></script>
-		
-		<!-- /map -->
-		<script type="text/javascript" src="../src/map/Map.js"></script>
-		
-
-	<!-- spec files -->
-		
-		<script type="text/javascript" src="suites/SpecHelper.js"></script>
-		<script type="text/javascript" src="suites/LeafletSpec.js"></script>
-	
-		<!-- /core -->
-		<script type="text/javascript" src="suites/core/UtilSpec.js"></script>
-		<script type="text/javascript" src="suites/core/ClassSpec.js"></script>
-		<script type="text/javascript" src="suites/core/EventsSpec.js"></script>
-
-		<!-- /geometry -->
-		<script type="text/javascript" src="suites/geometry/PointSpec.js"></script>
-		<script type="text/javascript" src="suites/geometry/BoundsSpec.js"></script>
-		<script type="text/javascript" src="suites/geometry/TransformationSpec.js"></script>
-
-		<!-- /geo -->
-		<script type="text/javascript" src="suites/geo/LatLngSpec.js"></script>
-		<script type="text/javascript" src="suites/geo/LatLngBoundsSpec.js"></script>
-		<script type="text/javascript" src="suites/geo/ProjectionSpec.js"></script>
-
-		<!-- /dom -->
-		<script type="text/javascript" src="suites/dom/DomEventSpec.js"></script>
-		<script type="text/javascript" src="suites/dom/DomUtilSpec.js"></script>
-
-		<!-- /layer -->
-		<script type="text/javascript" src="suites/layer/TileLayerSpec.js"></script>
-		
-		<!-- /map -->
-		<script type="text/javascript" src="suites/map/MapSpec.js"></script>
-</head>
-<body>
-
-<script type="text/javascript">
-	jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
-	jasmine.getEnv().execute();
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/LeafletSpec.js b/extlib/leaflet/spec/suites/LeafletSpec.js
deleted file mode 100644
index c67879cf..00000000
--- a/extlib/leaflet/spec/suites/LeafletSpec.js
+++ /dev/null
@@ -1,15 +0,0 @@
-describe('L#noConflict', function() {

-	it('should restore the previous L value and return Leaflet namespace', function(){

-		

-		expect(L.VERSION).toBeDefined();

-		

-		var L2 = L.noConflict();

-		

-		expect(L).toEqual('test');

-		expect(L2.VERSION).toBeDefined();

-		

-		this.after(function() {

-			window.L = L2;

-		});

-	});

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/SpecHelper.js b/extlib/leaflet/spec/suites/SpecHelper.js
deleted file mode 100644
index 8b827041..00000000
--- a/extlib/leaflet/spec/suites/SpecHelper.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function noSpecs() {

-	it('should have specs', function() {

-		expect('specs').toBe();

-	});

-}
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/core/ClassSpec.js b/extlib/leaflet/spec/suites/core/ClassSpec.js
deleted file mode 100644
index 7a289154..00000000
--- a/extlib/leaflet/spec/suites/core/ClassSpec.js
+++ /dev/null
@@ -1,120 +0,0 @@
-describe("Class", function() {

-	

-	describe("#extend", function() {

-		var Klass,

-			constructor,

-			method;

-		

-		beforeEach(function() {

-			constructor = jasmine.createSpy(),

-			method = jasmine.createSpy();

-

-			Klass = L.Class.extend({

-				statics: {bla: 1},

-				includes: {mixin: true},

-				

-				initialize: constructor,

-				foo: 5,

-				bar: method

-			});

-		});

-		

-		it("should create a class with the given constructor & properties", function() {

-			var a = new Klass();

-			

-			expect(constructor).toHaveBeenCalled();

-			expect(a.foo).toEqual(5);

-			

-			a.bar();

-			

-			expect(method).toHaveBeenCalled();

-		});

-		

-		it("should inherit parent classes' constructor & properties", function() {

-			var Klass2 = Klass.extend({baz: 2});

-			

-			var b = new Klass2();

-			

-			expect(b instanceof Klass).toBeTruthy();

-			expect(b instanceof Klass2).toBeTruthy();

-			

-			expect(constructor).toHaveBeenCalled();

-			expect(b.baz).toEqual(2);

-			

-			b.bar();

-			

-			expect(method).toHaveBeenCalled();

-		});

-		

-		it("should grant the ability to call parent methods, including constructor", function() {

-			var Klass2 = Klass.extend({

-				initialize: function() {},

-				bar: function() {}

-			});

-			

-			var b = new Klass2();

-			

-			expect(constructor).not.toHaveBeenCalled();

-			b.superclass.initialize.call(this);

-			expect(constructor).toHaveBeenCalled();

-

-			b.superclass.bar.call(this);

-			expect(method).toHaveBeenCalled();

-		});

-		

-		it("should support static properties", function() {

-			expect(Klass.bla).toEqual(1);

-		});

-		

-		it("should inherit parent static properties", function() {

-			var Klass2 = Klass.extend({});

-			

-			expect(Klass2.bla).toEqual(1);

-		});

-		

-		it("should include the given mixin", function() {

-			var a = new Klass();

-			expect(a.mixin).toBeTruthy();

-		});

-		

-		it("should be able to include multiple mixins", function() {

-			var Klass2 = L.Class.extend({

-				includes: [{mixin: true}, {mixin2: true}]

-			});

-			var a = new Klass2();

-			

-			expect(a.mixin).toBeTruthy();

-			expect(a.mixin2).toBeTruthy();

-		});

-		

-		it("should grant the ability to include the given mixin", function() {

-			Klass.include({mixin2: true});

-			

-			var a = new Klass();

-			expect(a.mixin2).toBeTruthy();

-		});

-		

-		it("should merge options instead of replacing them", function() {

-			var KlassWithOptions1 = L.Class.extend({

-				options: {

-					foo1: 1,

-					foo2: 2

-				}

-			});

-			var KlassWithOptions2 = KlassWithOptions1.extend({

-				options: {

-					foo2: 3,

-					foo3: 4

-				}

-			});

-			

-			var a = new KlassWithOptions2();

-			

-			expect(a.options).toEqual({

-				foo1: 1,

-				foo2: 3,

-				foo3: 4

-			});

-		});

-	});

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/core/EventsSpec.js b/extlib/leaflet/spec/suites/core/EventsSpec.js
deleted file mode 100644
index be143866..00000000
--- a/extlib/leaflet/spec/suites/core/EventsSpec.js
+++ /dev/null
@@ -1,110 +0,0 @@
-describe('Events', function() {

-	var Klass;

-	

-	beforeEach(function() {

-		Klass = L.Class.extend({

-			includes: L.Mixin.Events

-		});

-	});

-	

-	describe('#fireEvent', function() {

-		

-		it('should fire all listeners added through #addEventListener', function() {

-			var obj = new Klass(),

-				spy = jasmine.createSpy(),

-				spy2 = jasmine.createSpy(),

-				spy3 = jasmine.createSpy();

-			

-			obj.addEventListener('test', spy);

-			obj.addEventListener('test', spy2);

-			obj.addEventListener('other', spy3);

-			

-			expect(spy).not.toHaveBeenCalled();

-			expect(spy2).not.toHaveBeenCalled();

-			expect(spy3).not.toHaveBeenCalled();

-			

-			obj.fireEvent('test');

-			

-			expect(spy).toHaveBeenCalled();

-			expect(spy2).toHaveBeenCalled();

-			expect(spy3).not.toHaveBeenCalled();

-		});

-

-		it('should provide event object to listeners and execute them in the right context', function() {

-			var obj = new Klass(),

-				obj2 = new Klass(),

-				foo = {};

-			

-			function listener1(e) {

-				expect(e.type).toEqual('test');

-				expect(e.target).toEqual(obj);

-				expect(this).toEqual(obj);

-				expect(e.bar).toEqual(3);

-			};

-			

-			function listener2(e) {

-				expect(e.target).toEqual(obj2);

-				expect(this).toEqual(foo);

-			};

-			

-			obj.addEventListener('test', listener1);

-			obj2.addEventListener('test', listener2, foo);

-			

-			obj.fireEvent('test', {bar: 3});

-		});

-		

-		it('should not call listeners removed through #removeEventListener', function() {

-			var obj = new Klass(),

-				spy = jasmine.createSpy();

-			

-			obj.addEventListener('test', spy);

-			obj.removeEventListener('test', spy);

-			

-			obj.fireEvent('test');

-			

-			expect(spy).not.toHaveBeenCalled();

-		});

-	});

-	

-	describe('#on, #off & #fire', function() {

-		

-		it('should work like #addEventListener && #removeEventListener', function() {

-			var obj = new Klass(),

-				spy = jasmine.createSpy();

-			

-			obj.on('test', spy);

-			obj.fire('test');

-			

-			expect(spy).toHaveBeenCalled();

-			

-			obj.off('test', spy);

-			obj.fireEvent('test');

-			

-			expect(spy.callCount).toBeLessThan(2);

-		});

-		

-		it('should not override existing methods with the same name', function() {

-			var spy1 = jasmine.createSpy(),

-				spy2 = jasmine.createSpy(),

-				spy3 = jasmine.createSpy();

-			

-			var Klass2 = L.Class.extend({

-				includes: L.Mixin.Events,

-				on: spy1,

-				off: spy2,

-				fire: spy3

-			});

-			

-			var obj = new Klass2();

-			

-			obj.on();

-			expect(spy1).toHaveBeenCalled();

-			

-			obj.off();

-			expect(spy2).toHaveBeenCalled();

-			

-			obj.fire();

-			expect(spy3).toHaveBeenCalled();

-		});

-	});

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/core/UtilSpec.js b/extlib/leaflet/spec/suites/core/UtilSpec.js
deleted file mode 100644
index 46cb8fba..00000000
--- a/extlib/leaflet/spec/suites/core/UtilSpec.js
+++ /dev/null
@@ -1,63 +0,0 @@
-describe('Util', function() {

-

-	describe('#extend', function() {

-		var a;

-		

-		beforeEach(function() {

-			a = {

-				foo: 5,

-				bar: 'asd'

-			};

-		});

-		

-		it('should extend the first argument with the properties of the second', function() {

-			L.Util.extend(a, {

-				bar: 7,

-				baz: 3

-			});

-			

-			expect(a).toEqual({

-				foo: 5,

-				bar: 7,

-				baz: 3

-			});

-		});

-		

-		it('should work with more than 2 arguments', function() {

-			L.Util.extend(a, {bar: 7}, {baz: 3});

-			

-			expect(a).toEqual({

-				foo: 5,

-				bar: 7,

-				baz: 3

-			});

-		});

-	});

-

-	describe('#bind', function() {

-		it('should return the given function with the given context', function() {

-			var fn = function() {

-				return this;

-			};

-			

-			var fn2 = L.Util.bind(fn, 5);

-			

-			expect(fn2()).toEqual(5);

-		});

-	});

-	

-	describe('#stamp', function() {

-		it('should set a unique id on the given object and return it', function() {

-			var a = {},

-				id = L.Util.stamp(a);

-			

-			expect(typeof id).toEqual('number');

-			expect(L.Util.stamp(a)).toEqual(id);

-			

-			var b = {},

-				id2 = L.Util.stamp(b);

-			

-			expect(id2).not.toEqual(id);

-		});

-	});

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/dom/DomEventSpec.js b/extlib/leaflet/spec/suites/dom/DomEventSpec.js
deleted file mode 100644
index 83d08541..00000000
--- a/extlib/leaflet/spec/suites/dom/DomEventSpec.js
+++ /dev/null
@@ -1,102 +0,0 @@
-describe('DomEvent', function() {

-	var el;

-

-	function simulateClick(el) {

-		if (document.createEvent) {

-			var e = document.createEvent('MouseEvents');

-			e.initMouseEvent('click', true, true, window, 

-					0, 0, 0, 0, 0, false, false, false, false, 0, null);

-			return el.dispatchEvent(e);

-		} else if (el.fireEvent) {

-			return el.fireEvent('onclick');

-		}

-	}

-	

-	beforeEach(function() {

-		el = document.createElement('div');

-		el.style.position = 'absolute';

-		el.style.top = el.style.left = '-10000px';

-		document.body.appendChild(el);

-	});

-	

-	afterEach(function() {

-		document.body.removeChild(el);

-	});

-	

-	describe('#addListener', function() {

-		it('should add a listener and call it on event', function() {

-			var listener1 = jasmine.createSpy('listener1'), 

-				listener2 = jasmine.createSpy('listener2');

-		

-			L.DomEvent.addListener(el, 'click', listener1);

-			L.DomEvent.addListener(el, 'click', listener2);

-			

-			simulateClick(el);

-			

-			expect(listener1).toHaveBeenCalled();

-			expect(listener2).toHaveBeenCalled();

-		});

-		

-		it('should have "this" keyword point to the given context', function() {

-			var obj = {foo: 'bar'},

-				result;

-			

-			L.DomEvent.addListener(el, 'click', function() {

-				result = this;

-			}, obj);

-			

-			simulateClick(el);

-			

-			expect(result).toEqual(obj);

-		});

-		

-		it('should pass an event object to the listener', function() {

-			var type;

-			

-			L.DomEvent.addListener(el, 'click', function(e) {

-				type = e && e.type;

-			});

-			simulateClick(el);

-			

-			expect(type).toEqual('click');

-		});

-	});

-	

-	describe('#removeListener', function() {

-		it('should remove prevously added listener', function() {

-			var listener = jasmine.createSpy('listener');

-			

-			L.DomEvent.addListener(el, 'click', listener);

-			L.DomEvent.removeListener(el, 'click', listener);

-			

-			simulateClick(el);

-			

-			expect(listener).not.toHaveBeenCalled();

-		});

-	});

-	

-	describe('#stopPropagation', function() {

-		it('should stop propagation of the given event', function() {

-			var child = document.createElement('div'),

-				listener = jasmine.createSpy('listener');

-			

-			el.appendChild(child);

-			

-			L.DomEvent.addListener(child, 'click', L.DomEvent.stopPropagation);

-			L.DomEvent.addListener(el, 'click', listener);

-			

-			simulateClick(child);

-			

-			expect(listener).not.toHaveBeenCalled();

-			

-			el.removeChild(child);

-		});

-	});

-	describe('#preventDefault', function() {

-		it('should prevent the default action of event', function() {

-			L.DomEvent.addListener(el, 'click', L.DomEvent.preventDefault);

-

-			expect(simulateClick(el)).toBe(false);

-		});

-	});

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/dom/DomUtilSpec.js b/extlib/leaflet/spec/suites/dom/DomUtilSpec.js
deleted file mode 100644
index 60de22fe..00000000
--- a/extlib/leaflet/spec/suites/dom/DomUtilSpec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-describe('DomUtil', function() {

-	var el;

-	

-	beforeEach(function() {

-		el = document.createElement('div');

-		el.style.position = 'absolute';

-		el.style.top = el.style.left = '-10000px';

-		document.body.appendChild(el);

-	});

-	

-	afterEach(function() {

-		document.body.removeChild(el);

-	});

-	

-	describe('#get', function() {

-		it('should get element by id if the given argument is string', function() {

-			el.id = 'testId';

-			expect(L.DomUtil.get(el.id)).toBe(el);

-		});

-		

-		it('should return the element if it is given as an argument', function() {

-			expect(L.DomUtil.get(el)).toBe(el);

-		});

-	});

-	

-	describe('#setPosition', noSpecs);

-	

-	describe('#getStyle', noSpecs);

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/geo/LatLngBoundsSpec.js b/extlib/leaflet/spec/suites/geo/LatLngBoundsSpec.js
deleted file mode 100644
index be9bf12b..00000000
--- a/extlib/leaflet/spec/suites/geo/LatLngBoundsSpec.js
+++ /dev/null
@@ -1 +0,0 @@
-describe('LatLngBounds', noSpecs);
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/geo/LatLngSpec.js b/extlib/leaflet/spec/suites/geo/LatLngSpec.js
deleted file mode 100644
index a7498e71..00000000
--- a/extlib/leaflet/spec/suites/geo/LatLngSpec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-describe('LatLng', function() {

-	describe('constructor', function() {

-		it("should set lat and lng", function() {

-			var a = new L.LatLng(25, 74);

-			expect(a.lat).toEqual(25);

-			expect(a.lng).toEqual(74);

-	

-			var a = new L.LatLng(-25, -74);

-			expect(a.lat).toEqual(-25);

-			expect(a.lng).toEqual(-74);

-		});

-		

-		it("should clamp latitude to lie between -90 and 90", function() {

-			var a = new L.LatLng(150, 0).lat;

-			expect(a).toEqual(90);

-			

-			var b = new L.LatLng(-230, 0).lat;

-			expect(b).toEqual(-90);

-		});

-		

-		it("should clamp longtitude to lie between -180 and 180", function() {

-			var a = new L.LatLng(0, 190).lng;

-			expect(a).toEqual(-170);

-	

-			var b = new L.LatLng(0, 360).lng;

-			expect(b).toEqual(0);

-			

-			var c = new L.LatLng(0, 380).lng;

-			expect(c).toEqual(20);

-	

-			var d = new L.LatLng(0, -190).lng;

-			expect(d).toEqual(170);

-	

-			var e = new L.LatLng(0, -360).lng;

-			expect(e).toEqual(0);

-	

-			var f = new L.LatLng(0, -380).lng;

-			expect(f).toEqual(-20);

-		});

-		

-		it("should not clamp latitude and longtitude if unbounded flag set to true", function() {

-			var a = new L.LatLng(150, 0, true).lat;

-			expect(a).toEqual(150);

-			

-			var b = new L.LatLng(-230, 0, true).lat;

-			expect(b).toEqual(-230);

-	

-			var c = new L.LatLng(0, 250, true).lng;

-			expect(c).toEqual(250);

-	

-			var d = new L.LatLng(0, -190, true).lng;

-			expect(d).toEqual(-190);

-		});

-	});

-	

-	describe('#equals', function() {

-		it("should return true if compared objects are equal within a certain margin", function() {

-			var a = new L.LatLng(10, 20);

-			var b = new L.LatLng(10 + 1.0E-10, 20 - 1.0E-10);

-			expect(a.equals(b)).toBe(true);

-		});

-		

-		it("should return false if compared objects are not equal within a certain margin", function() {

-			var a = new L.LatLng(10, 20);

-			var b = new L.LatLng(10, 23.3);

-			expect(a.equals(b)).toBe(false);

-		});

-	});

-});

-

diff --git a/extlib/leaflet/spec/suites/geo/ProjectionSpec.js b/extlib/leaflet/spec/suites/geo/ProjectionSpec.js
deleted file mode 100644
index 6b9c7b61..00000000
--- a/extlib/leaflet/spec/suites/geo/ProjectionSpec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-describe("Projection.Mercator", function() {

-	var p = L.Projection.Mercator;

-	

-	beforeEach(function() {

-		function almostEqual(a, b, p) {

-			return Math.abs(a - b) <= (p || 1.0E-12);

-		};

-		this.addMatchers({

-			toAlmostEqual: function(expected, margin) {

-				var p1 = this.actual,

-					p2 = expected;

-				return almostEqual(p1.x, p2.x, margin) && almostEqual(p1.y, p2.y, margin);

-			}

-		});

-	});

-	

-

-	describe("#project", function() {

-		it("should do projection properly", function() {

-			//edge cases

-			expect(p.project(new L.LatLng(0, 0))).toAlmostEqual(new L.Point(0, 0));

-			expect(p.project(new L.LatLng(90, 180))).toAlmostEqual(new L.Point(-Math.PI, Math.PI));

-			expect(p.project(new L.LatLng(-90, -180))).toAlmostEqual(new L.Point(-Math.PI, -Math.PI));

-			

-			expect(p.project(new L.LatLng(50, 30))).toAlmostEqual(new L.Point(0.523598775598, 1.010683188683));

-		});

-	});

-

-	describe("#unproject", function() {

-		it("should do unprojection properly", function() {

-			function pr(point) {

-				return p.project(p.unproject(point));

-			}

-			

-			expect(pr(new L.Point(0, 0))).toAlmostEqual(new L.Point(0, 0));

-			expect(pr(new L.Point(-Math.PI, Math.PI))).toAlmostEqual(new L.Point(-Math.PI, Math.PI));

-			expect(pr(new L.Point(-Math.PI, -Math.PI))).toAlmostEqual(new L.Point(-Math.PI, -Math.PI));

-			

-			expect(pr(new L.Point(0.523598775598, 1.010683188683))).toAlmostEqual(new L.Point(0.523598775598, 1.010683188683));

-		});

-	});

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/geometry/BoundsSpec.js b/extlib/leaflet/spec/suites/geometry/BoundsSpec.js
deleted file mode 100644
index eee05e4b..00000000
--- a/extlib/leaflet/spec/suites/geometry/BoundsSpec.js
+++ /dev/null
@@ -1,43 +0,0 @@
-describe('Bounds', function() {

-	var a, b;

-	

-	beforeEach(function() {

-		a = new L.Bounds(

-			new L.Point(14, 12),

-			new L.Point(30, 40));

-		b = new L.Bounds([

-   			new L.Point(20, 12),

-   			new L.Point(14, 20),

-   			new L.Point(30, 40)

-   		]);

-	});

-	

-	describe('constructor', function() {

-		it('should create bounds with proper min & max on (Point, Point)', function() {

-			expect(a.min).toEqual(new L.Point(14, 12));

-			expect(a.max).toEqual(new L.Point(30, 40));

-		});

-		it('should create bounds with proper min & max on (Point[])', function() {

-			expect(b.min).toEqual(new L.Point(14, 12));

-			expect(b.max).toEqual(new L.Point(30, 40));

-		});

-	});

-	

-	describe('#extend', function() {

-		it('should extend the bounds to contain the given point', function() {

-			a.extend(new L.Point(50, 20));

-			expect(a.min).toEqual(new L.Point(14, 12));

-			expect(a.max).toEqual(new L.Point(50, 40));

-			

-			b.extend(new L.Point(25, 50));

-			expect(b.min).toEqual(new L.Point(14, 12));

-			expect(b.max).toEqual(new L.Point(30, 50));

-		});

-	});

-	

-	describe('#getCenter', function() {

-		it('should return the center point', function() {

-			expect(a.getCenter()).toEqual(new L.Point(22, 26));

-		});

-	});

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/geometry/PointSpec.js b/extlib/leaflet/spec/suites/geometry/PointSpec.js
deleted file mode 100644
index d004d60b..00000000
--- a/extlib/leaflet/spec/suites/geometry/PointSpec.js
+++ /dev/null
@@ -1,45 +0,0 @@
-describe("Point", function() {

-	

-	describe('constructor', function() {

-		

-		it("should create a point with the given x and y", function() {

-			var p = new L.Point(1.5, 2.5);

-			expect(p.x).toEqual(1.5);

-			expect(p.y).toEqual(2.5);

-		});

-		

-		it("should round the given x and y if the third argument is true", function() {

-			var p = new L.Point(1.3, 2.7, true);

-			expect(p.x).toEqual(1);

-			expect(p.y).toEqual(3);

-		});

-	});

-	

-	describe('#subtract', function() {

-		it('should subtract the given point from this one', function() {

-			var a = new L.Point(50, 30),

-				b = new L.Point(20, 10);

-			expect(a.subtract(b)).toEqual(new L.Point(30, 20));

-		});

-	});

-	

-	describe('#add', function() {

-		it('should add the given point to this one', function() {

-			expect(new L.Point(50, 30).add(new L.Point(20, 10))).toEqual(new L.Point(70, 40));

-		});

-	});

-	

-	describe('#divideBy', function() {

-		it('should divide this point by the given amount', function() {

-			expect(new L.Point(50, 30).divideBy(5)).toEqual(new L.Point(10, 6));

-		});

-	});

-	

-	describe('#multiplyBy', function() {

-		it('should multiply this point by the given amount', function() {

-			expect(new L.Point(50, 30).multiplyBy(2)).toEqual(new L.Point(100, 60));

-		});

-	});

-	

-	describe('#distanceTo', noSpecs);

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/geometry/TransformationSpec.js b/extlib/leaflet/spec/suites/geometry/TransformationSpec.js
deleted file mode 100644
index 8a945df1..00000000
--- a/extlib/leaflet/spec/suites/geometry/TransformationSpec.js
+++ /dev/null
@@ -1,19 +0,0 @@
-describe("Transformation", function() {

-	var t, p;

-	

-	beforeEach(function() {

-		t = new L.Transformation(1, 2, 3, 4);

-		p = new L.Point(10, 20);

-	});

-	

-	it("#transform should perform a transformation", function() {

-		var p2 = t.transform(p, 2);

-		expect(p2).toEqual(new L.Point(24, 128));

-	});

-	

-	it("#untransform should perform a reverse transformation", function() {

-		var p2 = t.transform(p, 2);

-		var p3 = t.untransform(p2, 2);

-		expect(p3).toEqual(p);

-	});

-});
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/layer/TileLayerSpec.js b/extlib/leaflet/spec/suites/layer/TileLayerSpec.js
deleted file mode 100644
index 28517ad9..00000000
--- a/extlib/leaflet/spec/suites/layer/TileLayerSpec.js
+++ /dev/null
@@ -1 +0,0 @@
-describe('TileLayer', noSpecs);
\ No newline at end of file
diff --git a/extlib/leaflet/spec/suites/map/MapSpec.js b/extlib/leaflet/spec/suites/map/MapSpec.js
deleted file mode 100644
index 7908b1a9..00000000
--- a/extlib/leaflet/spec/suites/map/MapSpec.js
+++ /dev/null
@@ -1 +0,0 @@
-describe("Map", noSpecs);
\ No newline at end of file
diff --git a/extlib/leaflet/src/Leaflet.js b/extlib/leaflet/src/Leaflet.js
deleted file mode 100644
index 750a4a5f..00000000
--- a/extlib/leaflet/src/Leaflet.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**

- * @preserve Copyright (c) 2010-2011, CloudMade, Vladimir Agafonkin

- * Leaflet is a BSD-licensed JavaScript library for map display and interaction.

- * See http://cloudmade.github.com/Leaflet/ for more information.

- */

-

-(function(root) {

-	var L = {

-		VERSION: '0.2',

-		

-		ROOT_URL: (function() {

-			var scripts = document.getElementsByTagName('script'),

-				leafletRe = /^(.*\/)leaflet-?([\w-]*)\.js.*$/;

-			for (var i = 0, len = scripts.length; i < len; i++) {

-				var src = scripts[i].src,

-					res = src && src.match(leafletRe);

-				

-				if (res) {

-					if (res[2] == 'include') break;

-					return res[1];

-				}

-			}

-			return '../../dist/';

-		})(),

-		

-		noConflict: function() {

-			root.L = this._originalL;

-			return this;

-		},

-		

-		_originalL: root.L

-	};

-	

-	window.L = L;

-}(this));
diff --git a/extlib/leaflet/src/control/Control.Attribution.js b/extlib/leaflet/src/control/Control.Attribution.js
deleted file mode 100644
index 84b31f52..00000000
--- a/extlib/leaflet/src/control/Control.Attribution.js
+++ /dev/null
@@ -1,55 +0,0 @@
-L.Control.Attribution = L.Class.extend({

-	onAdd: function(map) {

-		this._container = L.DomUtil.create('div', 'leaflet-control-attribution');

-		this._map = map;

-		this._prefix = 'Powered by <a href="http://leaflet.cloudmade.com">Leaflet</a>';

-		this._attributions = {};

-		this._update();

-	},

-	

-	getPosition: function() {

-		return L.Control.Position.BOTTOM_RIGHT;

-	},

-	

-	getContainer: function() {

-		return this._container;

-	},

-	

-	setPrefix: function(prefix) {

-		this._prefix = prefix;

-	},

-	

-	addAttribution: function(text) {

-		if (!text) return;

-		this._attributions[text] = true;

-		this._update();

-	},

-	

-	removeAttribution: function(text) {

-		if (!text) return;

-		delete this._attributions[text];

-		this._update();

-	},

-	

-	_update: function() {

-		if (!this._map) return;

-		

-		var attribs = [];

-		

-		for (var i in this._attributions) {

-			if (this._attributions.hasOwnProperty(i)) {

-				attribs.push(i);

-			}

-		}

-		

-		var prefixAndAttribs = [];

-		if (this._prefix) {

-			prefixAndAttribs.push(this._prefix);

-		}

-		if (attribs.length) {

-			prefixAndAttribs.push(attribs.join(', '));

-		}

-		

-		this._container.innerHTML = prefixAndAttribs.join(' &mdash; ');

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/control/Control.Zoom.js b/extlib/leaflet/src/control/Control.Zoom.js
deleted file mode 100644
index d6964fd6..00000000
--- a/extlib/leaflet/src/control/Control.Zoom.js
+++ /dev/null
@@ -1,36 +0,0 @@
-

-L.Control.Zoom = L.Class.extend({

-	onAdd: function(map) {

-		this._map = map;

-		this._container = L.DomUtil.create('div', 'leaflet-control-zoom');

-		

-		this._zoomInButton = this._createButton(

-				'Zoom in', 'leaflet-control-zoom-in', this._map.zoomIn, this._map);

-		this._zoomOutButton = this._createButton(

-				'Zoom out', 'leaflet-control-zoom-out', this._map.zoomOut, this._map);

-

-		this._container.appendChild(this._zoomInButton);

-		this._container.appendChild(this._zoomOutButton);

-	},

-	

-	getContainer: function() { 

-		return this._container; 

-	},

-	

-	getPosition: function() {

-		return L.Control.Position.TOP_LEFT;

-	},

-	

-	_createButton: function(title, className, fn, context) {

-		var link = document.createElement('a');

-		link.href = '#';

-		link.title = title;

-		link.className = className;

-

-		L.DomEvent.disableClickPropagation(link);

-		L.DomEvent.addListener(link, 'click', L.DomEvent.preventDefault);

-		L.DomEvent.addListener(link, 'click', fn, context);

-		

-		return link;

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/control/Control.js b/extlib/leaflet/src/control/Control.js
deleted file mode 100644
index a01c6807..00000000
--- a/extlib/leaflet/src/control/Control.js
+++ /dev/null
@@ -1,9 +0,0 @@
-

-L.Control = {};

-

-L.Control.Position = {

-	TOP_LEFT: 'topLeft',

-	TOP_RIGHT: 'topRight',

-	BOTTOM_LEFT: 'bottomLeft',

-	BOTTOM_RIGHT: 'bottomRight'

-};
\ No newline at end of file
diff --git a/extlib/leaflet/src/core/Browser.js b/extlib/leaflet/src/core/Browser.js
deleted file mode 100644
index 0604ed6d..00000000
--- a/extlib/leaflet/src/core/Browser.js
+++ /dev/null
@@ -1,23 +0,0 @@
-(function() {

-	var ua = navigator.userAgent.toLowerCase(),

-		ie = !!window.ActiveXObject,

-		webkit = ua.indexOf("webkit") != -1,

-		mobile = ua.indexOf("mobi") != -1,

-		android = ua.indexOf("android") != -1,

-		opera = window.opera;

-	

-	L.Browser = {

-		ie: ie,

-		ie6: ie && !window.XMLHttpRequest,

-		webkit: webkit,

-		webkit3d: webkit && ('WebKitCSSMatrix' in window) && ('m11' in new WebKitCSSMatrix()),

-		mobileWebkit: webkit && (mobile || android),

-		mobileOpera: mobile && opera,

-		gecko: ua.indexOf("gecko") != -1,

-		android: android

-	};

-	

-	//TODO replace ugly ua sniffing with feature detection

-	

-	L.Browser.touch = L.Browser.mobileWebkit || L.Browser.mobileOpera;

-})();
\ No newline at end of file
diff --git a/extlib/leaflet/src/core/Class.js b/extlib/leaflet/src/core/Class.js
deleted file mode 100644
index 09a9e539..00000000
--- a/extlib/leaflet/src/core/Class.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * Class powers the OOP facilities of the library. Thanks to John Resig and Dean Edwards for inspiration!

- */

-

-L.Class = function() {}; 

-

-L.Class.extend = function(/*Object*/ props) /*-> Class*/ {

-	

-	// extended class with the new prototype

-	var NewClass = function() {

-		if (!L.Class._prototyping && this.initialize) {

-			this.initialize.apply(this, arguments);

-		}

-	};

-

-	// instantiate class without calling constructor

-	L.Class._prototyping = true;

-	var proto = new this();

-	L.Class._prototyping = false;

-

-	proto.constructor = NewClass;

-	NewClass.prototype = proto;

-	

-	// add superclass access

-	proto.superclass = this.prototype;

-	

-	// add class name

-	//proto.className = props;

-	

-	// mix static properties into the class

-	if (props.statics) {

-		L.Util.extend(NewClass, props.statics);

-		delete props.statics;

-	}

-	

-	// mix includes into the prototype

-	if (props.includes) {

-		L.Util.extend.apply(null, [proto].concat(props.includes));

-		delete props.includes;

-	}

-	

-	// merge options

-	if (props.options && proto.options) {

-		props.options = L.Util.extend({}, proto.options, props.options);

-	}

-

-	// mix given properties into the prototype

-	L.Util.extend(proto, props);

-	

-	// allow inheriting further

-	NewClass.extend = arguments.callee;

-	

-	// method for adding properties to prototype

-	NewClass.include = function(props) {

-		L.Util.extend(this.prototype, props);

-	};

-	

-	//inherit parent's statics

-	for (var i in this) {

-		if (this.hasOwnProperty(i) && i != 'prototype') {

-			NewClass[i] = this[i];

-		}

-	}

-	

-	return NewClass;

-};
\ No newline at end of file
diff --git a/extlib/leaflet/src/core/Events.js b/extlib/leaflet/src/core/Events.js
deleted file mode 100644
index 53ea20fa..00000000
--- a/extlib/leaflet/src/core/Events.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*

- * L.Mixin.Events adds custom events functionality to Leaflet classes 

- */

-

-L.Mixin = {};

-

-L.Mixin.Events = {

-	addEventListener: function(/*String*/ type, /*Function*/ fn, /*(optional) Object*/ context) {

-		var events = this._leaflet_events = this._leaflet_events || {};

-		events[type] = events[type] || [];

-		events[type].push({

-			action: fn,

-			context: context

-		});

-		return this;

-	},

-	

-	hasEventListeners: function(/*String*/ type) /*-> Boolean*/ {

-		var k = '_leaflet_events';

-		return (k in this) && (type in this[k]) && (this[k][type].length > 0);

-	},

-	

-	removeEventListener: function(/*String*/ type, /*Function*/ fn, /*(optional) Object*/ context) {

-		if (!this.hasEventListeners(type)) { return this; }

-		

-		for (var i = 0, events = this._leaflet_events, len = events[type].length; i < len; i++) {

-			if (

-				(events[type][i].action === fn) && 

-				(!context || (events[type][i].context === context))

-			) {

-				events[type].splice(i, 1);

-				return this;

-			}

-		}

-		return this;

-	},

-	

-	fireEvent: function(/*String*/ type, /*(optional) Object*/ data) {

-		if (!this.hasEventListeners(type)) { return; }

-		

-		var event = L.Util.extend({

-			type: type,

-			target: this

-		}, data);

-		

-		var listeners = this._leaflet_events[type].slice();

-		

-		for (var i = 0, len = listeners.length; i < len; i++) {

-			listeners[i].action.call(listeners[i].context || this, event);

-		}

-		

-		return this;

-	}

-};

-

-L.Mixin.Events.on = L.Mixin.Events.addEventListener;

-L.Mixin.Events.off = L.Mixin.Events.removeEventListener;

-L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
\ No newline at end of file
diff --git a/extlib/leaflet/src/core/Util.js b/extlib/leaflet/src/core/Util.js
deleted file mode 100644
index 28daa284..00000000
--- a/extlib/leaflet/src/core/Util.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*

- * L.Util is a namespace for various utility functions.

- */

-

-L.Util = {

-	extend: function(/*Object*/ dest) /*-> Object*/ {	// merge src properties into dest

-		var sources = Array.prototype.slice.call(arguments, 1);

-		for (var j = 0, len = sources.length, src; j < len; j++) {

-			src = sources[j] || {};

-			for (var i in src) {

-				if (src.hasOwnProperty(i)) {

-					dest[i] = src[i];

-				}

-			}

-		}

-		return dest;

-	},

-

-	bind: function(/*Function*/ fn, /*Object*/ obj) /*-> Object*/ {

-		return function() {

-			return fn.apply(obj, arguments);

-		};

-	},

-

-	stamp: (function() {

-		var lastId = 0, key = '_leaflet_id';

-		return function(/*Object*/ obj) {

-			obj[key] = obj[key] || ++lastId;

-			return obj[key];

-		};

-	})(),

-	

-	requestAnimFrame: (function() {

-		function timeoutDefer(callback) {

-			window.setTimeout(callback, 1000 / 60);

-		}

-		

-		var requestFn = window.requestAnimationFrame || 

-			window.webkitRequestAnimationFrame || 

-			window.mozRequestAnimationFrame || 

-			window.oRequestAnimationFrame || 

-			window.msRequestAnimationFrame || 

-			timeoutDefer;

-		

-		return function(callback, context, immediate) {

-			callback = context ? L.Util.bind(callback, context) : context;

-			if (immediate && requestFn === timeoutDefer) {

-				callback();

-			} else {

-				requestFn(callback);

-			}

-		};

-	})(),

-

-	limitExecByInterval: function(fn, time, context) {	

-		var lock, execOnUnlock, args;

-		function exec(){

-			lock = false;

-			if (execOnUnlock) {

-				args.callee.apply(context, args);

-				execOnUnlock = false;

-			}

-		}

-		return function() {

-			args = arguments;

-			if (!lock) {				

-				lock = true;

-				setTimeout(exec, time);

-				fn.apply(context, args);

-			} else {

-				execOnUnlock = true;

-			}

-		};

-	},

-	

-	falseFn: function() { return false; },

-	

-	formatNum: function(num, digits) {

-		var pow = Math.pow(10, digits || 5);

-		return Math.round(num * pow) / pow;

-	},

-	

-	setOptions: function(obj, options) {

-		obj.options = L.Util.extend({}, obj.options, options);

-	},

-	

-	getParamString: function(obj) {

-		var params = [];

-		for (var i in obj) {

-			if (obj.hasOwnProperty(i)) {

-				params.push(i + '=' + obj[i]);

-			}

-		}

-		return '?' + params.join('&');

-	}

-};

diff --git a/extlib/leaflet/src/dom/DomEvent.DoubleTap.js b/extlib/leaflet/src/dom/DomEvent.DoubleTap.js
deleted file mode 100644
index 08bd79b9..00000000
--- a/extlib/leaflet/src/dom/DomEvent.DoubleTap.js
+++ /dev/null
@@ -1,41 +0,0 @@
-L.Util.extend(L.DomEvent, {

-	// inspired by Zepto touch code by Thomas Fuchs

-	addDoubleTapListener: function(obj, handler, id) {

-		var last,

-			doubleTap = false,

-			delay = 250,

-			touch,

-			pre = '_leaflet_',

-			touchstart = 'touchstart',

-			touchend = 'touchend';

-		

-		function onTouchStart(e) {

-			if (e.touches.length != 1) return;

-			

-			var now = Date.now(), 

-				delta = now - (last || now);

-			

-			touch = e.touches[0];

-			doubleTap = (delta > 0 && delta <= delay);

-			last = now;

-		}

-		function onTouchEnd(e) {

-			if (doubleTap) {

-				touch.type = 'dblclick';

-				handler(touch);

-				last = null;

-			}

-		}

-		obj[pre + touchstart + id] = onTouchStart;

-		obj[pre + touchend + id] = onTouchEnd;

-		

-		obj.addEventListener(touchstart, onTouchStart, false);

-		obj.addEventListener(touchend, onTouchEnd, false);

-	},

-	

-	removeDoubleTapListener: function(obj, id) {

-		var pre = '_leaflet_';

-		obj.removeEventListener(obj, obj[pre + 'touchstart' + id], false);

-		obj.removeEventListener(obj, obj[pre + 'touchend' + id], false);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/dom/DomEvent.js b/extlib/leaflet/src/dom/DomEvent.js
deleted file mode 100644
index bcabebc2..00000000
--- a/extlib/leaflet/src/dom/DomEvent.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/*

- * L.DomEvent contains functions for working with DOM events.

- */

-

-L.DomEvent = {

-	/* inpired by John Resig, Dean Edwards and YUI addEvent implementations */

-	addListener: function(/*HTMLElement*/ obj, /*String*/ type, /*Function*/ fn, /*Object*/ context) {

-		var id = L.Util.stamp(fn);

-		

-		function handler(e) {

-			return fn.call(context || obj, e || L.DomEvent._getEvent());

-		}

-		

-		if (L.Browser.touch && (type == 'dblclick') && this.addDoubleTapListener) {

-			this.addDoubleTapListener(obj, handler, id);

-		} else if ('addEventListener' in obj) {

-			if (type == 'mousewheel') {

-				obj.addEventListener('DOMMouseScroll', handler, false);

-				obj.addEventListener(type, handler, false);

-			} else if ((type == 'mouseenter') || (type == 'mouseleave')) {

-				var originalHandler = handler,

-					newType = (type == 'mouseenter' ? 'mouseover' : 'mouseout');

-				handler = function(e) {

-					if (!L.DomEvent._checkMouse(obj, e)) return;

-					return originalHandler(e);

-				};

-				obj.addEventListener(newType, handler, false);

-			} else {

-				obj.addEventListener(type, handler, false);

-			}

-		} else if ('attachEvent' in obj) {

-			obj.attachEvent("on" + type, handler);

-		}

-		

-		obj['_leaflet_' + type + id] = handler;

-	},

-	

-	removeListener: function(/*HTMLElement*/ obj, /*String*/ type, /*Function*/ fn) {

-		var id = L.Util.stamp(fn),

-			key = '_leaflet_' + type + id;

-			handler = obj[key];

-			

-		if (L.Browser.mobileWebkit && (type == 'dblclick') && this.removeDoubleTapListener) {

-			this.removeDoubleTapListener(obj, id);

-		} else if ('removeEventListener' in obj) {

-			if (type == 'mousewheel') {

-				obj.removeEventListener('DOMMouseScroll', handler, false);

-				obj.removeEventListener(type, handler, false);

-			} else if ((type == 'mouseenter') || (type == 'mouseleave')) {

-				obj.removeEventListener((type == 'mouseenter' ? 'mouseover' : 'mouseout'), handler, false);

-			} else {

-				obj.removeEventListener(type, handler, false);

-			}

-		} else if ('detachEvent' in obj) {

-			obj.detachEvent("on" + type, handler);

-		}

-		obj[key] = null; 

-	},

-	

-	_checkMouse: function(el, e) {

-		var related = e.relatedTarget;

-		

-		if (!related) return true;

-		

-		try {

-			while (related && (related != el)) { 

-				related = related.parentNode; 

-			}

-		} catch(err) { return false; }

-		

-		return (related != el);

-	},

-	

-	_getEvent: function()/*->Event*/ {

-		var e = window.event;

-		if (!e) {

-			var caller = arguments.callee.caller;

-			while (caller) {

-				e = caller['arguments'][0];

-				if (e && Event == e.constructor) { break; }

-				caller = caller.caller;

-			}

-		}

-		return e;

-	},

-	

-	stopPropagation: function(/*Event*/ e) {

-		if (e.stopPropagation) {

-			e.stopPropagation();

-		} else {

-			e.cancelBubble = true;

-		}

-	},

-	

-	disableClickPropagation: function(/*HTMLElement*/ el) {

-		L.DomEvent.addListener(el, 'mousedown', L.DomEvent.stopPropagation);

-		L.DomEvent.addListener(el, 'click', L.DomEvent.stopPropagation);

-		L.DomEvent.addListener(el, 'dblclick', L.DomEvent.stopPropagation);

-	},

-	

-	preventDefault: function(/*Event*/ e) {

-		if (e.preventDefault) {

-			e.preventDefault();

-		} else {

-			e.returnValue = false;

-		}

-	},

-	

-	stop: function(e) {

-		L.DomEvent.preventDefault(e);

-		L.DomEvent.stopPropagation(e);

-	},

-	

-	getMousePosition: function(e, container) {

-		var x = e.pageX ? e.pageX : e.clientX + 

-				document.body.scrollLeft + document.documentElement.scrollLeft,

-			y = e.pageY ? e.pageY : e.clientY + 

-					document.body.scrollTop + document.documentElement.scrollTop,

-			pos = new L.Point(x, y);

-			

-		return (container ? 

-					pos.subtract(L.DomUtil.getCumulativeOffset(container)) : pos);

-	},

-	

-	getWheelDelta: function(e) {

-		var delta = 0;

-		if (e.wheelDelta) { delta = e.wheelDelta/120; }

-			if (e.detail) { delta = -e.detail/3; }

-			return delta;

-	}

-};

-

diff --git a/extlib/leaflet/src/dom/DomUtil.js b/extlib/leaflet/src/dom/DomUtil.js
deleted file mode 100644
index 7672bfba..00000000
--- a/extlib/leaflet/src/dom/DomUtil.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

- * L.DomUtil contains various utility functions for working with DOM

- */

-

-L.DomUtil = {

-	get: function(id) {

-		return (typeof id == 'string' ? document.getElementById(id) : id);

-	},

-	

-	getStyle: function(el, style) {

-		var value = el.style[style];

-		if (!value && el.currentStyle) {

-			value = el.currentStyle[style];

-		}

-		if (!value || value == 'auto') {

-			var css = document.defaultView.getComputedStyle(el, null);

-			value = css ? css[style] : null;

-		}

-		return (value == 'auto' ? null : value);

-	},

-	

-	getCumulativeOffset: function(el) {

-		var top = 0, 

-			left = 0;

-		do {

-			top += el.offsetTop || 0;

-			left += el.offsetLeft || 0;

-			el = el.offsetParent;

-		} while (el);

-		return new L.Point(left, top);

-	},

-	

-	create: function(tagName, className, container) {

-		var el = document.createElement(tagName);

-		el.className = className;

-		if (container) {

-			container.appendChild(el);

-		}

-		return el;

-	},

-	

-	disableTextSelection: function() {

-		if (document.selection && document.selection.empty) { 

-			document.selection.empty();

-		}

-		if (!this._onselectstart) {

-			this._onselectstart = document.onselectstart;

-			document.onselectstart = L.Util.falseFn;

-		}

-	},

-	

-	enableTextSelection: function() {

-		document.onselectstart = this._onselectstart;

-		this._onselectstart = null;

-	},

-	

-	CLASS_RE: /(\\s|^)'+cls+'(\\s|$)/,

-	

-	hasClass: function(el, name) {

-		return (el.className.length > 0) && 

-				new RegExp("(^|\\s)" + name + "(\\s|$)").test(el.className);

-	},

-	

-	addClass: function(el, name) {

-		if (!L.DomUtil.hasClass(el, name)) {

-			el.className += (el.className ? ' ' : '') + name; 

-		}

-	},

-	

-	setOpacity: function(el, value) {

-		if (L.Browser.ie) {

-			el.style.filter = 'alpha(opacity=' + Math.round(value * 100) + ')';

-		} else {

-			el.style.opacity = value;

-		}

-	},

-	

-	//TODO refactor away this ugly translate/position mess

-	

-	testProp: function(props) {

-		var style = document.documentElement.style;

-		

-		for (var i = 0; i < props.length; i++) {

-			if (props[i] in style) {

-				return props[i];

-			}

-		}

-		return false;

-	},

-	

-	getTranslateString: function(point) {

-		return L.DomUtil.TRANSLATE_OPEN + 

-				point.x + 'px,' + point.y + 'px' + 

-				L.DomUtil.TRANSLATE_CLOSE;

-	},

-	

-	getScaleString: function(scale, origin) {

-		 return L.DomUtil.getTranslateString(origin) + 

-         		' scale(' + scale + ') ' +

-         		L.DomUtil.getTranslateString(origin.multiplyBy(-1));

-	},

-	

-	setPosition: function(el, point) {

-		el._leaflet_pos = point;

-		if (L.Browser.webkit) {

-			el.style[L.DomUtil.TRANSFORM] =  L.DomUtil.getTranslateString(point);

-		} else {

-			el.style.left = point.x + 'px';

-			el.style.top = point.y + 'px';

-		}

-	},

-	

-	getPosition: function(el) {

-		return el._leaflet_pos;

-	}

-};

-

-L.Util.extend(L.DomUtil, {

-	TRANSITION: L.DomUtil.testProp(['transition', 'webkitTransition', 'OTransition', 'MozTransition', 'msTransition']),

-	TRANSFORM: L.DomUtil.testProp(['transformProperty', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']),

-	

-	TRANSLATE_OPEN: 'translate' + (L.Browser.webkit3d ? '3d(' : '('),

-	TRANSLATE_CLOSE: L.Browser.webkit3d ? ',0)' : ')'

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/dom/Draggable.js b/extlib/leaflet/src/dom/Draggable.js
deleted file mode 100644
index c0aea23e..00000000
--- a/extlib/leaflet/src/dom/Draggable.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/*

- * L.Draggable allows you to add dragging capabilities to any element. Supports mobile devices too.

- */

-

-L.Draggable = L.Class.extend({

-	includes: L.Mixin.Events,

-	

-	statics: {

-		START: L.Browser.touch ? 'touchstart' : 'mousedown',

-		END: L.Browser.touch ? 'touchend' : 'mouseup',

-		MOVE: L.Browser.touch ? 'touchmove' : 'mousemove',

-		TAP_TOLERANCE: 15

-	},

-	

-	initialize: function(element, dragStartTarget) {

-		this._element = element;

-		this._dragStartTarget = dragStartTarget || element;

-	},

-	

-	enable: function() {

-		if (this._enabled) { return; }

-		L.DomEvent.addListener(this._dragStartTarget, L.Draggable.START, this._onDown, this);

-		this._enabled = true;

-	},

-	

-	disable: function() {

-		if (!this._enabled) { return; }

-		L.DomEvent.removeListener(this._dragStartTarget, L.Draggable.START, this._onDown);

-		this._enabled = false;

-	},

-

-	_onDown: function(e) {

-		if (e.shiftKey || ((e.which != 1) && (e.button != 1) && !e.touches)) { return; }

-		

-		if (e.touches && e.touches.length > 1) { return; }

-

-		var first = (e.touches && e.touches.length == 1 ? e.touches[0] : e);

-		

-		L.DomEvent.preventDefault(e);

-			

-		if (L.Browser.mobileWebkit) {

-			first.target.className += ' leaflet-active';

-		}

-		

-		this._moved = false;

-		

-		L.DomUtil.disableTextSelection();

-		this._setMovingCursor();

-		

-		this._startPos = this._newPos = L.DomUtil.getPosition(this._element);

-		this._startPoint = new L.Point(first.clientX, first.clientY);

-		

-		L.DomEvent.addListener(document, L.Draggable.MOVE, this._onMove, this);

-		L.DomEvent.addListener(document, L.Draggable.END, this._onUp, this);

-	},

-	

-	_onMove: function(e) {

-		if (e.touches && e.touches.length > 1) { return; }

-

-		L.DomEvent.preventDefault(e);

-		

-		var first = (e.touches && e.touches.length == 1 ? e.touches[0] : e);

-		

-		if (!this._moved) {

-			this.fire('dragstart');

-			this._moved = true;

-		}

-

-		var newPoint = new L.Point(first.clientX, first.clientY);

-		this._newPos = this._startPos.add(newPoint).subtract(this._startPoint);

-		

-		L.Util.requestAnimFrame(this._updatePosition, this, true);

-		

-		this.fire('drag');

-	},

-	

-	_updatePosition: function() {

-		L.DomUtil.setPosition(this._element, this._newPos);

-	},

-	

-	_onUp: function(e) {

-		if (e.changedTouches) {

-			var first = e.changedTouches[0],

-				el = first.target,

-				dist = (this._newPos && this._newPos.distanceTo(this._startPos)) || 0;

-			

-			el.className = el.className.replace(' leaflet-active', '');

-			

-			if (dist < L.Draggable.TAP_TOLERANCE) {

-				this._simulateEvent('click', first);

-			}

-		}

-		

-		L.DomUtil.enableTextSelection();

-		

-		this._restoreCursor();

-		

-		L.DomEvent.removeListener(document, L.Draggable.MOVE, this._onMove);

-		L.DomEvent.removeListener(document, L.Draggable.END, this._onUp);

-		

-		if (this._moved) {

-			this.fire('dragend');

-		}

-	},

-	

-	_removeActiveClass: function(el) {

-	},

-	

-	_setMovingCursor: function() {

-		this._bodyCursor = document.body.style.cursor;

-		document.body.style.cursor = 'move';

-	},

-	

-	_restoreCursor: function() {

-		document.body.style.cursor = this._bodyCursor;

-	},

-	

-	_simulateEvent: function(type, e) {

-		var simulatedEvent = document.createEvent('MouseEvent');

-		

-		simulatedEvent.initMouseEvent(

-				type, true, true, window, 1, 

-				e.screenX, e.screenY, 

-				e.clientX, e.clientY, 

-				false, false, false, false, 0, null);

-		

-		e.target.dispatchEvent(simulatedEvent);

-	}

-});

diff --git a/extlib/leaflet/src/dom/transition/Transition.Native.js b/extlib/leaflet/src/dom/transition/Transition.Native.js
deleted file mode 100644
index 6ce16a67..00000000
--- a/extlib/leaflet/src/dom/transition/Transition.Native.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/*

- * L.Transition native implementation that powers Leaflet animation 

- * in browsers that support CSS3 Transitions

- */

-

-L.Transition = L.Transition.extend({

-	statics: (function() {

-		var transition = L.DomUtil.TRANSITION,

-			transitionEnd = (transition == 'webkitTransition' || transition == 'OTransition' ? 

-				transition + 'End' : 'transitionend');

-		

-		return {

-			NATIVE: !!transition,

-			

-			TRANSITION: transition,

-			PROPERTY: transition + 'Property',

-			DURATION: transition + 'Duration',

-			EASING: transition + 'TimingFunction',

-			END: transitionEnd,

-			

-			// transition-property value to use with each particular custom property

-			CUSTOM_PROPS_PROPERTIES: {

-				position: L.Browser.webkit ? L.DomUtil.TRANSFORM : 'top, left'

-			}

-		};

-	})(),

-	

-	options: {

-		fakeStepInterval: 100

-	},

-	

-	initialize: function(/*HTMLElement*/ el, /*Object*/ options) {

-		this._el = el;

-		L.Util.setOptions(this, options);

-

-		L.DomEvent.addListener(el, L.Transition.END, this._onTransitionEnd, this);

-		this._onFakeStep = L.Util.bind(this._onFakeStep, this);

-	},

-	

-	run: function(/*Object*/ props) {

-		var prop,

-			propsList = [],

-			customProp = L.Transition.CUSTOM_PROPS_PROPERTIES;

-		

-		for (prop in props) {

-			if (props.hasOwnProperty(prop)) {

-				prop = customProp[prop] ? customProp[prop] : prop;

-				prop = prop.replace(/([A-Z])/g, function(w) { return '-' + w.toLowerCase(); });

-				propsList.push(prop);

-			}

-		}

-		

-		this._el.style[L.Transition.DURATION] = this.options.duration + 's';

-		this._el.style[L.Transition.EASING] = this.options.easing;

-		this._el.style[L.Transition.PROPERTY] = propsList.join(', ');

-		

-		for (prop in props) {

-			if (props.hasOwnProperty(prop)) {

-				this._setProperty(prop, props[prop]);

-			}

-		}

-		

-		this._inProgress = true;

-		

-		this.fire('start');

-		

-		if (L.Transition.NATIVE) {

-			this._timer = setInterval(this._onFakeStep, this.options.fakeStepInterval);

-		} else {

-			this._onTransitionEnd();

-		}

-	},

-	

-	_onFakeStep: function() {

-		this.fire('step');

-	},

-	

-	_onTransitionEnd: function() {

-		if (this._inProgress) {

-			this._inProgress = false;

-			clearInterval(this._timer);

-			

-			this._el.style[L.Transition.PROPERTY] = 'none';

-		

-			this.fire('step');

-			this.fire('end');

-		}

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/dom/transition/Transition.Timer.js b/extlib/leaflet/src/dom/transition/Transition.Timer.js
deleted file mode 100644
index af4e4ef2..00000000
--- a/extlib/leaflet/src/dom/transition/Transition.Timer.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

- * L.Transition fallback implementation that powers Leaflet animation 

- * in browsers that don't support CSS3 Transitions

- */

-

-L.Transition = L.Transition.NATIVE ? L.Transition : L.Transition.extend({

-	statics: {

-		getTime: Date.now || function() { return +new Date(); },

-		

-		TIMER: true,

-		

-		EASINGS: {

-			'ease': [0.25, 0.1, 0.25, 1.0],

-			'linear': [0.0, 0.0, 1.0, 1.0],

-			'ease-in': [0.42, 0, 1.0, 1.0],

-			'ease-out': [0, 0, 0.58, 1.0],

-			'ease-in-out': [0.42, 0, 0.58, 1.0]

-		},

-		

-		CUSTOM_PROPS_GETTERS: {

-			position: L.DomUtil.getPosition

-		},

-		

-		//used to get units from strings like "10.5px" (->px)

-		UNIT_RE: /^[\d\.]+(\D*)$/

-	},

-	

-	options: {

-		fps: 50

-	},

-	

-	initialize: function(el, options) {

-		this._el = el;

-		L.Util.extend(this.options, options);

-

-		var easings = L.Transition.EASINGS[this.options.easing] || L.Transition.EASINGS['ease'];

-		

-		this._p1 = new L.Point(0, 0);

-		this._p2 = new L.Point(easings[0], easings[1]);

-		this._p3 = new L.Point(easings[2], easings[3]);

-		this._p4 = new L.Point(1, 1);

-		

-		this._step = L.Util.bind(this._step, this);

-		this._interval = Math.round(1000 / this.options.fps);

-	},

-	

-	run: function(props) {

-		this._props = {};

-		

-		var getters = L.Transition.CUSTOM_PROPS_GETTERS,

-			re = L.Transition.UNIT_RE;

-		

-		this.fire('start');

-		

-		for (var prop in props) {

-			if (props.hasOwnProperty(prop)) {

-				var p = {};

-				if (prop in getters) {

-					p.from = getters[prop](this._el);

-				} else {

-					var matches = this._el.style[prop].match(re);

-					p.from = parseFloat(matches[0]);

-					p.unit = matches[1];

-				}

-				p.to = props[prop];

-				this._props[prop] = p;

-			}

-		}

-		

-		clearInterval(this._timer);

-		this._timer = setInterval(this._step, this._interval);

-		this._startTime = L.Transition.getTime();

-	},

-	

-	_step: function() {

-		var time = L.Transition.getTime(),

-			elapsed = time - this._startTime,

-			duration = this.options.duration * 1000;

-		

-		if (elapsed < duration) {

-			this._runFrame(this._cubicBezier(elapsed / duration));

-		} else {

-			this._runFrame(1);

-			this._complete();

-		}

-	},

-	

-	_runFrame: function(percentComplete) {

-		var setters = L.Transition.CUSTOM_PROPS_SETTERS,

-			prop, p, value;

-		

-		for (prop in this._props) {

-			if (this._props.hasOwnProperty(prop)) {

-				p = this._props[prop];

-				if (prop in setters) {

-					value = p.to.subtract(p.from).multiplyBy(percentComplete).add(p.from);

-					setters[prop](this._el, value);

-				} else {

-					this._el.style[prop] = 

-							((p.to - p.from) * percentComplete + p.from) + p.unit;

-				}

-			}

-		}

-		this.fire('step');

-	},

-	

-	_complete: function() {

-		clearInterval(this._timer);

-		this.fire('end');

-	},

-	

-	_cubicBezier: function(t) {

-		var a = Math.pow(1 - t, 3),

-			b = 3 * Math.pow(1 - t, 2) * t,

-			c = 3 * (1 - t) * Math.pow(t, 2),

-			d = Math.pow(t, 3),

-			p1 = this._p1.multiplyBy(a),

-			p2 = this._p2.multiplyBy(b),

-			p3 = this._p3.multiplyBy(c),

-			p4 = this._p4.multiplyBy(d);

-		

-		return p1.add(p2).add(p3).add(p4).y;

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/dom/transition/Transition.js b/extlib/leaflet/src/dom/transition/Transition.js
deleted file mode 100644
index ccf48572..00000000
--- a/extlib/leaflet/src/dom/transition/Transition.js
+++ /dev/null
@@ -1,28 +0,0 @@
-L.Transition = L.Class.extend({

-	includes: L.Mixin.Events,

-	

-	statics: {

-		CUSTOM_PROPS_SETTERS: {

-			position: L.DomUtil.setPosition

-			//TODO transform custom attr

-		},

-		

-		implemented: function() {

-			return L.Transition.NATIVE || L.Transition.TIMER;

-		}

-	},

-	

-	options: {

-		easing: 'ease',

-		duration: 0.5

-	},

-	

-	_setProperty: function(prop, value) {

-		var setters = L.Transition.CUSTOM_PROPS_SETTERS;

-		if (prop in setters) {

-			setters[prop](this._el, value);

-		} else {

-			this._el.style[prop] = value;

-		}

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/geo/LatLng.js b/extlib/leaflet/src/geo/LatLng.js
deleted file mode 100644
index fb916547..00000000
--- a/extlib/leaflet/src/geo/LatLng.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*

-	CM.LatLng represents a geographical point with latitude and longtitude coordinates.

-*/

-

-L.LatLng = function(/*Number*/ lat, /*Number*/ lng, /*Boolean*/ noWrap) {

-	if (noWrap !== true) {

-		lat = Math.max(Math.min(lat, 90), -90);					// clamp latitude into -90..90

-		lng = (lng + 180) % 360 + (lng < -180 ? 180 : -180);	// wrap longtitude into -180..180

-	}

-	

-	//TODO change to lat() & lng()

-	this.lat = lat;

-	this.lng = lng;

-};

-	

-L.Util.extend(L.LatLng, {

-	DEG_TO_RAD: Math.PI / 180,

-	RAD_TO_DEG: 180 / Math.PI,

-	MAX_MARGIN: 1.0E-9 // max margin of error for the "equals" check

-});

-

-L.LatLng.prototype = {

-	equals: function(/*LatLng*/ obj) {

-		if (!(obj instanceof L.LatLng)) { return false; }

-		

-		var margin = Math.max(Math.abs(this.lat - obj.lat), Math.abs(this.lng - obj.lng));

-		return margin <= L.LatLng.MAX_MARGIN;

-	},

-	

-	toString: function() {

-		return 'LatLng(' + 

-				L.Util.formatNum(this.lat) + ', ' + 

-				L.Util.formatNum(this.lng) + ')';

-	}

-};
\ No newline at end of file
diff --git a/extlib/leaflet/src/geo/LatLngBounds.js b/extlib/leaflet/src/geo/LatLngBounds.js
deleted file mode 100644
index c4e70ec3..00000000
--- a/extlib/leaflet/src/geo/LatLngBounds.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*

- * L.LatLngBounds represents a rectangular area on the map in geographical coordinates.

- */

-

-L.LatLngBounds = L.Class.extend({

-	initialize: function(southWest, northEast) {	// (LatLng, LatLng) or (LatLng[])

-		if (!southWest) return;

-		var latlngs = (southWest instanceof Array ? southWest : [southWest, northEast]);

-		for (var i = 0, len = latlngs.length; i < len; i++) {

-			this.extend(latlngs[i]);

-		}

-	},

-	

-	// extend the bounds to contain the given point

-	extend: function(/*LatLng*/ latlng) {

-		if (!this._southWest && !this._northEast) {

-			this._southWest = new L.LatLng(latlng.lat, latlng.lng);

-			this._northEast = new L.LatLng(latlng.lat, latlng.lng);

-		} else {

-			this._southWest.lat = Math.min(latlng.lat, this._southWest.lat);

-			this._southWest.lng = Math.min(latlng.lng, this._southWest.lng);

-			this._northEast.lat = Math.max(latlng.lat, this._northEast.lat);

-			this._northEast.lng = Math.max(latlng.lng, this._northEast.lng);

-		}

-	},

-	

-	getCenter: function() /*-> LatLng*/ {

-		return new L.LatLng(

-				(this._southWest.lat + this._northEast.lat) / 2, 

-				(this._southWest.lng + this._northEast.lng) / 2);

-	},

-	

-	getSouthWest: function() { return this._southWest; },

-	

-	getNorthEast: function() { return this._northEast; },

-	

-	getNorthWest: function() {

-		return new L.LatLng(this._northEast.lat, this._southWest.lng);

-	},

-	

-	getSouthEast: function() {

-		return new L.LatLng(this._southWest.lat, this._northEast.lng);

-	},

-	

-	contains: function(/*LatLngBounds or LatLng*/ obj) /*-> Boolean*/ {

-		var sw = this._southWest,

-			ne = this._northEast,

-			sw2, ne2;

-		

-		if (obj instanceof L.LatLngBounds) {

-			sw2 = obj.getSouthWest();

-			ne2 = obj.getNorthEast();

-		} else {

-			sw2 = ne2 = obj;

-		}

-		

-		return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&

-				(sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);

-	}

-});

-

-//TODO International date line?
\ No newline at end of file
diff --git a/extlib/leaflet/src/geo/crs/CRS.EPSG3395.js b/extlib/leaflet/src/geo/crs/CRS.EPSG3395.js
deleted file mode 100644
index 426dc73c..00000000
--- a/extlib/leaflet/src/geo/crs/CRS.EPSG3395.js
+++ /dev/null
@@ -1,13 +0,0 @@
-

-L.CRS.EPSG3395 = L.Util.extend({}, L.CRS, {

-	code: 'EPSG:3395',

-	

-	projection: L.Projection.Mercator,

-	transformation: (function() { 

-		var m = L.Projection.Mercator,

-			r = m.R_MAJOR,

-			r2 = m.R_MINOR;

-		

-		return new L.Transformation(0.5/(Math.PI * r), 0.5, -0.5/(Math.PI * r2), 0.5);

-	})()

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/geo/crs/CRS.EPSG3857.js b/extlib/leaflet/src/geo/crs/CRS.EPSG3857.js
deleted file mode 100644
index cbdbd03a..00000000
--- a/extlib/leaflet/src/geo/crs/CRS.EPSG3857.js
+++ /dev/null
@@ -1,17 +0,0 @@
-

-L.CRS.EPSG3857 = L.Util.extend({}, L.CRS, {

-	code: 'EPSG:3857',

-	

-	projection: L.Projection.SphericalMercator,

-	transformation: new L.Transformation(0.5/Math.PI, 0.5, -0.5/Math.PI, 0.5),

-	

-	project: function(/*LatLng*/ latlng)/*-> Point*/ {

-		var projectedPoint = this.projection.project(latlng),

-			earthRadius = 6378137;

-		return projectedPoint.multiplyBy(earthRadius);

-	}

-});

-

-L.CRS.EPSG900913 = L.Util.extend({}, L.CRS.EPSG3857, {

-	code: 'EPSG:900913'

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/geo/crs/CRS.EPSG4326.js b/extlib/leaflet/src/geo/crs/CRS.EPSG4326.js
deleted file mode 100644
index 1550718d..00000000
--- a/extlib/leaflet/src/geo/crs/CRS.EPSG4326.js
+++ /dev/null
@@ -1,7 +0,0 @@
-

-L.CRS.EPSG4326 = L.Util.extend({}, L.CRS, {

-	code: 'EPSG:4326',

-	

-	projection: L.Projection.LonLat,

-	transformation: new L.Transformation(1/360, 0.5, -1/360, 0.5)

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/geo/crs/CRS.js b/extlib/leaflet/src/geo/crs/CRS.js
deleted file mode 100644
index 2dc2aa8d..00000000
--- a/extlib/leaflet/src/geo/crs/CRS.js
+++ /dev/null
@@ -1,17 +0,0 @@
-

-L.CRS = {

-	latLngToPoint: function(/*LatLng*/ latlng, /*Number*/ scale)/*-> Point*/ {

-		var projectedPoint = this.projection.project(latlng);

-		return this.transformation._transform(projectedPoint, scale);

-	},

-	

-	pointToLatLng: function(/*Point*/ point, /*Number*/ scale, /*(optional) Boolean*/ unbounded)/*-> LatLng*/ {

-		var untransformedPoint = this.transformation.untransform(point, scale);

-		return this.projection.unproject(untransformedPoint, unbounded); 

-		//TODO get rid of 'unbounded' everywhere

-	},

-	

-	project: function(latlng) {

-		return this.projection.project(latlng);

-	}

-};
\ No newline at end of file
diff --git a/extlib/leaflet/src/geo/projection/Projection.LonLat.js b/extlib/leaflet/src/geo/projection/Projection.LonLat.js
deleted file mode 100644
index ece29717..00000000
--- a/extlib/leaflet/src/geo/projection/Projection.LonLat.js
+++ /dev/null
@@ -1,10 +0,0 @@
-

-L.Projection.LonLat = {

-	project: function(latlng) {

-		return new L.Point(latlng.lng, latlng.lat);

-	},

-	

-	unproject: function(point, unbounded) {

-		return new L.LatLng(point.y, point.x, unbounded);

-	}

-};

diff --git a/extlib/leaflet/src/geo/projection/Projection.Mercator.js b/extlib/leaflet/src/geo/projection/Projection.Mercator.js
deleted file mode 100644
index 9eafff18..00000000
--- a/extlib/leaflet/src/geo/projection/Projection.Mercator.js
+++ /dev/null
@@ -1,49 +0,0 @@
-

-L.Projection.Mercator = {

-	MAX_LATITUDE: 85.0840591556,

-	

-	R_MINOR: 6356752.3142,

-	R_MAJOR: 6378137,

-		

-	project: function(/*LatLng*/ latlng) /*-> Point*/ {

-		var d = L.LatLng.DEG_TO_RAD,

-			max = this.MAX_LATITUDE,

-			lat = Math.max(Math.min(max, latlng.lat), -max),

-			r = this.R_MAJOR,

-			x = latlng.lng * d * r,

-			y = lat * d,

-			tmp = this.R_MINOR / r,

-			eccent = Math.sqrt(1.0 - tmp * tmp),

-			con = eccent * Math.sin(y);

-			

-		con = Math.pow((1 - con)/(1 + con), eccent * 0.5);

-		

-		var ts = Math.tan(0.5 * ((Math.PI * 0.5) - y)) / con;

-		y = -r * Math.log(ts);

-		

-		return new L.Point(x, y);

-	},

-	

-	unproject: function(/*Point*/ point, /*Boolean*/ unbounded) /*-> LatLng*/ {	

-		var d = L.LatLng.RAD_TO_DEG,

-			r = this.R_MAJOR,

-			lng = point.x * d / r,

-			tmp = this.R_MINOR / r,

-			eccent = Math.sqrt(1 - (tmp * tmp)),

-			ts = Math.exp(- point.y / r),

-			phi = Math.PI/2 - 2 * Math.atan(ts),

-			numIter = 15,

-			tol = 1e-7,

-			i = numIter,

-			dphi = 0.1,

-			con;

-		

-		while ((Math.abs(dphi) > tol) && (--i > 0)) {

-			con = eccent * Math.sin(phi);

-			dphi = Math.PI/2 - 2 * Math.atan(ts * Math.pow((1.0 - con)/(1.0 + con), 0.5 * eccent)) - phi;

-			phi += dphi;

-		}

-			

-		return new L.LatLng(phi * d, lng, unbounded);

-	}

-};

diff --git a/extlib/leaflet/src/geo/projection/Projection.SphericalMercator.js b/extlib/leaflet/src/geo/projection/Projection.SphericalMercator.js
deleted file mode 100644
index be0532ff..00000000
--- a/extlib/leaflet/src/geo/projection/Projection.SphericalMercator.js
+++ /dev/null
@@ -1,23 +0,0 @@
-

-L.Projection.SphericalMercator = {

-	MAX_LATITUDE: 85.0511287798,

-		

-	project: function(/*LatLng*/ latlng) /*-> Point*/ {

-		var d = L.LatLng.DEG_TO_RAD,

-			max = this.MAX_LATITUDE,

-			lat = Math.max(Math.min(max, latlng.lat), -max),

-			x = latlng.lng * d,

-			y = lat * d;

-		y = Math.log(Math.tan(Math.PI/4 + y/2));

-		

-		return new L.Point(x, y);

-	},

-	

-	unproject: function(/*Point*/ point, /*Boolean*/ unbounded) /*-> LatLng*/ {	

-		var d = L.LatLng.RAD_TO_DEG,

-			lng = point.x * d,

-			lat = (2 * Math.atan(Math.exp(point.y)) - Math.PI/2) * d;

-			

-		return new L.LatLng(lat, lng, unbounded);

-	}

-};

diff --git a/extlib/leaflet/src/geo/projection/Projection.js b/extlib/leaflet/src/geo/projection/Projection.js
deleted file mode 100644
index 84316b30..00000000
--- a/extlib/leaflet/src/geo/projection/Projection.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*

- * L.Projection contains various geographical projections used by CRS classes.

- */

-

-L.Projection = {};

diff --git a/extlib/leaflet/src/geometry/Bounds.js b/extlib/leaflet/src/geometry/Bounds.js
deleted file mode 100644
index 73448ceb..00000000
--- a/extlib/leaflet/src/geometry/Bounds.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*

- * L.Bounds represents a rectangular area on the screen in pixel coordinates.

- */

-

-L.Bounds = L.Class.extend({

-	initialize: function(min, max) {	//(Point, Point) or Point[]

-		if (!min) return;

-		var points = (min instanceof Array ? min : [min, max]);

-		for (var i = 0, len = points.length; i < len; i++) {

-			this.extend(points[i]);

-		}

-	},

-

-	// extend the bounds to contain the given point

-	extend: function(/*Point*/ point) {

-		if (!this.min && !this.max) {

-			this.min = new L.Point(point.x, point.y);

-			this.max = new L.Point(point.x, point.y);

-		} else {

-			this.min.x = Math.min(point.x, this.min.x);

-			this.max.x = Math.max(point.x, this.max.x);

-			this.min.y = Math.min(point.y, this.min.y);

-			this.max.y = Math.max(point.y, this.max.y);

-		}

-	},

-	

-	getCenter: function(round)/*->Point*/ {

-		return new L.Point(

-				(this.min.x + this.max.x) / 2, 

-				(this.min.y + this.max.y) / 2, round);

-	},

-	

-	contains: function(/*Bounds or Point*/ obj)/*->Boolean*/ {

-		var min, max;

-		

-		if (obj instanceof L.Bounds) {

-			min = obj.min;

-			max = obj.max;

-		} else {

-			max = max = obj;

-		}

-		

-		return (min.x >= this.min.x) && 

-				(max.x <= this.max.x) &&

-				(min.y >= this.min.y) && 

-				(max.y <= this.max.y);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/geometry/LineUtil.js b/extlib/leaflet/src/geometry/LineUtil.js
deleted file mode 100644
index 72a80855..00000000
--- a/extlib/leaflet/src/geometry/LineUtil.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/*

- * L.LineUtil contains different utility functions for line segments 

- * and polylines (clipping, simplification, distances, etc.)

- */

-

-L.LineUtil = {

-	/*

-	 * Simplify polyline with vertex reduction and Douglas-Peucker simplification.

-	 * Improves rendering performance dramatically by lessening the number of points to draw.

-	 */

-	simplify: function(/*Point[]*/ points, /*Number*/ tolerance) {

-		if (!tolerance) return points.slice();

-		

-		// stage 1: vertex reduction

-		points = this.reducePoints(points, tolerance);

-		

-		// stage 2: Douglas-Peucker simplification

-		points = this.simplifyDP(points, tolerance);

-		

-		return points; 

-	},

-	

-	// distance from a point to a segment between two points

-	pointToSegmentDistance:  function(/*Point*/ p, /*Point*/ p1, /*Point*/ p2) {

-		return Math.sqrt(this._sqPointToSegmentDist(p, p1, p2));	

-	},

-	

-	// Douglas-Peucker simplification, see http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm

-	simplifyDP: function(points, tol) {

-		var maxDist2 = 0,

-			index = 0,

-			t2 = tol * tol;

-

-		for (var i = 1, len = points.length, dist2; i < len - 1; i++) {

-			dist2 = this._sqPointToSegmentDist(points[i], points[0], points[len - 1]);

-			if (dist2 > maxDist2) {

-				index = i;

-				maxDist2 = dist2;

-			}

-		}

-		

-		if (maxDist2 >= t2) {

-			var part1 = points.slice(0, index),

-				part2 = points.slice(index),

-				simplifiedPart1 = this.simplifyDP(part1, tol).slice(0, len - 2),

-				simplifiedPart2 = this.simplifyDP(part2, tol);

-			

-			return simplifiedPart1.concat(simplifiedPart2);

-		} else {

-			return [points[0], points[len - 1]];

-		}

-	},

-	

-	// reduce points that are too close to each other to a single point

-	reducePoints: function(points, tol) {

-		var reducedPoints = [points[0]],

-			t2 = tol * tol;

-		

-		for (var i = 1, prev = 0, len = points.length; i < len; i++) {

-			if (this._sqDist(points[i], points[prev]) < t2) continue;

-			reducedPoints.push(points[i]);

-			prev = i;

-		}

-		if (prev < len - 1) {

-			reducedPoints.push(points[len - 1]);

-		}

-		return reducedPoints;

-	},

-	

-	/*

-	 * Cohen-Sutherland line clipping algorithm.

-	 * Used to avoid rendering parts of a polyline that are not currently visible.

-	 */

-	clipSegment: function(a, b, bounds, useLastCode) {

-		var min = bounds.min,

-			max = bounds.max;

-		

-		var codeA = useLastCode ? this._lastCode : this._getBitCode(a, bounds),

-			codeB = this._getBitCode(b, bounds);

-		

-		// save 2nd code to avoid calculating it on the next segment

-		this._lastCode = codeB;

-		

-		while (true) {

-			// if a,b is inside the clip window (trivial accept)

-			if (!(codeA | codeB)) {

-				return [a, b];

-			// if a,b is outside the clip window (trivial reject)

-			} else if (codeA & codeB) {

-				return false;

-			// other cases

-			} else {

-				var codeOut = codeA || codeB,

-					p = this._getEdgeIntersection(a, b, codeOut, bounds),

-					newCode = this._getBitCode(p, bounds);

-				

-				if (codeOut == codeA) {

-					a = p;

-					codeA = newCode;

-				} else {

-					b = p;

-					codeB = newCode;

-				}

-			}

-		}

-	},

-	

-	_getEdgeIntersection: function(a, b, code, bounds) {

-		var dx = b.x - a.x,

-			dy = b.y - a.y,

-			min = bounds.min,

-			max = bounds.max;

-		

-		if (code & 8) { // top

-			return new L.Point(a.x + dx * (max.y - a.y) / dy, max.y);

-		} else if (code & 4) { // bottom

-			return new L.Point(a.x + dx * (min.y - a.y) / dy, min.y);

-		} else if (code & 2){ // right

-			return new L.Point(max.x, a.y + dy * (max.x - a.x) / dx);

-		} else if (code & 1) { // left

-			return new L.Point(min.x, a.y + dy * (min.x - a.x) / dx);

-		}

-	},

-	

-	_getBitCode: function(/*Point*/ p, bounds) {

-		var code = 0;

-		

-		if (p.x < bounds.min.x) code |= 1; // left

-		else if (p.x > bounds.max.x) code |= 2; // right

-		if (p.y < bounds.min.y) code |= 4; // bottom

-		else if (p.y > bounds.max.y) code |= 8; // top

-		

-		return code;

-	},

-	

-	// square distance (to avoid unnecessary Math.sqrt calls)

-	_sqDist: function(p1, p2) {

-		var dx = p2.x - p1.x,

-			dy = p2.y - p1.y;

-		return dx * dx + dy * dy;

-	},

-	

-	// square distance from point to a segment

-	_sqPointToSegmentDist: function(p, p1, p2) {

-		var x2 = p2.x - p1.x,

-			y2 = p2.y - p1.y;

-		

-		if (!x2 && !y2) return this._sqDist(p, p1);

-		

-		var dot = (p.x - p1.x) * x2 + (p.y - p1.y) * y2,

-			t = dot / this._sqDist(p1, p2);

-		

-		if (t < 0) return this._sqDist(p, p1);

-		if (t > 1) return this._sqDist(p, p2);

-		

-		var proj = new L.Point(p1.x + x2 * t, p1.y + y2 * t);

-		return this._sqDist(p, proj);

-	}	

-};
\ No newline at end of file
diff --git a/extlib/leaflet/src/geometry/Point.js b/extlib/leaflet/src/geometry/Point.js
deleted file mode 100644
index d031ffe1..00000000
--- a/extlib/leaflet/src/geometry/Point.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- * L.Point represents a point with x and y coordinates.

- */

-

-L.Point = function(/*Number*/ x, /*Number*/ y, /*Boolean*/ round) {

-	this.x = (round ? Math.round(x) : x);

-	this.y = (round ? Math.round(y) : y);

-};

-

-L.Point.prototype = {

-	add: function(point) {

-		return this.clone()._add(point);

-	},

-	

-	_add: function(point) {

-		this.x += point.x;

-		this.y += point.y;

-		return this;		

-	},

-		

-	subtract: function(point) {

-		return this.clone()._subtract(point);

-	},

-	

-	// destructive subtract (faster)

-	_subtract: function(point) {

-		this.x -= point.x;

-		this.y -= point.y;

-		return this;

-	},

-	

-	divideBy: function(num, round) {

-		return new L.Point(this.x/num, this.y/num, round);

-	},

-	

-	multiplyBy: function(num) {

-		return new L.Point(this.x * num, this.y * num);

-	},

-	

-	distanceTo: function(point) {

-		var x = point.x - this.x,

-			y = point.y - this.y;

-		return Math.sqrt(x*x + y*y);

-	},

-	

-	round: function() {

-		return this.clone()._round();

-	},

-	

-	// destructive round

-	_round: function() {

-		this.x = Math.round(this.x);

-		this.y = Math.round(this.y);

-		return this;

-	},

-	

-	clone: function() {

-		return new L.Point(this.x, this.y);

-	},

-	

-	toString: function() {

-		return 'Point(' + 

-				L.Util.formatNum(this.x) + ', ' + 

-				L.Util.formatNum(this.y) + ')'; 

-	}

-};
\ No newline at end of file
diff --git a/extlib/leaflet/src/geometry/PolyUtil.js b/extlib/leaflet/src/geometry/PolyUtil.js
deleted file mode 100644
index c5460709..00000000
--- a/extlib/leaflet/src/geometry/PolyUtil.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*

- * L.PolyUtil contains utilify functions for polygons (clipping, etc.). 

- */

-

-L.PolyUtil = {};

-

-/*

- * Sutherland-Hodgeman polygon clipping algorithm.

- * Used to avoid rendering parts of a polygon that are not currently visible.

- */

-L.PolyUtil.clipPolygon = function(points, bounds) {

-	var min = bounds.min,

-		max = bounds.max,

-		clippedPoints,

-		edges = [1, 4, 2, 8],

-		i, j, k,

-		a, b,

-		len, edge, p,

-		lu = L.LineUtil;

-	

-	for (i = 0, len = points.length; i < len; i++) {

-		points[i]._code = lu._getBitCode(points[i], bounds);

-	}

-	

-	// for each edge (left, bottom, right, top)

-	for (k = 0; k < 4; k++) {

-		edge = edges[k];

-		clippedPoints = [];

-		

-		for (i = 0, len = points.length, j = len - 1; i < len; j = i++) {

-			a = points[i];

-			b = points[j];

-			

-			// if a is inside the clip window

-			if (!(a._code & edge)) {

-				// if b is outside the clip window (a->b goes out of screen)

-				if (b._code & edge) {

-					p = lu._getEdgeIntersection(b, a, edge, bounds);

-					p._code = lu._getBitCode(p, bounds);

-					clippedPoints.push(p);

-				}

-				clippedPoints.push(a);

-				

-			// else if b is inside the clip window (a->b enters the screen)

-			} else if (!(b._code & edge)) {

-				p = lu._getEdgeIntersection(b, a, edge, bounds);

-				p._code = lu._getBitCode(p, bounds);

-				clippedPoints.push(p);

-			}

-		}

-		points = clippedPoints;

-	}

-	

-	return points;

-};
\ No newline at end of file
diff --git a/extlib/leaflet/src/geometry/Transformation.js b/extlib/leaflet/src/geometry/Transformation.js
deleted file mode 100644
index 37f40968..00000000
--- a/extlib/leaflet/src/geometry/Transformation.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*

- * L.Transformation is an utility class to perform simple point transformations through a 2d-matrix. 

- */

-

-L.Transformation = L.Class.extend({

-	initialize: function(/*Number*/ a, /*Number*/ b, /*Number*/ c, /*Number*/ d) {

-		this._a = a;

-		this._b = b;

-		this._c = c;

-		this._d = d;

-	},

-

-	transform: function(point, scale) {

-		return this._transform(point.clone(), scale);

-	},

-	

-	// destructive transform (faster)

-	_transform: function(/*Point*/ point, /*Number*/ scale) /*-> Point*/ {	

-		scale = scale || 1;

-		point.x = scale * (this._a * point.x + this._b); 

-		point.y = scale * (this._c * point.y + this._d);

-		return point;

-	},

-	

-	untransform: function(/*Point*/ point, /*Number*/ scale) /*-> Point*/ {

-		scale = scale || 1;

-		return new L.Point(

-			(point.x/scale - this._b) / this._a,

-			(point.y/scale - this._d) / this._c);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/handler/DoubleClickZoom.js b/extlib/leaflet/src/handler/DoubleClickZoom.js
deleted file mode 100644
index 121a5e20..00000000
--- a/extlib/leaflet/src/handler/DoubleClickZoom.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*

- * L.Handler.DoubleClickZoom is used internally by L.Map to add double-click zooming.

- */

-

-L.Handler.DoubleClickZoom = L.Handler.extend({

-	enable: function() {

-		if (this._enabled) { return; }

-		this._map.on('dblclick', this._onDoubleClick, this._map);

-		this._enabled = true;

-	},

-	

-	disable: function() {

-		if (!this._enabled) { return; }

-		this._map.off('dblclick', this._onDoubleClick, this._map);

-		this._enabled = false;

-	},

-	

-	_onDoubleClick: function(e) {

-		this.setView(e.latlng, this._zoom + 1);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/handler/Handler.js b/extlib/leaflet/src/handler/Handler.js
deleted file mode 100644
index c38a6b6a..00000000
--- a/extlib/leaflet/src/handler/Handler.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*

- * L.Handler classes are used internally to inject interaction features to classes like Map and Marker.

- */

-

-L.Handler = L.Class.extend({

-	initialize: function(map) {

-		this._map = map;

-	},

-	

-	enabled: function() {

-		return !!this._enabled;

-	}	

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/handler/MapDrag.js b/extlib/leaflet/src/handler/MapDrag.js
deleted file mode 100644
index 1c407269..00000000
--- a/extlib/leaflet/src/handler/MapDrag.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

- * L.Handler.MapDrag is used internally by L.Map to make the map draggable.

- */

-

-L.Handler.MapDrag = L.Handler.extend({

-

-	enable: function() {

-		if (this._enabled) { return; }

-		if (!this._draggable) {

-			this._draggable = new L.Draggable(this._map._mapPane, this._map._container);

-			

-			this._draggable.on('dragstart', this._onDragStart, this);

-			this._draggable.on('drag', this._onDrag, this);

-			this._draggable.on('dragend', this._onDragEnd, this);

-		}

-		this._draggable.enable();

-		this._enabled = true;

-	},

-	

-	disable: function() {

-		if (!this._enabled) { return; }

-		this._draggable.disable();

-		this._enabled = false;

-	},

-	

-	moved: function() {

-		return this._draggable._moved;

-	},

-	

-	_onDragStart: function() {

-		this._map.fire('movestart');

-		this._map.fire('dragstart');

-	},

-	

-	_onDrag: function() {

-		this._map.fire('move');

-		this._map.fire('drag');

-	},

-	

-	_onDragEnd: function() {

-		this._map.fire('moveend');

-		this._map.fire('dragend');

-	}

-});

diff --git a/extlib/leaflet/src/handler/MarkerDrag.js b/extlib/leaflet/src/handler/MarkerDrag.js
deleted file mode 100644
index 8e884d50..00000000
--- a/extlib/leaflet/src/handler/MarkerDrag.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable.
- */
-
-L.Handler.MarkerDrag = L.Handler.extend({
-	initialize: function(marker) {
-		this._marker = marker;
-	},
-	
-	enable: function() {
-		if (this._enabled) { return; }
-		if (!this._draggable) {
-			this._draggable = new L.Draggable(this._marker._icon, this._marker._icon);
-			this._draggable.on('dragstart', this._onDragStart, this);
-			this._draggable.on('drag', this._onDrag, this);
-			this._draggable.on('dragend', this._onDragEnd, this);
-		}
-		this._draggable.enable();
-		this._enabled = true;
-	},
-	
-	disable: function() {
-		if (!this._enabled) { return; }
-		this._draggable.disable();
-		this._enabled = false;
-	},
-	
-	moved: function() {
-		return this._draggable && this._draggable._moved;
-	},
-	
-	_onDragStart: function(e) {
-		this._marker.closePopup();
-		
-		this._marker.fire('movestart');
-		this._marker.fire('dragstart');
-	},
-	
-	_onDrag: function(e) {
-		// update shadow position
-		var iconPos = L.DomUtil.getPosition(this._marker._icon);
-		L.DomUtil.setPosition(this._marker._shadow, iconPos);
-		
-		this._marker._latlng = this._marker._map.layerPointToLatLng(iconPos);
-	
-		this._marker.fire('move');
-		this._marker.fire('drag');
-	},
-	
-	_onDragEnd: function() {
-		this._marker.fire('moveend');
-		this._marker.fire('dragend');
-	}
-});
diff --git a/extlib/leaflet/src/handler/ScrollWheelZoom.js b/extlib/leaflet/src/handler/ScrollWheelZoom.js
deleted file mode 100644
index dc877e17..00000000
--- a/extlib/leaflet/src/handler/ScrollWheelZoom.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*

- * L.Handler.ScrollWheelZoom is used internally by L.Map to enable mouse scroll wheel zooming on the map.

- */

-

-L.Handler.ScrollWheelZoom = L.Handler.extend({

-	enable: function() {

-		if (this._enabled) { return; }

-		L.DomEvent.addListener(this._map._container, 'mousewheel', this._onWheelScroll, this);

-		this._delta = 0;

-		this._enabled = true;

-	},

-	

-	disable: function() {

-		if (!this._enabled) { return; }

-		L.DomEvent.removeListener(this._map._container, 'mousewheel', this._onWheelScroll);

-		this._enabled = false;

-	},

-	

-	_onWheelScroll: function(e) {

-		this._delta += L.DomEvent.getWheelDelta(e);

-		this._lastMousePos = this._map.mouseEventToContainerPoint(e);

-		

-		clearTimeout(this._timer);

-		this._timer = setTimeout(L.Util.bind(this._performZoom, this), 50);

-		

-		L.DomEvent.preventDefault(e);

-	},

-	

-	_performZoom: function() {

-		var delta = Math.round(this._delta);

-		this._delta = 0;

-		

-		if (!delta) { return; }

-		

-		var center = this._getCenterForScrollWheelZoom(this._lastMousePos, delta),

-			zoom = this._map.getZoom() + delta;

-		

-		if (this._map._limitZoom(zoom) == this._map._zoom) { return; }

-

-		this._map.setView(center, zoom);

-	},

-	

-	_getCenterForScrollWheelZoom: function(mousePos, delta) {

-		var centerPoint = this._map.getPixelBounds().getCenter(),

-			viewHalf = this._map.getSize().divideBy(2),

-			centerOffset = mousePos.subtract(viewHalf).multiplyBy(1 - Math.pow(2, -delta)),

-			newCenterPoint = centerPoint.add(centerOffset);

-		return this._map.unproject(newCenterPoint, this._map._zoom, true);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/handler/ShiftDragZoom.js b/extlib/leaflet/src/handler/ShiftDragZoom.js
deleted file mode 100644
index ba216109..00000000
--- a/extlib/leaflet/src/handler/ShiftDragZoom.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/*

- * L.Handler.ShiftDragZoom is used internally by L.Map to add shift-drag zoom (zoom to a selected bounding box).

- */

-

-L.Handler.ShiftDragZoom = L.Handler.extend({

-	initialize: function(map) {

-		this._map = map;

-		this._container = map._container;

-		this._pane = map._panes.overlayPane;

-	},

-	

-	enable: function() {

-		if (this._enabled) { return; }

-		

-		L.DomEvent.addListener(this._container, 'mousedown', this._onMouseDown, this);

-		

-		this._enabled = true;

-	},

-	

-	disable: function() {

-		if (!this._enabled) { return; }

-		

-		L.DomEvent.removeListener(this._container, 'mousedown', this._onMouseDown);

-		

-		this._enabled = false;

-	},

-	

-	_onMouseDown: function(e) {

-		if (!e.shiftKey || ((e.which != 1) && (e.button != 1))) { return false; }

-		

-		L.DomUtil.disableTextSelection();

-		

-		this._startLayerPoint = this._map.mouseEventToLayerPoint(e);

-		

-		this._box = L.DomUtil.create('div', 'leaflet-zoom-box', this._pane);

-		L.DomUtil.setPosition(this._box, this._startLayerPoint);

-		

-		//TODO move cursor to styles

-		this._container.style.cursor = 'crosshair';

-		

-		L.DomEvent.addListener(document, 'mousemove', this._onMouseMove, this);

-		L.DomEvent.addListener(document, 'mouseup', this._onMouseUp, this);

-		

-		L.DomEvent.preventDefault(e);

-	},

-	

-	_onMouseMove: function(e) {

-		var layerPoint = this._map.mouseEventToLayerPoint(e),

-			dx = layerPoint.x - this._startLayerPoint.x,

-			dy = layerPoint.y - this._startLayerPoint.y;

-		

-		var newX = Math.min(layerPoint.x, this._startLayerPoint.x),

-			newY = Math.min(layerPoint.y, this._startLayerPoint.y),

-			newPos = new L.Point(newX, newY);

-		

-		L.DomUtil.setPosition(this._box, newPos);

-		

-		this._box.style.width = (Math.abs(dx) - 4) + 'px';

-		this._box.style.height = (Math.abs(dy) - 4) + 'px';

-	},

-	

-	_onMouseUp: function(e) {

-		this._pane.removeChild(this._box);

-		this._container.style.cursor = '';

-		

-		L.DomUtil.enableTextSelection();

-

-		L.DomEvent.removeListener(document, 'mousemove', this._onMouseMove);

-		L.DomEvent.removeListener(document, 'mouseup', this._onMouseUp);

-		

-		var layerPoint = this._map.mouseEventToLayerPoint(e);

-		

-		var bounds = new L.LatLngBounds(

-				this._map.layerPointToLatLng(this._startLayerPoint),

-				this._map.layerPointToLatLng(layerPoint));

-		

-		this._map.fitBounds(bounds);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/handler/TouchZoom.js b/extlib/leaflet/src/handler/TouchZoom.js
deleted file mode 100644
index cc2ec73f..00000000
--- a/extlib/leaflet/src/handler/TouchZoom.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*

- * L.Handler.TouchZoom is used internally by L.Map to add touch-zooming on Webkit-powered mobile browsers.

- */

-

-L.Handler.TouchZoom = L.Handler.extend({

-	enable: function() {

-		if (!L.Browser.mobileWebkit || this._enabled) { return; }

-		L.DomEvent.addListener(this._map._container, 'touchstart', this._onTouchStart, this);

-		this._enabled = true;

-	},

-	

-	disable: function() {

-		if (!this._enabled) { return; }

-		L.DomEvent.removeListener(this._map._container, 'touchstart', this._onTouchStart, this);

-		this._enabled = false;

-	},

-	

-	_onTouchStart: function(e) {

-		if (!e.touches || e.touches.length != 2 || this._map._animatingZoom) { return; }

-		

-		var p1 = this._map.mouseEventToLayerPoint(e.touches[0]),

-			p2 = this._map.mouseEventToLayerPoint(e.touches[1]),

-			viewCenter = this._map.containerPointToLayerPoint(this._map.getSize().divideBy(2));

-		

-		this._startCenter = p1.add(p2).divideBy(2, true);

-		this._startDist = p1.distanceTo(p2);

-		//this._startTransform = this._map._mapPane.style.webkitTransform;

-		

-		this._moved = false;

-		this._zooming = true;

-

-		this._centerOffset = viewCenter.subtract(this._startCenter);

-

-		L.DomEvent.addListener(document, 'touchmove', this._onTouchMove, this);

-		L.DomEvent.addListener(document, 'touchend', this._onTouchEnd, this);

-		

-		L.DomEvent.preventDefault(e);

-	},

-	

-	_onTouchMove: function(e) {

-		if (!e.touches || e.touches.length != 2) { return; }

-		

-		if (!this._moved) {

-			this._map._mapPane.className += ' leaflet-zoom-anim';

-			this._map._prepareTileBg();

-			this._moved = true;

-		}

-		

-		var p1 = this._map.mouseEventToLayerPoint(e.touches[0]),

-			p2 = this._map.mouseEventToLayerPoint(e.touches[1]);

-		

-		this._scale = p1.distanceTo(p2) / this._startDist;

-		this._delta = p1.add(p2).divideBy(2, true).subtract(this._startCenter);

-

-		/*

-		 * Used 2 translates instead of transform-origin because of a very strange bug - 

-		 * it didn't count the origin on the first touch-zoom but worked correctly afterwards 

-		 */

-		this._map._tileBg.style.webkitTransform = [

-            L.DomUtil.getTranslateString(this._delta),

-            L.DomUtil.getScaleString(this._scale, this._startCenter)

-        ].join(" ");

-		

-		L.DomEvent.preventDefault(e);

-	},

-	

-	_onTouchEnd: function(e) {

-		if (!this._moved || !this._zooming) { return; }

-		this._zooming = false;

-		

-		var oldZoom = this._map.getZoom(),

-			floatZoomDelta = Math.log(this._scale)/Math.LN2,

-			roundZoomDelta = (floatZoomDelta > 0 ? Math.ceil(floatZoomDelta) : Math.floor(floatZoomDelta)),

-			zoom = this._map._limitZoom(oldZoom + roundZoomDelta),

-			zoomDelta = zoom - oldZoom,

-			centerOffset = this._centerOffset.subtract(this._delta).divideBy(this._scale),

-			centerPoint = this._map.getPixelOrigin().add(this._startCenter).add(centerOffset),

-			center = this._map.unproject(centerPoint);

-		

-		L.DomEvent.removeListener(document, 'touchmove', this._onTouchMove);

-		L.DomEvent.removeListener(document, 'touchend', this._onTouchEnd);

-

-		var finalScale = Math.pow(2, zoomDelta);

-		

-		this._map._runAnimation(center, zoom, finalScale / this._scale, this._startCenter.add(centerOffset));

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/FeatureGroup.js b/extlib/leaflet/src/layer/FeatureGroup.js
deleted file mode 100644
index 6e45d84c..00000000
--- a/extlib/leaflet/src/layer/FeatureGroup.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*

- * L.FeatureGroup extends L.LayerGroup by introducing mouse events and bindPopup method shared between a group of layers. 

- */

-

-L.FeatureGroup = L.LayerGroup.extend({

-	includes: L.Mixin.Events,

-

-	addLayer: function(layer) {

-		this._initEvents(layer);

-		L.LayerGroup.prototype.addLayer.call(this, layer);

-		

-		if (this._popupContent && layer.bindPopup) {

-			layer.bindPopup(this._popupContent);

-		} 

-	},

-	

-	bindPopup: function(content) {

-		this._popupContent = content;

-		

-		for (var i in this._layers) {

-			if (this._layers.hasOwnProperty(i) && this._layers[i].bindPopup) {

-				this._layers[i].bindPopup(content);

-			}

-		}

-	},

-	

-	_events: ['click', 'dblclick', 'mouseover', 'mouseout'],

-	

-	_initEvents: function(layer) {

-		for (var i = 0, len = this._events.length; i < len; i++) {

-			layer.on(this._events[i], this._propagateEvent, this);

-		}

-	},

-	

-	_propagateEvent: function(e) {

-		e.layer = e.target;

-		e.target = this;

-		this.fire(e.type, e);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/GeoJSON.js b/extlib/leaflet/src/layer/GeoJSON.js
deleted file mode 100644
index 6cbd4193..00000000
--- a/extlib/leaflet/src/layer/GeoJSON.js
+++ /dev/null
@@ -1,106 +0,0 @@
-

-L.GeoJSON = L.LayerGroup.extend({

-	includes: L.Mixin.Events,

-	

-	initialize: function(geojson, options) {

-		L.Util.setOptions(this, options);

-		this._geojson = geojson;

-		this._layers = {};

-		

-		if (geojson) {

-			this.addGeoJSON(geojson);

-		}

-	},

-	

-	addGeoJSON: function(geojson) {

-		if (geojson.features) {

-			for (var i = 0, len = geojson.features.length; i < len; i++) {

-				this.addGeoJSON(geojson.features[i]);

-			}

-			return;

-		}

-				

-		var isFeature = (geojson.type == 'Feature'),

-			geometry = (isFeature ? geojson.geometry : geojson),

-			layer = L.GeoJSON.geometryToLayer(geometry, this.options.pointToLayer);

-		

-		this.fire('featureparse', {

-			layer: layer, 

-			properties: geojson.properties,

-			geometryType: geometry.type,

-			bbox: geojson.bbox,

-			id: geojson.id

-		});

-		

-		this.addLayer(layer);

-	}

-});

-

-L.Util.extend(L.GeoJSON, {

-	geometryToLayer: function(geometry, pointToLayer) {

-		var coords = geometry.coordinates, 

-			latlng, latlngs, 

-			i, len, 

-			layer, 

-			layers = [];

-

-		switch (geometry.type) {

-			case 'Point':

-				latlng = this.coordsToLatLng(coords);

-				return pointToLayer ? pointToLayer(latlng) : new L.Marker(latlng);

-				

-			case 'MultiPoint':

-				for (i = 0, len = coords.length; i < len; i++) {

-					latlng = this.coordsToLatLng(coords[i]);

-					layer = pointToLayer ? pointToLayer(latlng) : new L.Marker(latlng);

-					layers.push(layer);

-				}

-				return new L.FeatureGroup(layers);

-				

-			case 'LineString':

-				latlngs = this.coordsToLatLngs(coords);

-				return new L.Polyline(latlngs);

-				

-			case 'Polygon':

-				latlngs = this.coordsToLatLngs(coords, 1);

-				return new L.Polygon(latlngs);

-				

-			case 'MultiLineString':

-				latlngs = this.coordsToLatLngs(coords, 1);

-				return new L.MultiPolyline(latlngs);

-				

-			case "MultiPolygon":

-				latlngs = this.coordsToLatLngs(coords, 2);

-				return new L.MultiPolygon(latlngs);

-				

-			case "GeometryCollection":

-				for (i = 0, len = geometry.geometries.length; i < len; i++) {

-					layer = this.geometryToLayer(geometry.geometries[i]);

-					layers.push(layer);

-				}

-				return new L.FeatureGroup(layers);

-				

-			default:

-				throw new Error('Invalid GeoJSON object.');

-		}

-	},

-

-	coordsToLatLng: function(/*Array*/ coords, /*Boolean*/ reverse)/*: LatLng*/ {

-		var lat = parseFloat(coords[reverse ? 0 : 1]),

-			lng = parseFloat(coords[reverse ? 1 : 0]);

-		return new L.LatLng(lat, lng);

-	},

-

-	coordsToLatLngs: function(/*Array*/ coords, /*Number*/ levelsDeep, /*Boolean*/ reverse)/*: Array*/ {

-		var latlng, latlngs = [],

-			i, len = coords.length;

-		

-		for (i = 0; i < len; i++) {

-			latlng = levelsDeep ? 

-					this.coordsToLatLngs(coords[i], levelsDeep - 1, reverse) : 

-					this.coordsToLatLng(coords[i], reverse);

-			latlngs.push(latlng);

-		}

-		return latlngs;

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/ImageOverlay.js b/extlib/leaflet/src/layer/ImageOverlay.js
deleted file mode 100644
index 4551b2e3..00000000
--- a/extlib/leaflet/src/layer/ImageOverlay.js
+++ /dev/null
@@ -1,58 +0,0 @@
-L.ImageOverlay = L.Class.extend({

-	includes: L.Mixin.Events,

-	

-	initialize: function(/*String*/ url, /*LatLngBounds*/ bounds) {

-		this._url = url;

-		this._bounds = bounds;

-	},

-	

-	onAdd: function(map) {

-		this._map = map;

-		

-		if (!this._image) {

-			this._initImage();

-		}

-		

-		map.getPanes().overlayPane.appendChild(this._image);

-		

-		map.on('viewreset', this._reset, this);

-		this._reset();

-	},

-	

-	onRemove: function(map) {

-		map.getPanes().overlayPane.removeChild(this._image);

-		map.off('viewreset', this._reset, this);

-	},

-	

-	_initImage: function() {

-		this._image = L.DomUtil.create('img', 'leaflet-image-layer');

-		

-		this._image.style.visibility = 'hidden';

-		//TODO opacity option

-		

-		//TODO createImage util method to remove duplication

-		L.Util.extend(this._image, {

-			galleryimg: 'no',

-			onselectstart: L.Util.falseFn,

-			onmousemove: L.Util.falseFn,

-			onload: this._onImageLoad,

-			src: this._url

-		});

-	},

-	

-	_reset: function() {

-		var topLeft = this._map.latLngToLayerPoint(this._bounds.getNorthWest()),

-			bottomRight = this._map.latLngToLayerPoint(this._bounds.getSouthEast()),

-			size = bottomRight.subtract(topLeft);

-		

-		L.DomUtil.setPosition(this._image, topLeft);

-		

-		this._image.style.width = size.x + 'px';

-		this._image.style.height = size.y + 'px';

-	},

-	

-	_onImageLoad: function() {

-		this.style.visibility = '';

-		//TODO fire layerload

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/LayerGroup.js b/extlib/leaflet/src/layer/LayerGroup.js
deleted file mode 100644
index 58940d40..00000000
--- a/extlib/leaflet/src/layer/LayerGroup.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*

- * L.LayerGroup is a class to combine several layers so you can manipulate the group (e.g. add/remove it) as one layer.

- */

-

-L.LayerGroup = L.Class.extend({

-	initialize: function(layers) {

-		this._layers = {};

-		

-		if (layers) {

-			for (var i = 0, len = layers.length; i < len; i++) {

-				this.addLayer(layers[i]);

-			}

-		}

-	},

-	

-	addLayer: function(layer) {

-		var id = L.Util.stamp(layer);

-		this._layers[id] = layer;

-		

-		if (this._map) {

-			this._map.addLayer(layer);

-		}

-		return this;

-	},

-	

-	removeLayer: function(layer) {

-		var id = L.Util.stamp(layer);

-		delete this._layers[id];

-		

-		if (this._map) {

-			this._map.removeLayer(layer);

-		}

-		return this;

-	},

-	

-	clearLayers: function() {

-		this._iterateLayers(this.removeLayer, this);

-		return this;

-	},

-

-	onAdd: function(map) {

-		this._map = map;

-		this._iterateLayers(map.addLayer, map);

-	},

-	

-	onRemove: function(map) {

-		this._iterateLayers(map.removeLayer, map);

-		delete this._map;

-	},

-	

-	_iterateLayers: function(method, context) {

-		for (var i in this._layers) {

-			if (this._layers.hasOwnProperty(i)) {

-				method.call(context, this._layers[i]);

-			}

-		}

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/Popup.js b/extlib/leaflet/src/layer/Popup.js
deleted file mode 100644
index 4cb14e3c..00000000
--- a/extlib/leaflet/src/layer/Popup.js
+++ /dev/null
@@ -1,165 +0,0 @@
-

-L.Popup = L.Class.extend({

-	includes: L.Mixin.Events,

-	

-	options: {

-		maxWidth: 300,

-		autoPan: true,

-		closeButton: true,

-		

-		offset: new L.Point(0, 2),

-		autoPanPadding: new L.Point(5, 5)

-	},

-	

-	initialize: function(options) {

-		L.Util.setOptions(this, options);

-	},

-	

-	onAdd: function(map) {

-		this._map = map;

-		if (!this._container) {

-			this._initLayout();

-		}

-		this._updateContent();

-		

-		this._container.style.opacity = '0';

-

-		this._map._panes.popupPane.appendChild(this._container);

-		this._map.on('viewreset', this._updatePosition, this);

-		if (this._map.options.closePopupOnClick) {

-			this._map.on('preclick', this._close, this);

-		}

-		this._update();

-		

-		this._container.style.opacity = '1'; //TODO fix ugly opacity hack

-		

-		this._opened = true;

-	},

-	

-	onRemove: function(map) {

-		map._panes.popupPane.removeChild(this._container);

-		map.off('viewreset', this._updatePosition, this);

-		map.off('click', this._close, this);

-

-		this._container.style.opacity = '0';

-		

-		this._opened = false;

-	},

-	

-	setLatLng: function(latlng) {

-		this._latlng = latlng;

-		if (this._opened) {

-			this._update();

-		}

-		return this;

-	},

-	

-	setContent: function(content) {

-		this._content = content;

-		if (this._opened) {

-			this._update();

-		}

-		return this;

-	},

-	

-	_close: function() {

-		if (this._opened) {

-			this._map.removeLayer(this);

-		}

-	},

-	

-	_initLayout: function() {

-		this._container = L.DomUtil.create('div', 'leaflet-popup');

-		

-		this._closeButton = L.DomUtil.create('a', 'leaflet-popup-close-button', this._container);

-		this._closeButton.href = '#close';

-		this._closeButton.onclick = L.Util.bind(this._onCloseButtonClick, this);

-		

-		this._wrapper = L.DomUtil.create('div', 'leaflet-popup-content-wrapper', this._container);

-		L.DomEvent.disableClickPropagation(this._wrapper);

-		this._contentNode = L.DomUtil.create('div', 'leaflet-popup-content', this._wrapper);

-		

-		this._tipContainer = L.DomUtil.create('div', 'leaflet-popup-tip-container', this._container);

-		this._tip = L.DomUtil.create('div', 'leaflet-popup-tip', this._tipContainer);

-	},

-	

-	_update: function() {

-		this._container.style.visibility = 'hidden';

-		

-		this._updateContent();

-		this._updateLayout();

-		this._updatePosition();

-		

-		this._container.style.visibility = '';

-

-		this._adjustPan();

-	},

-	

-	_updateContent: function() {

-		if (!this._content) return;

-		

-		if (typeof this._content == 'string') {

-			this._contentNode.innerHTML = this._content;

-		} else {

-			this._contentNode.innerHTML = '';

-			this._contentNode.appendChild(this._content);

-		}

-	},

-	

-	_updateLayout: function() {

-		this._container.style.width = '';

-		this._container.style.whiteSpace = 'nowrap';

-

-		var width = this._container.offsetWidth;

-		

-		this._container.style.width = (width > this.options.maxWidth ? this.options.maxWidth : width) + 'px';

-		this._container.style.whiteSpace = '';

-		

-		this._containerWidth = this._container.offsetWidth;

-	},

-	

-	_updatePosition: function() {

-		var pos = this._map.latLngToLayerPoint(this._latlng);

-		

-		this._containerBottom = -pos.y - this.options.offset.y;

-		this._containerLeft = pos.x - Math.round(this._containerWidth/2) + this.options.offset.x;

-		

-		this._container.style.bottom = this._containerBottom + 'px';

-		this._container.style.left = this._containerLeft + 'px';

-	},

-	

-	_adjustPan: function() {

-		if (!this.options.autoPan) { return; }

-		

-		var containerHeight = this._container.offsetHeight,

-			layerPos = new L.Point(

-				this._containerLeft, 

-				-containerHeight - this._containerBottom),

-			containerPos = this._map.layerPointToContainerPoint(layerPos),

-			adjustOffset = new L.Point(0, 0),

-			padding = this.options.autoPanPadding,

-			size = this._map.getSize();

-		

-		if (containerPos.x < 0) {

-			adjustOffset.x = containerPos.x - padding.x;

-		}

-		if (containerPos.x + this._containerWidth > size.x) {

-			adjustOffset.x = containerPos.x + this._containerWidth - size.x + padding.x;

-		}

-		if (containerPos.y < 0) {

-			adjustOffset.y = containerPos.y - padding.y;

-		}

-		if (containerPos.y + containerHeight > size.y) {

-			adjustOffset.y = containerPos.y + containerHeight - size.y + padding.y;

-		}

-		

-		if (adjustOffset.x || adjustOffset.y) {

-			this._map.panBy(adjustOffset);

-		}

-	},

-	

-	_onCloseButtonClick: function(e) {

-		this._close();

-		L.DomEvent.stop(e);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/marker/Icon.js b/extlib/leaflet/src/layer/marker/Icon.js
deleted file mode 100644
index 6df036e4..00000000
--- a/extlib/leaflet/src/layer/marker/Icon.js
+++ /dev/null
@@ -1,56 +0,0 @@
-L.Icon = L.Class.extend({

-	iconUrl: L.ROOT_URL + 'images/marker.png',

-	shadowUrl: L.ROOT_URL + 'images/marker-shadow.png',

-	

-	iconSize: new L.Point(25, 41),

-	shadowSize: new L.Point(41, 41),

-	

-	iconAnchor: new L.Point(13, 41),

-	popupAnchor: new L.Point(0, -33),

-	

-	initialize: function(iconUrl) {

-		if (iconUrl) {

-			this.iconUrl = iconUrl;

-		}

-	},

-	

-	createIcon: function() {

-		return this._createIcon('icon');

-	},

-	

-	createShadow: function() {

-		return this._createIcon('shadow');

-	},

-	

-	_createIcon: function(name) {

-		var size = this[name + 'Size'],

-			src = this[name + 'Url'],

-			img = this._createImg(src);

-		

-		if (!src) { return null; }

-		

-		img.className = 'leaflet-marker-' + name;

-		

-		img.style.marginLeft = (-this.iconAnchor.x) + 'px';

-		img.style.marginTop = (-this.iconAnchor.y) + 'px';

-		

-		if (size) {

-			img.style.width = size.x + 'px';

-			img.style.height = size.y + 'px';

-		}

-		

-		return img;

-	},

-	

-	_createImg: function(src) {

-		var el;

-		if (!L.Browser.ie6) {

-			el = document.createElement('img');

-			el.src = src;

-		} else {

-			el = document.createElement('div');

-			el.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';

-		}

-		return el;

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/marker/Marker.Popup.js b/extlib/leaflet/src/layer/marker/Marker.Popup.js
deleted file mode 100644
index 4c5cad04..00000000
--- a/extlib/leaflet/src/layer/marker/Marker.Popup.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*

- * Popup extension to L.Marker, adding openPopup & bindPopup methods. 

- */

-

-L.Marker.include({

-	openPopup: function() {

-		this._popup.setLatLng(this._latlng);

-		this._map.openPopup(this._popup);

-		

-		return this;

-	},

-	

-	closePopup: function() {

-		if (this._popup) {

-			this._popup._close();

-		}

-	},

-	

-	bindPopup: function(content, options) {

-		options = L.Util.extend({offset: this.options.icon.popupAnchor}, options);

-		

-		this._popup = new L.Popup(options);

-		this._popup.setContent(content);

-		this.on('click', this.openPopup, this);

-		

-		return this;

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/marker/Marker.js b/extlib/leaflet/src/layer/marker/Marker.js
deleted file mode 100644
index b98bec4e..00000000
--- a/extlib/leaflet/src/layer/marker/Marker.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/*

- * L.Marker is used to display clickable/draggable icons on the map.

- */

-

-L.Marker = L.Class.extend({

-

-	includes: L.Mixin.Events,

-	

-	options: {

-		icon: new L.Icon(),

-		title: '',

-		clickable: true,

-		draggable: false

-	},

-	

-	initialize: function(latlng, options) {

-		L.Util.setOptions(this, options);

-		this._latlng = latlng;

-	},

-	

-	onAdd: function(map) {

-		this._map = map;

-		

-		this._initIcon();

-		

-		map.on('viewreset', this._reset, this);

-		this._reset();

-	},

-	

-	onRemove: function(map) {

-		this._removeIcon();

-		

-		map.off('viewreset', this._reset, this);

-	},

-	

-	getLatLng: function() {

-		return this._latlng;

-	},

-	

-	setLatLng: function(latlng) {

-		this._latlng = latlng;

-		this._reset();

-	},

-	

-	setIcon: function(icon) {

-		this._removeIcon();

-		

-		this._icon = this._shadow = null;

-		this.options.icon = icon;

-		

-		this._initIcon();

-	},

-	

-	_initIcon: function() {

-		if (!this._icon) {

-			this._icon = this.options.icon.createIcon();

-			

-			if (this.options.title) {

-				this._icon.title = this.options.title;

-			}

-			

-			this._initInteraction();

-		}

-		if (!this._shadow) {

-			this._shadow = this.options.icon.createShadow();

-		}

-

-		this._map._panes.markerPane.appendChild(this._icon);

-		if (this._shadow) {

-			this._map._panes.shadowPane.appendChild(this._shadow);

-		}		

-	},

-	

-	_removeIcon: function() {

-		this._map._panes.markerPane.removeChild(this._icon);

-		if (this._shadow) {

-			this._map._panes.shadowPane.removeChild(this._shadow);

-		}

-	},

-	

-	_reset: function() {

-		var pos = this._map.latLngToLayerPoint(this._latlng).round();

-		

-		L.DomUtil.setPosition(this._icon, pos);

-		if (this._shadow) {

-			L.DomUtil.setPosition(this._shadow, pos);

-		}

-		

-		this._icon.style.zIndex = pos.y;

-	},

-	

-	_initInteraction: function() {

-		if (this.options.clickable) {

-			this._icon.className += ' leaflet-clickable';

-			

-			L.DomEvent.addListener(this._icon, 'click', this._onMouseClick, this);

-

-			var events = ['dblclick', 'mousedown', 'mouseover', 'mouseout'];

-			for (var i = 0; i < events.length; i++) {

-				L.DomEvent.addListener(this._icon, events[i], this._fireMouseEvent, this);

-			}

-		}

-		

-		if (L.Handler.MarkerDrag) {

-			this.dragging = new L.Handler.MarkerDrag(this);

-			

-			if (this.options.draggable) {

-				this.dragging.enable();

-			}

-		}

-	},

-	

-	_onMouseClick: function(e) {

-		L.DomEvent.stopPropagation(e);

-		if (this.dragging && this.dragging.moved()) { return; }

-		this.fire(e.type);

-	},

-	

-	_fireMouseEvent: function(e) {

-		this.fire(e.type);

-		L.DomEvent.stopPropagation(e);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/tile/TileLayer.Canvas.js b/extlib/leaflet/src/layer/tile/TileLayer.Canvas.js
deleted file mode 100644
index 08bbaae2..00000000
--- a/extlib/leaflet/src/layer/tile/TileLayer.Canvas.js
+++ /dev/null
@@ -1,41 +0,0 @@
-L.TileLayer.Canvas = L.TileLayer.extend({

-	options: {

-		async: false

-	},

-	

-	initialize: function(options) {

-		L.Util.setOptions(this, options);

-	},

-	

-	_createTileProto: function() {

-		this._canvasProto = L.DomUtil.create('canvas', 'leaflet-tile');

-		

-		var tileSize = this.options.tileSize;

-		this._canvasProto.width = tileSize;

-		this._canvasProto.height = tileSize;

-	},

-	

-	_createTile: function() {

-		var tile = this._canvasProto.cloneNode(false);

-		tile.onselectstart = tile.onmousemove = L.Util.falseFn;

-		return tile;

-	},

-	

-	_loadTile: function(tile, tilePoint, zoom) {

-		tile._layer = this;

-		

-		this.drawTile(tile, tilePoint, zoom);

-		

-		if (!this.options.async) {

-			this.tileDrawn(tile);

-		}

-	},

-	

-	drawTile: function(tile, tilePoint, zoom) {

-		// override with rendering code

-	},

-	

-	tileDrawn: function(tile) {

-		this._tileOnLoad.call(tile);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/tile/TileLayer.WMS.js b/extlib/leaflet/src/layer/tile/TileLayer.WMS.js
deleted file mode 100644
index 2f4ad05a..00000000
--- a/extlib/leaflet/src/layer/tile/TileLayer.WMS.js
+++ /dev/null
@@ -1,47 +0,0 @@
-L.TileLayer.WMS = L.TileLayer.extend({

-	defaultWmsParams: {

-		service: 'WMS',

-		request: 'GetMap',

-		version: '1.1.1',

-		layers: '',

-		styles: '',

-		format: 'image/jpeg',

-		transparent: false

-	},

-

-	initialize: function(/*String*/ url, /*Object*/ options) {

-		this._url = url;

-		

-		this.wmsParams = L.Util.extend({}, this.defaultWmsParams);

-		this.wmsParams.width = this.wmsParams.height = this.options.tileSize;

-		

-		for (var i in options) {

-			// all keys that are not TileLayer options go to WMS params

-			if (!this.options.hasOwnProperty(i)) {

-				this.wmsParams[i] = options[i];

-			}

-		}

-

-		L.Util.setOptions(this, options);

-	},

-	

-	onAdd: function(map) {

-		var projectionKey = (parseFloat(this.wmsParams.version) >= 1.3 ? 'crs' : 'srs');

-		this.wmsParams[projectionKey] = map.options.crs.code;		

-

-		L.TileLayer.prototype.onAdd.call(this, map);

-	},

-	

-	getTileUrl: function(/*Point*/ tilePoint, /*Number*/ zoom)/*-> String*/ {

-		var tileSize = this.options.tileSize,

-			nwPoint = tilePoint.multiplyBy(tileSize),

-			sePoint = nwPoint.add(new L.Point(tileSize, tileSize)),

-			nwMap = this._map.unproject(nwPoint, this._zoom, true),

-			seMap = this._map.unproject(sePoint, this._zoom, true),

-			nw = this._map.options.crs.project(nwMap),

-			se = this._map.options.crs.project(seMap),

-			bbox = [nw.x, se.y, se.x, nw.y].join(',');

-		

-		return this._url + L.Util.getParamString(this.wmsParams) + "&bbox=" + bbox;

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/tile/TileLayer.js b/extlib/leaflet/src/layer/tile/TileLayer.js
deleted file mode 100644
index 68072ee9..00000000
--- a/extlib/leaflet/src/layer/tile/TileLayer.js
+++ /dev/null
@@ -1,262 +0,0 @@
-/*

- * L.TileLayer is used for standard xyz-numbered tile layers.

- */

-

-L.TileLayer = L.Class.extend({

-	includes: L.Mixin.Events,

-	

-	options: {

-		minZoom: 0,

-		maxZoom: 18,

-		tileSize: 256,

-		subdomains: 'abc',

-		errorTileUrl: '',

-		attribution: '',

-		opacity: 1,

-		scheme: 'xyz',

-    noWrap: false,

-		

-		unloadInvisibleTiles: L.Browser.mobileWebkit,

-		updateWhenIdle: L.Browser.mobileWebkit

-	},

-	

-	initialize: function(url, options) {

-		L.Util.setOptions(this, options);

-		

-		this._url = url;

-		

-		if (typeof this.options.subdomains == 'string') {

-			this.options.subdomains = this.options.subdomains.split('');

-		}

-	},

-	

-	onAdd: function(map) {

-		this._map = map;

-		

-		// create a container div for tiles

-		this._initContainer();

-		

-		// create an image to clone for tiles

-		this._createTileProto();

-		

-		// set up events

-		map.on('viewreset', this._reset, this);

-		

-		if (this.options.updateWhenIdle) {

-			map.on('moveend', this._update, this);

-		} else {

-			this._limitedUpdate = L.Util.limitExecByInterval(this._update, 100, this);

-			map.on('move', this._limitedUpdate, this);

-		}

-		

-		this._reset();

-		this._update();

-	},

-	

-	onRemove: function(map) {

-		this._map.getPanes().tilePane.removeChild(this._container);

-		this._container = null;

-		

-		this._map.off('viewreset', this._reset, this);

-		

-		if (this.options.updateWhenIdle) {

-			this._map.off('moveend', this._update, this);

-		} else {

-			this._map.off('move', this._limitedUpdate, this);

-		}

-	},

-	

-	getAttribution: function() {

-		return this.options.attribution;

-	},

-	

-	setOpacity: function(opacity) {

-		this.options.opacity = opacity;

-		

-		this._setOpacity(opacity);

-		

-		// stupid webkit hack to force redrawing of tiles

-		if (L.Browser.webkit) {

-			for (i in this._tiles) {

-				this._tiles[i].style.webkitTransform += ' translate(0,0)';

-			}

-		}

-	},

-	

-	_setOpacity: function(opacity) {

-		if (opacity < 1) {

-			L.DomUtil.setOpacity(this._container, opacity);

-		}

-	},

-	

-	_initContainer: function() {

-		var tilePane = this._map.getPanes().tilePane;

-		

-		if (!this._container || tilePane.empty) {

-			this._container = L.DomUtil.create('div', 'leaflet-layer', tilePane);

-			

-			this._setOpacity(this.options.opacity);

-		}

-	},

-	

-	_reset: function() {

-		this._tiles = {};

-		this._initContainer();

-		this._container.innerHTML = '';

-	},

-	

-	_update: function() {

-		var bounds = this._map.getPixelBounds(),

-			tileSize = this.options.tileSize;

-		

-		var nwTilePoint = new L.Point(

-				Math.floor(bounds.min.x / tileSize),

-				Math.floor(bounds.min.y / tileSize)),

-			seTilePoint = new L.Point(

-				Math.floor(bounds.max.x / tileSize),

-				Math.floor(bounds.max.y / tileSize)),

-			tileBounds = new L.Bounds(nwTilePoint, seTilePoint);

-		

-		this._addTilesFromCenterOut(tileBounds);

-		

-		if (this.options.unloadInvisibleTiles) {

-			this._removeOtherTiles(tileBounds);

-		}

-	},

-	

-	_addTilesFromCenterOut: function(bounds) {

-		var queue = [],

-			center = bounds.getCenter();

-		

-		for (var j = bounds.min.y; j <= bounds.max.y; j++) {

-			for (var i = bounds.min.x; i <= bounds.max.x; i++) {				

-				if ((i + ':' + j) in this._tiles) { continue; }

-				queue.push(new L.Point(i, j));

-			}

-		}

-		

-		// load tiles in order of their distance to center

-		queue.sort(function(a, b) {

-			return a.distanceTo(center) - b.distanceTo(center);

-		});

-		

-		this._tilesToLoad = queue.length;

-		for (var k = 0, len = this._tilesToLoad; k < len; k++) {

-			this._addTile(queue[k]);

-		}

-	},

-	

-	_removeOtherTiles: function(bounds) {

-		var kArr, x, y, key;

-		

-		for (key in this._tiles) {

-			if (this._tiles.hasOwnProperty(key)) {

-				kArr = key.split(':');

-				x = parseInt(kArr[0], 10);

-				y = parseInt(kArr[1], 10);

-				

-				// remove tile if it's out of bounds

-				if (x < bounds.min.x || x > bounds.max.x || y < bounds.min.y || y > bounds.max.y) {

-					this._tiles[key].src = '';

-					if (this._tiles[key].parentNode == this._container) {

-						this._container.removeChild(this._tiles[key]);

-					}

-					delete this._tiles[key];

-				}

-			}

-		}		

-	},

-	

-	_addTile: function(tilePoint) {

-		var tilePos = this._getTilePos(tilePoint),

-			zoom = this._map.getZoom(),

-			key = tilePoint.x + ':' + tilePoint.y;

-			

-		// wrap tile coordinates

-		var tileLimit = (1 << zoom);

-		if (!this.options.noWrap) {

-      tilePoint.x = ((tilePoint.x % tileLimit) + tileLimit) % tileLimit;

-    }

-		if (tilePoint.y < 0 || tilePoint.y >= tileLimit) { return; }

-		

-		// create tile

-		var tile = this._createTile();

-		L.DomUtil.setPosition(tile, tilePos);

-		

-		this._tiles[key] = tile;

-        

-		if (this.options.scheme == 'tms') {

-			tilePoint.y = tileLimit - tilePoint.y - 1;

-		}

-

-		this._loadTile(tile, tilePoint, zoom);

-		

-		this._container.appendChild(tile);

-	},

-	

-	_getTilePos: function(tilePoint) {

-		var origin = this._map.getPixelOrigin(),

-			tileSize = this.options.tileSize;

-		

-		return tilePoint.multiplyBy(tileSize).subtract(origin);

-	},

-	

-	// image-specific code (override to implement e.g. Canvas or SVG tile layer)

-	

-	getTileUrl: function(tilePoint, zoom) {

-		var subdomains = this.options.subdomains,

-			s = this.options.subdomains[(tilePoint.x + tilePoint.y) % subdomains.length];

-

-		return this._url

-				.replace('{s}', s)

-				.replace('{z}', zoom)

-				.replace('{x}', tilePoint.x)

-				.replace('{y}', tilePoint.y);

-	},

-	

-	_createTileProto: function() {

-		this._tileImg = L.DomUtil.create('img', 'leaflet-tile');

-		this._tileImg.galleryimg = 'no';

-		

-		var tileSize = this.options.tileSize;

-		this._tileImg.style.width = tileSize + 'px';

-		this._tileImg.style.height = tileSize + 'px';

-	},

-	

-	_createTile: function() {

-		var tile = this._tileImg.cloneNode(false);

-		tile.onselectstart = tile.onmousemove = L.Util.falseFn;

-		return tile;

-	},

-	

-	_loadTile: function(tile, tilePoint, zoom) {

-		tile._layer = this;

-		tile.onload = this._tileOnLoad;

-		tile.onerror = this._tileOnError;

-		tile.src = this.getTileUrl(tilePoint, zoom);

-	},

-	

-	_tileOnLoad: function(e) {

-		var layer = this._layer;

-		

-		this.className += ' leaflet-tile-loaded'; 

-

-		layer.fire('tileload', {tile: this, url: this.src});

-		

-		layer._tilesToLoad--;

-		if (!layer._tilesToLoad) {

-			layer.fire('load');

-		}

-	},

-	

-	_tileOnError: function(e) {

-		var layer = this._layer;

-		

-		layer.fire('tileerror', {tile: this, url: this.src});

-		

-		var newUrl = layer.options.errorTileUrl;

-		if (newUrl) {

-			this.src = newUrl;

-		}

-	}

-});

diff --git a/extlib/leaflet/src/layer/vector/Circle.js b/extlib/leaflet/src/layer/vector/Circle.js
deleted file mode 100644
index c737c191..00000000
--- a/extlib/leaflet/src/layer/vector/Circle.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*

- * L.Circle is a circle overlay (with a certain radius in meters). 

- */

-

-L.Circle = L.Path.extend({

-	initialize: function(latlng, radius, options) {

-		L.Path.prototype.initialize.call(this, options);

-		

-		this._latlng = latlng;

-		this._mRadius = radius;

-	},

-	

-	options: {

-		fill: true

-	},

-	

-	setLatLng: function(latlng) {

-		this._latlng = latlng;

-		this._redraw();

-		return this;

-	},

-	

-	setRadius: function(radius) {

-		this._mRadius = radius;

-		this._redraw();

-		return this;

-	},

-	

-	projectLatlngs: function() {

-		var equatorLength = 40075017,

-			scale = this._map.options.scale(this._map._zoom);

-		

-		this._point = this._map.latLngToLayerPoint(this._latlng);

-		this._radius = (this._mRadius / equatorLength) * scale; 

-	},

-	

-	getPathString: function() {

-		var p = this._point,

-			r = this._radius;

-		

-		if (L.Path.SVG) {

-			return "M" + p.x + "," + (p.y - r) + 

-					"A" + r + "," + r + ",0,1,1," + 

-					(p.x - 0.1) + "," + (p.y - r) + " z";

-		} else {

-			p._round();

-			r = Math.round(r);

-			return "AL " + p.x + "," + p.y + " " + r + "," + r + " 0," + (65535 * 360);

-		}

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/vector/CircleMarker.js b/extlib/leaflet/src/layer/vector/CircleMarker.js
deleted file mode 100644
index fa4bacf0..00000000
--- a/extlib/leaflet/src/layer/vector/CircleMarker.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*

- * L.CircleMarker is a circle overlay with a permanent pixel radius. 

- */

-

-L.CircleMarker = L.Circle.extend({

-	options: {

-		radius: 10,

-		weight: 2

-	},

-	

-	initialize: function(latlng, options) {

-		L.Circle.prototype.initialize.call(this, latlng, null, options);

-		this._radius = this.options.radius;

-	},

-	

-	projectLatlngs: function() {

-		this._point = this._map.latLngToLayerPoint(this._latlng);

-	},

-	

-	setRadius: function(radius) {

-		this._radius = radius;

-		this._redraw();

-		return this;

-	}	

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/vector/MultiPoly.js b/extlib/leaflet/src/layer/vector/MultiPoly.js
deleted file mode 100644
index 60d6de68..00000000
--- a/extlib/leaflet/src/layer/vector/MultiPoly.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*

- * Contains L.MultiPolyline and L.MultiPolygon layers. 

- */

-

-(function() {

-	function createMulti(klass) {

-		return L.FeatureGroup.extend({

-			initialize: function(latlngs, options) {

-				this._layers = {};

-				for (var i = 0, len = latlngs.length; i < len; i++) {

-					this.addLayer(new klass(latlngs[i], options));

-				}

-			},

-

-			setStyle: function(style) {

-				for (var i in this._layers) {

-					if (this._layers.hasOwnProperty(i) && this._layers[i].setStyle) {

-						this._layers[i].setStyle(style);

-					}

-				}

-			}

-		});

-	}

-

-	L.MultiPolyline = createMulti(L.Polyline);

-	L.MultiPolygon = createMulti(L.Polygon);

-}());

diff --git a/extlib/leaflet/src/layer/vector/Path.Popup.js b/extlib/leaflet/src/layer/vector/Path.Popup.js
deleted file mode 100644
index b82a4920..00000000
--- a/extlib/leaflet/src/layer/vector/Path.Popup.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*

- * Popup extension to L.Path (polylines, polygons, circles), adding bindPopup method. 

- */

-

-L.Path.include({

-	bindPopup: function(content, options) {

-		if (!this._popup || this._popup.options !== options) {

-			this._popup = new L.Popup(options);

-		}

-		this._popup.setContent(content);

-		

-		if (!this._openPopupAdded) {

-			this.on('click', this._openPopup, this);

-			this._openPopupAdded = true;

-		}

-		

-		return this;

-	},

-	

-	_openPopup: function(e) {

-		this._popup.setLatLng(e.latlng);

-		this._map.openPopup(this._popup);

-	}	

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/vector/Path.VML.js b/extlib/leaflet/src/layer/vector/Path.VML.js
deleted file mode 100644
index 8481d994..00000000
--- a/extlib/leaflet/src/layer/vector/Path.VML.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*

- * Vector rendering for IE6-8 through VML. 

- * Thanks to Dmitry Baranovsky and his Raphael library for inspiration!

- */

-

-L.Path.VML = (function() {

-	var d = document.createElement('div'), s;

-	d.innerHTML = '<v:shape adj="1"/>';

-	s = d.firstChild;

-	s.style.behavior = 'url(#default#VML)';

-	

-	return (s && (typeof s.adj == 'object'));

-})();

-

-L.Path = L.Path.SVG || !L.Path.VML ? L.Path : L.Path.extend({

-	statics: {

-		CLIP_PADDING: 0.02

-	},

-	

-	_createElement: (function() { 

-		try {

-			document.namespaces.add('lvml', 'urn:schemas-microsoft-com:vml');

-			return function(name) {

-				return document.createElement('<lvml:' + name + ' class="lvml">');

-			};

-		} catch (e) {

-			return function(name) {

-				return document.createElement('<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');

-			};

-		}

-	})(),

-	

-	_initRoot: function() {

-		if (!this._map._pathRoot) {

-			this._map._pathRoot = document.createElement('div');

-			this._map._pathRoot.className = 'leaflet-vml-container';

-			this._map._panes.overlayPane.appendChild(this._map._pathRoot);

-

-			this._map.on('moveend', this._updateViewport, this);

-			this._updateViewport();

-		}

-	},

-	

-	_initPath: function() {

-		this._container = this._createElement('shape');

-		this._container.className += ' leaflet-vml-shape' + 

-				(this.options.clickable ? ' leaflet-clickable' : '');

-		this._container.coordsize = '1 1';

-		

-		this._path = this._createElement('path');

-		this._container.appendChild(this._path);

-		

-		this._map._pathRoot.appendChild(this._container);

-	},

-	

-	_initStyle: function() {

-		if (this.options.stroke) {

-			this._stroke = this._createElement('stroke');

-			this._stroke.endcap = 'round';

-			this._container.appendChild(this._stroke);

-		} else {

-			this._container.stroked = false;

-		}

-		if (this.options.fill) {

-			this._container.filled = true;

-			this._fill = this._createElement('fill');

-			this._container.appendChild(this._fill);

-		} else {

-			this._container.filled = false;

-		}

-		this._updateStyle();

-	},

-	

-	_updateStyle: function() {

-		if (this.options.stroke) {

-			this._stroke.weight = this.options.weight + 'px';

-			this._stroke.color = this.options.color;

-			this._stroke.opacity = this.options.opacity;

-		}

-		if (this.options.fill) {

-			this._fill.color = this.options.fillColor || this.options.color;

-			this._fill.opacity = this.options.fillOpacity;

-		}

-	},

-	

-	_updatePath: function() {

-		this._container.style.display = 'none';

-		this._path.v = this.getPathString() + ' '; // the space fixes IE empty path string bug

-		this._container.style.display = '';

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/vector/Path.js b/extlib/leaflet/src/layer/vector/Path.js
deleted file mode 100644
index 3d4837cc..00000000
--- a/extlib/leaflet/src/layer/vector/Path.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/*

- * L.Path is a base class for rendering vector paths on a map. It's inherited by Polyline, Circle, etc.

- */

-

-L.Path = L.Class.extend({

-	includes: [L.Mixin.Events],

-	

-	statics: (function() {

-		var svgns = 'http://www.w3.org/2000/svg',

-			ce = 'createElementNS';

-		

-		return {

-			SVG_NS: svgns,

-			SVG: !!(document[ce] && document[ce](svgns, 'svg').createSVGRect),

-			

-			// how much to extend the clip area around the map view 

-			// (relative to its size, e.g. 0.5 is half the screen in each direction)

-			CLIP_PADDING: 0.5

-		};

-	})(),

-	

-	options: {

-		stroke: true,

-		color: '#0033ff',

-		weight: 5,

-		opacity: 0.5,

-		

-		fill: false,

-		fillColor: null, //same as color by default

-		fillOpacity: 0.2,

-		

-		clickable: true,

-		

-		updateOnMoveEnd: false

-	},

-	

-	initialize: function(options) {

-		L.Util.setOptions(this, options);

-	},

-	

-	onAdd: function(map) {

-		this._map = map;

-		

-		this._initElements();

-		this._initEvents();

-		this.projectLatlngs();

-		this._updatePath();

-

-		map.on('viewreset', this.projectLatlngs, this);

-		

-		this._updateTrigger = this.options.updateOnMoveEnd ? 'moveend' : 'viewreset';

-		map.on(this._updateTrigger, this._updatePath, this);

-	},

-	

-	onRemove: function(map) {

-		map._pathRoot.removeChild(this._container);

-		map.off('viewreset', this._projectLatlngs, this);

-		map.off(this._updateTrigger, this._updatePath, this);

-	},

-	

-	projectLatlngs: function() {

-		// do all projection stuff here

-	},

-	

-	getPathString: function() {

-		// form path string here

-	},

-	

-	setStyle: function(style) {

-		L.Util.setOptions(this, style);

-		if (this._path) {

-			this._updateStyle();

-		}

-	},

-	

-	_initElements: function() {

-		this._initRoot();

-		this._initPath();

-		this._initStyle();

-	},

-	

-	_initRoot: function() {

-		if (!this._map._pathRoot) {

-			this._map._pathRoot = this._createElement('svg');

-			this._map._panes.overlayPane.appendChild(this._map._pathRoot);

-

-			this._map.on('moveend', this._updateSvgViewport, this);

-			this._updateSvgViewport();

-		}

-	},

-	

-	_updateSvgViewport: function() {

-		this._updateViewport();

-		

-		var vp = this._map._pathViewport,

-			min = vp.min,

-			max = vp.max,

-			width = max.x - min.x,

-			height = max.y - min.y,

-			root = this._map._pathRoot,

-			pane = this._map._panes.overlayPane;

-	

-		// Hack to make flicker on drag end on mobile webkit less irritating

-		// Unfortunately I haven't found a good workaround for this yet

-		if (L.Browser.mobileWebkit) { pane.removeChild(root); }

-		

-		L.DomUtil.setPosition(root, min);

-		root.setAttribute('width', width);

-		root.setAttribute('height', height);

-		root.setAttribute('viewBox', [min.x, min.y, width, height].join(' '));

-		

-		if (L.Browser.mobileWebkit) { pane.appendChild(root); }

-	},

-	

-	_updateViewport: function() {

-		var p = L.Path.CLIP_PADDING,

-			size = this._map.getSize(),

-			//TODO this._map._getMapPanePos()

-			panePos = L.DomUtil.getPosition(this._map._mapPane), 

-			min = panePos.multiplyBy(-1).subtract(size.multiplyBy(p)),

-			max = min.add(size.multiplyBy(1 + p * 2));

-		

-		this._map._pathViewport = new L.Bounds(min, max);

-	},

-	

-	_initPath: function() {

-		this._container = this._createElement('g');

-		

-		this._path = this._createElement('path');

-		this._container.appendChild(this._path);

-		

-		this._map._pathRoot.appendChild(this._container);

-	},

-	

-	_initStyle: function() {

-		if (this.options.stroke) {

-			this._path.setAttribute('stroke-linejoin', 'round');

-			this._path.setAttribute('stroke-linecap', 'round');

-		}

-		if (this.options.fill) {

-			this._path.setAttribute('fill-rule', 'evenodd');

-		} else {

-			this._path.setAttribute('fill', 'none');

-		}

-		this._updateStyle();

-	},

-	

-	_updateStyle: function() {

-		if (this.options.stroke) {

-			this._path.setAttribute('stroke', this.options.color);

-			this._path.setAttribute('stroke-opacity', this.options.opacity);

-			this._path.setAttribute('stroke-width', this.options.weight);

-		}

-		if (this.options.fill) {

-			this._path.setAttribute('fill', this.options.fillColor || this.options.color);

-			this._path.setAttribute('fill-opacity', this.options.fillOpacity);

-		}

-	},

-	

-	_updatePath: function() {

-		var str = this.getPathString();

-		if (!str) {

-			// fix webkit empty string parsing bug

-			str = 'M0 0';

-		}

-		this._path.setAttribute('d', str);

-	},

-	

-	_createElement: function(name) {

-		return document.createElementNS(L.Path.SVG_NS, name);

-	},

-	

-	// TODO remove duplication with L.Map

-	_initEvents: function() {

-		if (this.options.clickable) {

-			if (!L.Path.VML) {

-				this._path.setAttribute('class', 'leaflet-clickable');

-			}

-			

-			L.DomEvent.addListener(this._container, 'click', this._onMouseClick, this);

-

-			var events = ['dblclick', 'mousedown', 'mouseover', 'mouseout'];

-			for (var i = 0; i < events.length; i++) {

-				L.DomEvent.addListener(this._container, events[i], this._fireMouseEvent, this);

-			}

-		}

-	},

-	

-	_onMouseClick: function(e) {

-		if (this._map.dragging && this._map.dragging.moved()) { return; }

-		this._fireMouseEvent(e);

-	},

-	

-	_fireMouseEvent: function(e) {

-		if (!this.hasEventListeners(e.type)) { return; }

-		this.fire(e.type, {

-			latlng: this._map.mouseEventToLatLng(e),

-			layerPoint: this._map.mouseEventToLayerPoint(e)

-		});

-		L.DomEvent.stopPropagation(e);

-	},

-	

-	_redraw: function() {

-		this.projectLatlngs();

-		this._updatePath();

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/vector/Polygon.js b/extlib/leaflet/src/layer/vector/Polygon.js
deleted file mode 100644
index 52bf2d6b..00000000
--- a/extlib/leaflet/src/layer/vector/Polygon.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*

- * L.Polygon is used to display polygons on a map.

- */

-

-L.Polygon = L.Polyline.extend({

-	options: {

-		fill: true

-	},

-	

-	initialize: function(latlngs, options) {

-		L.Polyline.prototype.initialize.call(this, latlngs, options);

-		

-		if (latlngs[0] instanceof Array) {

-			this._latlngs = latlngs[0];

-			this._holes = latlngs.slice(1);

-		}

-	},

-	

-	projectLatlngs: function() {

-		L.Polyline.prototype.projectLatlngs.call(this);

-		

-		// project polygon holes points

-		// TODO move this logic to Polyline to get rid of duplication

-		this._holePoints = [];

-		

-		if (!this._holes) return;

-		

-		for (var i = 0, len = this._holes.length, hole; i < len; i++) {

-			this._holePoints[i] = [];

-			

-			for(var j = 0, len2 = this._holes[i].length; j < len2; j++) {

-				this._holePoints[i][j] = this._map.latLngToLayerPoint(this._holes[i][j]);

-			}

-		}

-	},

-	

-	_clipPoints: function() {

-		var points = this._originalPoints,

-			newParts = [];

-		

-		this._parts = [points].concat(this._holePoints);

-		

-		if (this.options.noClip) return;

-		

-		for (var i = 0, len = this._parts.length; i < len; i++) {

-			var clipped = L.PolyUtil.clipPolygon(this._parts[i], this._map._pathViewport);

-			if (!clipped.length) continue;

-			newParts.push(clipped);

-		}

-		

-		this._parts = newParts;

-	},

-	

-	_getPathPartStr: function(points) {

-		var str = L.Polyline.prototype._getPathPartStr.call(this, points);

-		return str + (L.Path.SVG ? 'z' : 'x');

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/layer/vector/Polyline.js b/extlib/leaflet/src/layer/vector/Polyline.js
deleted file mode 100644
index 606d7d71..00000000
--- a/extlib/leaflet/src/layer/vector/Polyline.js
+++ /dev/null
@@ -1,112 +0,0 @@
-

-L.Polyline = L.Path.extend({

-	initialize: function(latlngs, options) {

-		L.Path.prototype.initialize.call(this, options);

-		this._latlngs = latlngs;

-	},

-	

-	options: {

-		// how much to simplify the polyline on each zoom level

-		// more = better performance and smoother look, less = more accurate

-		smoothFactor: 1.0,

-		noClip: false,

-		

-		updateOnMoveEnd: true

-	},

-	

-	projectLatlngs: function() {

-		this._originalPoints = [];

-		

-		for (var i = 0, len = this._latlngs.length; i < len; i++) {

-			this._originalPoints[i] = this._map.latLngToLayerPoint(this._latlngs[i]);

-		}

-	},

-	

-	getPathString: function() {

-		for (var i = 0, len = this._parts.length, str = ''; i < len; i++) {

-			str += this._getPathPartStr(this._parts[i]);

-		}

-		return str;

-	},

-	

-	getLatLngs: function() {

-		return this._latlngs;

-	},

-	

-	setLatLngs: function(latlngs) {

-		this._latlngs = latlngs;

-		this._redraw();

-		return this;

-	},

-	

-	addLatLng: function(latlng) {

-		this._latlngs.push(latlng);

-		this._redraw();

-		return this;

-	},

-	

-	spliceLatLngs: function(index, howMany) {

-		var removed = [].splice.apply(this._latlngs, arguments);

-		this._redraw();

-		return removed;

-	},

-	

-	_getPathPartStr: function(points) {

-		var round = L.Path.VML;

-		

-		for (var j = 0, len2 = points.length, str = '', p; j < len2; j++) {

-			p = points[j];

-			if (round) p._round();

-			str += (j ? 'L' : 'M') + p.x + ' ' + p.y;

-		}

-		return str;

-	},

-	

-	_clipPoints: function() {

-		var points = this._originalPoints,

-			len = points.length,

-			i, k, segment;

-

-		if (this.options.noClip) {

-			this._parts = [points];

-			return;

-		}

-		

-		this._parts = [];

-		

-		var parts = this._parts,

-			vp = this._map._pathViewport,

-			lu = L.LineUtil;

-		

-		for (i = 0, k = 0; i < len - 1; i++) {

-			segment = lu.clipSegment(points[i], points[i+1], vp, i);

-			if (!segment) continue;

-			

-			parts[k] = parts[k] || [];

-			parts[k].push(segment[0]);

-			

-			// if segment goes out of screen, or it's the last one, it's the end of the line part

-			if ((segment[1] != points[i+1]) || (i == len - 2)) {

-				parts[k].push(segment[1]);

-				k++;  

-			}

-		}

-	},

-	

-	// simplify each clipped part of the polyline

-	_simplifyPoints: function() {

-		var parts = this._parts,

-			lu = L.LineUtil;

-		

-		for (var i = 0, len = parts.length; i < len; i++) {

-			parts[i] = lu.simplify(parts[i], this.options.smoothFactor);

-		}

-	},

-	

-	_updatePath: function() {

-		this._clipPoints();

-		this._simplifyPoints();

-		

-		L.Path.prototype._updatePath.call(this);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/map/Map.js b/extlib/leaflet/src/map/Map.js
deleted file mode 100644
index d460048e..00000000
--- a/extlib/leaflet/src/map/Map.js
+++ /dev/null
@@ -1,464 +0,0 @@
-/*

- * L.Map is the central class of the API - it is used to create a map.

- */

-

-L.Map = L.Class.extend({

-	includes: L.Mixin.Events,

-	

-	options: {

-		// projection

-		crs: L.CRS.EPSG3857 || L.CRS.EPSG4326,

-		scale: function(zoom) { return 256 * (1 << zoom); },

-		

-		// state

-		center: null,

-		zoom: null,

-		layers: [],

-		

-		// interaction

-		dragging: true,

-		touchZoom: L.Browser.mobileWebkit && !L.Browser.android,

-		scrollWheelZoom: !L.Browser.mobileWebkit,

-		doubleClickZoom: true,

-		shiftDragZoom: true,

-		

-		// controls

-		zoomControl: true,

-		attributionControl: true,

-		

-		// animation

-		fadeAnimation: L.DomUtil.TRANSITION && !L.Browser.android,

-		zoomAnimation: L.DomUtil.TRANSITION && !L.Browser.android && !L.Browser.mobileOpera,

-		

-		// misc

-		trackResize: true,

-		closePopupOnClick: true

-	},

-	

-	

-	// constructor

-	

-	initialize: function(/*HTMLElement or String*/ id, /*Object*/ options) {

-		L.Util.setOptions(this, options);

-		

-		this._container = L.DomUtil.get(id);

-		

-		this._initLayout();

-		

-		if (L.DomEvent) { 

-			this._initEvents(); 

-			if (L.Handler) { this._initInteraction(); }

-			if (L.Control) { this._initControls(); }

-		}

-		

-		var center = this.options.center,

-			zoom = this.options.zoom;

-		

-		if (center !== null && zoom !== null) {

-			this.setView(center, zoom, true);

-		}

-

-		var layers = this.options.layers;

-		layers = (layers instanceof Array ? layers : [layers]);

-		this._tileLayersNum = 0;

-		this._initLayers(layers);

-	},

-	

-	

-	// public methods that modify map state

-	

-	// replaced by animation-powered implementation in Map.PanAnimation.js

-	setView: function(center, zoom, forceReset) {

-		// reset the map view 

-		this._resetView(center, this._limitZoom(zoom));

-		return this;

-	},

-	

-	setZoom: function(/*Number*/ zoom) {

-		return this.setView(this.getCenter(), zoom);

-	},

-	

-	zoomIn: function() {

-		return this.setZoom(this._zoom + 1);

-	},

-	

-	zoomOut: function() {

-		return this.setZoom(this._zoom - 1);

-	},

-	

-	fitBounds: function(/*LatLngBounds*/ bounds) {

-		var zoom = this.getBoundsZoom(bounds);

-		return this.setView(bounds.getCenter(), zoom);

-	},

-	

-	fitWorld: function() {

-		var sw = new L.LatLng(-60, -170),

-			ne = new L.LatLng(85, 179);

-		return this.fitBounds(new L.LatLngBounds(sw, ne));

-	},

-	

-	panTo: function(/*LatLng*/ center) {

-		return this.setView(center, this._zoom);

-	},

-	

-	panBy: function(/*Point*/ offset) {

-		// replaced with animated panBy in Map.Animation.js

-		this.fire('movestart');

-		

-		this._rawPanBy(offset);

-		

-		this.fire('move');

-		this.fire('moveend');

-		

-		return this;

-	},

-	

-	addLayer: function(layer) {

-		var id = L.Util.stamp(layer);

-		

-		if (this._layers[id]) return this;

-		

-		this._layers[id] = layer;

-		

-		if (layer.options && !isNaN(layer.options.maxZoom)) {

-			this._layersMaxZoom = Math.max(this._layersMaxZoom || 0, layer.options.maxZoom);

-		}

-		if (layer.options && !isNaN(layer.options.minZoom)) {

-			this._layersMinZoom = Math.min(this._layersMinZoom || Infinity, layer.options.minZoom);

-		}

-		//TODO getMaxZoom, getMinZoom in ILayer (instead of options)

-		

-		if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {

-			this._tileLayersNum++;

-			layer.on('load', this._onTileLayerLoad, this);

-		}

-		if (this.attributionControl && layer.getAttribution) {

-			this.attributionControl.addAttribution(layer.getAttribution());

-		}

-		

-		var onMapLoad = function() {

-			layer.onAdd(this);

-			this.fire('layeradd', {layer: layer});

-		};

-		

-		if (this._loaded) {

-			onMapLoad.call(this);

-		} else {

-			this.on('load', onMapLoad, this);

-		}

-		

-		return this;

-	},

-	

-	removeLayer: function(layer) {

-		var id = L.Util.stamp(layer);

-		

-		if (this._layers[id]) {

-			layer.onRemove(this);

-			delete this._layers[id];

-			

-			if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {

-				this._tileLayersNum--;

-				layer.off('load', this._onTileLayerLoad, this);

-			}

-			if (this.attributionControl && layer.getAttribution) {

-				this.attributionControl.removeAttribution(layer.getAttribution());

-			}

-			

-			this.fire('layerremove', {layer: layer});

-		}

-		return this;

-	},

-	

-	invalidateSize: function() {

-		this._sizeChanged = true;

-		

-		this.fire('move');

-		

-		clearTimeout(this._sizeTimer);

-		this._sizeTimer = setTimeout(L.Util.bind(function() {

-			this.fire('moveend');

-		}, this), 200); 

-

-		return this;

-	},

-	

-	

-	// public methods for getting map state	

-	

-	getCenter: function(/*Boolean*/ unbounded) {

-		var viewHalf = this.getSize().divideBy(2),

-			centerPoint = this._getTopLeftPoint().add(viewHalf);

-		return this.unproject(centerPoint, this._zoom, unbounded);

-	},

-	

-	getZoom: function() {

-		return this._zoom;

-	},

-	

-	getBounds: function() {

-		var bounds = this.getPixelBounds(),

-			sw = this.unproject(new L.Point(bounds.min.x, bounds.max.y)),

-			ne = this.unproject(new L.Point(bounds.max.x, bounds.min.y));

-		return new L.LatLngBounds(sw, ne);

-	},

-	

-	getMinZoom: function() {

-		return isNaN(this.options.minZoom) ?  this._layersMinZoom || 0 : this.options.minZoom;

-	},

-	

-	getMaxZoom: function() {

-		return isNaN(this.options.maxZoom) ?  this._layersMaxZoom || Infinity : this.options.maxZoom;

-	},

-	

-	getBoundsZoom: function(/*LatLngBounds*/ bounds) {

-		var size = this.getSize(),

-			zoom = this.getMinZoom(),

-			maxZoom = this.getMaxZoom(),

-			ne = bounds.getNorthEast(),

-			sw = bounds.getSouthWest(),

-			boundsSize, 

-			nePoint, swPoint;

-		do {

-			zoom++;

-			nePoint = this.project(ne, zoom);

-			swPoint = this.project(sw, zoom);

-			boundsSize = new L.Point(nePoint.x - swPoint.x, swPoint.y - nePoint.y);

-		} while ((boundsSize.x <= size.x) && 

-				 (boundsSize.y <= size.y) && (zoom <= maxZoom));

-		

-		return zoom - 1;

-	},

-	

-	getSize: function() {

-		if (!this._size || this._sizeChanged) {

-			this._size = new L.Point(this._container.clientWidth, this._container.clientHeight);

-			this._sizeChanged = false;

-		}

-		return this._size;

-	},

-

-	getPixelBounds: function() {

-		var topLeftPoint = this._getTopLeftPoint(),

-			size = this.getSize();

-		return new L.Bounds(topLeftPoint, topLeftPoint.add(size));

-	},

-	

-	getPixelOrigin: function() {

-		return this._initialTopLeftPoint;

-	},

-	

-	getPanes: function() {

-		return this._panes;

-	},

-	

-	

-	// conversion methods

-	

-	mouseEventToContainerPoint: function(/*MouseEvent*/ e) {

-		return L.DomEvent.getMousePosition(e, this._container);

-	},

-	

-	mouseEventToLayerPoint: function(/*MouseEvent*/ e) {

-		return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e));

-	},

-	

-	mouseEventToLatLng: function(/*MouseEvent*/ e) {

-		return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));

-	},

-	

-	containerPointToLayerPoint: function(/*Point*/ point) {

-		return point.subtract(L.DomUtil.getPosition(this._mapPane));

-	},

-	

-	layerPointToContainerPoint: function(/*Point*/ point) {

-		return point.add(L.DomUtil.getPosition(this._mapPane));

-	},

-	

-	layerPointToLatLng: function(/*Point*/ point) {

-		return this.unproject(point.add(this._initialTopLeftPoint));

-	},

-	

-	latLngToLayerPoint: function(/*LatLng*/ latlng) {

-		return this.project(latlng)._subtract(this._initialTopLeftPoint);

-	},

-

-	project: function(/*LatLng*/ latlng, /*(optional) Number*/ zoom)/*-> Point*/ {

-		zoom = (typeof zoom == 'undefined' ? this._zoom : zoom);

-		return this.options.crs.latLngToPoint(latlng, this.options.scale(zoom));

-	},

-	

-	unproject: function(/*Point*/ point, /*(optional) Number*/ zoom, /*(optional) Boolean*/ unbounded)/*-> Object*/ {

-		zoom = (typeof zoom == 'undefined' ? this._zoom : zoom);

-		return this.options.crs.pointToLatLng(point, this.options.scale(zoom), unbounded);

-	},

-	

-	

-	// private methods that modify map state

-	

-	_initLayout: function() {

-		var container = this._container;

-		

-		container.className += ' leaflet-container';

-		

-		if (this.options.fadeAnimation) {

-			container.className += ' leaflet-fade-anim';

-		}

-		

-		var position = L.DomUtil.getStyle(container, 'position');

-		if (position != 'absolute' && position != 'relative') {

-			container.style.position = 'relative';

-		}

-		

-		this._initPanes();

-		

-		if (this._initControlPos) this._initControlPos();

-	},

-	

-	_initPanes: function() {

-		var panes = this._panes = {};

-		

-		this._mapPane = panes.mapPane = this._createPane('leaflet-map-pane', this._container);

-		

-		this._tilePane = panes.tilePane = this._createPane('leaflet-tile-pane', this._mapPane);

-		this._objectsPane = panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane);

-		

-		panes.shadowPane = this._createPane('leaflet-shadow-pane');

-		panes.overlayPane = this._createPane('leaflet-overlay-pane');

-		panes.markerPane = this._createPane('leaflet-marker-pane');

-		panes.popupPane = this._createPane('leaflet-popup-pane');

-	},

-	

-	_createPane: function(className, container) {

-		return L.DomUtil.create('div', className, container || this._objectsPane);

-	},

-	

-	_resetView: function(center, zoom, preserveMapOffset) {

-		var zoomChanged = (this._zoom != zoom);

-		

-		this.fire('movestart');

-		

-		this._zoom = zoom;

-		

-		this._initialTopLeftPoint = this._getNewTopLeftPoint(center);

-		

-		if (!preserveMapOffset) {

-			L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));

-		} else {

-			var offset = L.DomUtil.getPosition(this._mapPane);

-			this._initialTopLeftPoint._add(offset);

-		}

-		

-		this._tileLayersToLoad = this._tileLayersNum;

-		this.fire('viewreset');

-

-		this.fire('move');

-		if (zoomChanged) { this.fire('zoomend'); }

-		this.fire('moveend');

-		

-		if (!this._loaded) {

-			this._loaded = true;

-			this.fire('load');

-		}

-	},

-	

-	_initLayers: function(layers) {

-		this._layers = {};

-		for (var i = 0, len = layers.length; i < len; i++) {

-			this.addLayer(layers[i]);

-		}

-	},

-	

-	_initControls: function() {

-		if (this.options.zoomControl) {

-			this.addControl(new L.Control.Zoom());

-		}

-		if (this.options.attributionControl) {

-			this.attributionControl = new L.Control.Attribution();

-			this.addControl(this.attributionControl);

-		}

-	},

-

-	_rawPanBy: function(offset) {

-		var mapPaneOffset = L.DomUtil.getPosition(this._mapPane);

-		L.DomUtil.setPosition(this._mapPane, mapPaneOffset.subtract(offset));

-	},

-	

-	

-	// map events

-	

-	_initEvents: function() {

-		L.DomEvent.addListener(this._container, 'click', this._onMouseClick, this);

-		

-		var events = ['dblclick', 'mousedown', 'mouseenter', 'mouseleave', 'mousemove'];

-		for (var i = 0; i < events.length; i++) {

-			L.DomEvent.addListener(this._container, events[i], this._fireMouseEvent, this);

-		}

-		

-		if (this.options.trackResize) {

-			L.DomEvent.addListener(window, 'resize', this.invalidateSize, this);

-		}

-	},

-	

-	_onMouseClick: function(e) {

-		if (this.dragging && this.dragging.moved()) { return; }

-		

-		this.fire('pre' + e.type);

-		this._fireMouseEvent(e);

-	},

-	

-	_fireMouseEvent: function(e) {

-		var type = e.type;

-		type = (type == 'mouseenter' ? 'mouseover' : (type == 'mouseleave' ? 'mouseout' : type));

-		if (!this.hasEventListeners(type)) { return; }

-		this.fire(type, {

-			latlng: this.mouseEventToLatLng(e),

-			layerPoint: this.mouseEventToLayerPoint(e)

-		});

-	},

-	

-	_initInteraction: function() {

-		var handlers = {

-			dragging: L.Handler.MapDrag,

-			touchZoom: L.Handler.TouchZoom,

-			doubleClickZoom: L.Handler.DoubleClickZoom,

-			scrollWheelZoom: L.Handler.ScrollWheelZoom,

-			shiftDragZoom: L.Handler.ShiftDragZoom

-		};

-		for (var i in handlers) {

-			if (handlers.hasOwnProperty(i) && handlers[i]) {

-				this[i] = new handlers[i](this);

-				if (this.options[i]) this[i].enable();

-			}

-		}

-	},

-	

-	_onTileLayerLoad: function() {

-		// clear scaled tiles after all new tiles are loaded (for performance)

-		this._tileLayersToLoad--;

-		if (this._tileLayersNum && !this._tileLayersToLoad && this._tileBg) {

-			clearTimeout(this._clearTileBgTimer);

-			this._clearTileBgTimer = setTimeout(L.Util.bind(this._clearTileBg, this), 500);

-		}

-	},

-	

-

-	// private methods for getting map state

-	

-	_getTopLeftPoint: function() {

-		if (!this._loaded) throw new Error('Set map center and zoom first.');

-		var offset = L.DomUtil.getPosition(this._mapPane);

-		return this._initialTopLeftPoint.subtract(offset);

-	},

-	

-	_getNewTopLeftPoint: function(center) {

-		var viewHalf = this.getSize().divideBy(2);

-		return this.project(center).subtract(viewHalf).round();

-	},

-	

-	_limitZoom: function(zoom) {

-		var min = this.getMinZoom();

-		var max = this.getMaxZoom();

-		return Math.max(min, Math.min(max, zoom));

-	}

-});
diff --git a/extlib/leaflet/src/map/ext/Map.Control.js b/extlib/leaflet/src/map/ext/Map.Control.js
deleted file mode 100644
index 46711a82..00000000
--- a/extlib/leaflet/src/map/ext/Map.Control.js
+++ /dev/null
@@ -1,50 +0,0 @@
-L.Map.include({
-	addControl: function(control) {
-		control.onAdd(this);
-
-		var pos = control.getPosition(),
-			corner = this._controlCorners[pos],
-			container = control.getContainer();
-		
-		L.DomUtil.addClass(container, 'leaflet-control');
-		
-		if (pos.indexOf('bottom') != -1) {
-			corner.insertBefore(container, corner.firstChild);
-		} else {
-			corner.appendChild(container);
-		}
-		return this;
-	},
-	
-	removeControl: function(control) {
-		var pos = control.getPosition(),
-			corner = this._controlCorners[pos],
-			container = control.getContainer();
-		
-		corner.removeChild(container);
-		
-		if (control.onRemove) {
-			control.onRemove(this);
-		}
-		return this;
-	},
-	
-	_initControlPos: function() {
-		var corners = this._controlCorners = {},
-			classPart = 'leaflet-',
-			top = classPart + 'top',
-			bottom = classPart + 'bottom',
-			left = classPart + 'left',
-			right = classPart + 'right',
-			controlContainer = L.DomUtil.create('div', classPart + 'control-container', this._container);
-		
-		if (L.Browser.mobileWebkit) {
-			controlContainer.className += ' ' + classPart + 'big-buttons';
-		}
-		
-		corners.topLeft = L.DomUtil.create('div', top + ' ' + left, controlContainer);
-		corners.topRight = L.DomUtil.create('div', top + ' ' + right, controlContainer);
-		corners.bottomLeft = L.DomUtil.create('div', bottom + ' ' + left, controlContainer);
-		corners.bottomRight = L.DomUtil.create('div', bottom + ' ' + right, controlContainer);
-	}
-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/map/ext/Map.Geolocation.js b/extlib/leaflet/src/map/ext/Map.Geolocation.js
deleted file mode 100644
index 328662b9..00000000
--- a/extlib/leaflet/src/map/ext/Map.Geolocation.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*

- * Provides L.Map with convenient shortcuts for W3C geolocation.

- */

-

-L.Map.include({

-	locate: function(/*Object*/ options) {
-		// W3C Geolocation API Spec position options, http://dev.w3.org/geo/api/spec-source.html#position-options

-		var opts = {timeout: 10000};

-		L.Util.extend(opts, options);

-		

-		if (navigator.geolocation) {

-			navigator.geolocation.getCurrentPosition(

-					L.Util.bind(this._handleGeolocationResponse, this),

-					L.Util.bind(this._handleGeolocationError, this),

-					opts);

-		} else {

-			this.fire('locationerror', {

-				code: 0,

-				message: "Geolocation not supported."

-			});

-		}

-		return this;

-	},

-	

-	locateAndSetView: function(maxZoom, options) {

-		this._setViewOnLocate = true;

-		this._maxLocateZoom = maxZoom || Infinity;

-		return this.locate(options);

-	},

-	

-	_handleGeolocationError: function(error) {

-		var c = error.code,

-			message = (c == 1 ? "permission denied" : 

-				(c == 2 ? "position unavailable" : "timeout"));

-		

-		if (this._setViewOnLocate) {

-			this.fitWorld();

-			this._setViewOnLocate = false;

-		}

-		

-		this.fire('locationerror', {

-			code: c,

-			message: "Geolocation error: " + message + "." 

-		});

-	},

-	

-	_handleGeolocationResponse: function(pos) {

-		var latAccuracy = 180 * pos.coords.accuracy / 4e7,

-			lngAccuracy = latAccuracy * 2,

-			lat = pos.coords.latitude,

-			lng = pos.coords.longitude;

-		

-		var sw = new L.LatLng(lat - latAccuracy, lng - lngAccuracy),

-			ne = new L.LatLng(lat + latAccuracy, lng + lngAccuracy),

-			bounds = new L.LatLngBounds(sw, ne);

-		

-		if (this._setViewOnLocate) {

-			var zoom = Math.min(this.getBoundsZoom(bounds), this._maxLocateZoom);

-			this.setView(bounds.getCenter(), zoom);

-			this._setViewOnLocate = false;

-		}

-		

-		this.fire('locationfound', {

-			latlng: new L.LatLng(lat, lng), 

-			bounds: bounds,

-			accuracy: pos.coords.accuracy

-		});

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/map/ext/Map.PanAnimation.js b/extlib/leaflet/src/map/ext/Map.PanAnimation.js
deleted file mode 100644
index 02ccfd15..00000000
--- a/extlib/leaflet/src/map/ext/Map.PanAnimation.js
+++ /dev/null
@@ -1,62 +0,0 @@
-L.Map.include(!(L.Transition && L.Transition.implemented()) ? {} : {

-	setView: function(center, zoom, forceReset) {

-		zoom = this._limitZoom(zoom);

-		var zoomChanged = (this._zoom != zoom);

-

-		if (this._loaded && !forceReset && this._layers) {

-			// difference between the new and current centers in pixels

-			var offset = this._getNewTopLeftPoint(center).subtract(this._getTopLeftPoint()); 

-			

-			var done = (zoomChanged ? 

-						!!this._zoomToIfCenterInView && this._zoomToIfCenterInView(center, zoom, offset) : 

-						this._panByIfClose(offset));

-			

-			// exit if animated pan or zoom started

-			if (done) { return this; }

-		}

-		

-		// reset the map view 

-		this._resetView(center, zoom);

-		

-		return this;

-	},

-	

-	panBy: function(offset) {

-		if (!this._panTransition) {

-			this._panTransition = new L.Transition(this._mapPane, {duration: 0.3});

-			

-			this._panTransition.on('step', this._onPanTransitionStep, this);

-			this._panTransition.on('end', this._onPanTransitionEnd, this);

-		}

-		this.fire(this, 'movestart');

-		

-		this._panTransition.run({

-			position: L.DomUtil.getPosition(this._mapPane).subtract(offset)

-		});

-		

-		return this;

-	},

-	

-	_onPanTransitionStep: function() {

-		this.fire('move');

-	},

-	

-	_onPanTransitionEnd: function() {

-		this.fire('moveend');

-	},

-

-	_panByIfClose: function(offset) {

-		if (this._offsetIsWithinView(offset)) {

-			this.panBy(offset);

-			return true;

-		}

-		return false;

-	},

-

-	_offsetIsWithinView: function(offset, multiplyFactor) {

-		var m = multiplyFactor || 1,

-			size = this.getSize();

-		return (Math.abs(offset.x) <= size.x * m) && 

-				(Math.abs(offset.y) <= size.y * m);

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/map/ext/Map.Popup.js b/extlib/leaflet/src/map/ext/Map.Popup.js
deleted file mode 100644
index 8b8de937..00000000
--- a/extlib/leaflet/src/map/ext/Map.Popup.js
+++ /dev/null
@@ -1,15 +0,0 @@
-

-L.Map.include({

-	openPopup: function(popup) {

-		this.closePopup();

-		this._popup = popup;

-		return this.addLayer(popup);

-	},

-	

-	closePopup: function() {

-		if (this._popup) {

-			this.removeLayer(this._popup);

-		}

-		return this;

-	}

-});
\ No newline at end of file
diff --git a/extlib/leaflet/src/map/ext/Map.ZoomAnimation.js b/extlib/leaflet/src/map/ext/Map.ZoomAnimation.js
deleted file mode 100644
index 4bf7b9bf..00000000
--- a/extlib/leaflet/src/map/ext/Map.ZoomAnimation.js
+++ /dev/null
@@ -1,124 +0,0 @@
-L.Map.include(!L.DomUtil.TRANSITION ? {} : {

-	_zoomToIfCenterInView: function(center, zoom, centerOffset) {

-		

-		if (this._animatingZoom) { return true; }

-		if (!this.options.zoomAnimation) { return false; }

-		

-		var zoomDelta = zoom - this._zoom,

-			scale = Math.pow(2, zoomDelta),

-			offset = centerOffset.divideBy(1 - 1/scale);

-		

-		//if offset does not exceed half of the view

-		if (!this._offsetIsWithinView(offset, 1)) { return false; }

-		

-		this._mapPane.className += ' leaflet-zoom-anim';

-

-		var centerPoint = this.containerPointToLayerPoint(this.getSize().divideBy(2)),

-			origin = centerPoint.add(offset);

-		

-		this._prepareTileBg();

-	

-		this._runAnimation(center, zoom, scale, origin);

-		

-		return true;

-	},

-	

-	

-	_runAnimation: function(center, zoom, scale, origin) {

-		this._animatingZoom = true;

-

-		this._animateToCenter = center;

-		this._animateToZoom = zoom;

-		

-		var transform = L.DomUtil.TRANSFORM;

-		

-		//dumb FireFox hack, I have no idea why this magic zero translate fixes the scale transition problem

-		if (L.Browser.gecko || window.opera) {

-			this._tileBg.style[transform] += ' translate(0,0)';

-		}

-		

-		var scaleStr;

-		

-		// Android doesn't like translate/scale chains, transformOrigin + scale works better but 

-		// it breaks touch zoom which Anroid doesn't support anyway, so that's a really ugly hack

-		// TODO work around this prettier

-		if (L.Browser.android) {

-			this._tileBg.style[transform + 'Origin'] = origin.x + 'px ' + origin.y + 'px';

-			scaleStr = 'scale(' + scale + ')';

-		} else {

-			scaleStr = L.DomUtil.getScaleString(scale, origin);

-		}

-		

-		L.Util.falseFn(this._tileBg.offsetWidth); //hack to make sure transform is updated before running animation

-		

-		var options = {};

-		options[transform] = this._tileBg.style[transform] + ' ' + scaleStr;

-		this._tileBg.transition.run(options);

-	},

-	

-	_prepareTileBg: function() {

-		if (!this._tileBg) {

-			this._tileBg = this._createPane('leaflet-tile-pane', this._mapPane);

-			this._tileBg.style.zIndex = 1;

-		}

-

-		var tilePane = this._tilePane,

-			tileBg = this._tileBg;

-		

-		// prepare the background pane to become the main tile pane

-		//tileBg.innerHTML = '';

-		tileBg.style[L.DomUtil.TRANSFORM] = '';

-		tileBg.style.visibility = 'hidden';

-		

-		// tells tile layers to reinitialize their containers

-		tileBg.empty = true;

-		tilePane.empty = false;

-

-		this._tilePane = this._panes.tilePane = tileBg;

-		this._tileBg = tilePane;

-		

-		if (!this._tileBg.transition) {

-			this._tileBg.transition = new L.Transition(this._tileBg, {duration: 0.3, easing: 'cubic-bezier(0.25,0.1,0.25,0.75)'});

-			this._tileBg.transition.on('end', this._onZoomTransitionEnd, this);

-		}

-		

-		this._stopLoadingBgTiles();

-	},

-	

-	// stops loading all tiles in the background layer

-	_stopLoadingBgTiles: function() {

-		var tiles = [].slice.call(this._tileBg.getElementsByTagName('img'));

-		

-		for (var i = 0, len = tiles.length; i < len; i++) {

-			if (!tiles[i].complete) {

-				tiles[i].src = '';

-				tiles[i].parentNode.removeChild(tiles[i]);

-			}

-		}

-	},

-	

-	_onZoomTransitionEnd: function() {

-		this._restoreTileFront();

-		

-		L.Util.falseFn(this._tileBg.offsetWidth);

-		this._resetView(this._animateToCenter, this._animateToZoom, true);

-		

-		//TODO clear tileBg on map layersload

-		

-		this._mapPane.className = this._mapPane.className.replace(' leaflet-zoom-anim', ''); //TODO toggleClass util

-		this._animatingZoom = false;

-	},

-	

-	_restoreTileFront: function() {

-		this._tilePane.innerHTML = '';

-		this._tilePane.style.visibility = '';

-		this._tilePane.style.zIndex = 2;

-		this._tileBg.style.zIndex = 1;

-	},

-	

-	_clearTileBg: function() {

-		if (!this._animatingZoom && !this.touchZoom._zooming) {

-			this._tileBg.innerHTML = '';

-		}

-	}

-});
\ No newline at end of file
diff --git a/extlib/tinymce/LICENSE.TXT b/extlib/tinymce/LICENSE.TXT
deleted file mode 100644
index 1837b0ac..00000000
--- a/extlib/tinymce/LICENSE.TXT
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/extlib/tinymce/changelog.txt b/extlib/tinymce/changelog.txt
deleted file mode 100644
index 165205b7..00000000
--- a/extlib/tinymce/changelog.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-Version 4.0.2 (2013-07-18)
-	Fixed bug where formatting using menus or toolbars wasn't possible on Opera 12.15.
-	Fixed bug where IE 8 keyboard input would break after paste using the paste plugin.
-	Fixed bug where IE 8 would throw an error when populating image size in image dialog.
-	Fixed bug where image resizing wouldn't work properly on latest IE 10.0.9 version.
-	Fixed bug where focus wasn't moved to the hovered menu button in a menubar container.
-	Fixed bug where paste would produce an extra uneeded undo level on IE and Gecko.
-	Fixed so anchors gets listed in the link dialog as they where in TinyMCE 3.x.
-	Fixed so sub, sup and strike though gets passed through when pasting from Word.
-	Fixed so Ctrl+P can be used to print the current document. Patch contributed by jashua212.
-Version 4.0.1 (2013-06-26)
-	Added new paste_as_text config option to force paste as plaintext mode.
-	Added new pastetext menu item that lets you toggle paste as plain text mode on/off.
-	Added new insertdatetime_element option to insertdatetime plugin. Enables HTML5 time element support.
-	Added new spellchecker_wordchar_pattern option to allow configuration of language specific characters.
-	Added new marker to formats menu displaying the formats used at the current selection/caret location.
-	Fixed bug where the position of the text color picker would be wrong if you switched to fullscreen.
-	Fixed bug where the link plugin would ask to add the mailto: prefix multiple times.
-	Fixed bug where list outdent operation could produce empty list elements on specific selections.
-	Fixed bug where element path wouldn't properly select parent elements on IE.
-	Fixed bug where IE would sometimes throw an exception when extrancting the current selection range.
-	Fixed bug where line feeds wasn't properly rendered in source view on IE.
-	Fixed bug where word count wouldn't be properly rendered on IE 7.
-	Fixed bug where menubuttons/listboxes would have an incorrect height on IE 7.
-	Fixed bug where browser spellchecking was enabled while editing inline on IE 10.
-	Fixed bug where spellchecker wouldn't properly find non English words.
-	Fixed bug where deactivating inline editor instances would force padding-top: 0 on page body.
-	Fixed bug where jQuery would initialize editors multiple times since it didn't check if the editor already existed.
-	Fixed bug where it wasn't possible to paste contents on IE 10 in modern UI mode when paste filtering was enabled.
-	Fixed bug where tabfocus plugin wouldn't work properly on inline editor instances.
-	Fixed bug where fullpage plugin would clear the existing HTML head if contents where inserted into the editor.
-	Fixed bug where deleting all table rows/columns in a table would cause an exception to be thrown on IE.
-	Fixed so color button panels gets toggled on/off when activated/deactivated.
-	Fixed so format menu items that can't be applied to the current selection gets disabled.
-	Fixed so the icon parameter for addButton isn't automatically filled if a button text is provided.
-	Fixed so image size fields gets updated when selecting a new image in the image dialog.
-	Fixed so it doesn't load any language pack if the language option is set to "en".
-	Fixed so ctrl+shift+z works as an alternative redo shortcut to match a common Mac OS X shortcut.
-	Fixed so it's not possible to drag/drop in images in Gecko by default when paste plugin is enabled.
-	Fixed so format menu item texts gets translated using the specified language pack.
-	Fixed so the image dialog title is the same as the insert/edit image button text.
-	Fixed so paste as plain text produces BR:s in PRE block and when forced_root_block is disabled.
-Version 4.0 (2013-06-13)
-	Added new insertdate_dateformat, insertdate_timeformat and insertdate_formats options to insertdatetime.
-	Added new font_formats, fontsize_formats and block_formats options to configure fontselect, fontsizeselect and formatselect.
-	Added new table_clone_elements option to table plugin. Enables you to specify what elements to clone when adding columns/rows.
-	Added new auto detect logic for site and email urls in link plugin to match the logic found in 3.x.
-	Added new getParams/setParams to WindowManager to make it easier to handle params to iframe based dialogs. Contributed by Ryan Demmer.
-	Added new textcolor options that enables you to specify the colors you want to display. Contributed by Jennifer Arsenault.
-	Added new external file support for link_list and image_list options. The file format is a simple JSON file.
-	Added new "both" mode for the resize option. Enables resizing in both width and height.
-	Added new paste_data_images option that allows you to enable/disable paste of data images.
-	Added new fixed_toolbar_container option that allows you to add a fixed container for the inline toolbar.
-	Fixed so font name, font size and block format select boxes gets updated with the current format.
-	Fixed so the resizeTo/resizeBy methods for the theme are exposed as it as in 3.x.
-	Fixed so the textcolor controls are splitbuttons as in 3.x. Patch contributed by toxalot/jashua212.
-	Fixed bug where the theme content css wasn't loaded into the preview dialog.
-	Fixed bug where the template description in template dialog wouldn't display the text correctly.
-	Fixed bug where various UI elements wasn't properly removed when an editor instance was removed.
-	Fixed bug where editing links in inline mode would fail on WebKit.
-	Fixed bug where the pagebreak_separator option in the pagebreak plugin wasn't working properly.
-	Fixed bug where the child panels of the float panel in inline mode wasn't properly placed.
-	Fixed bug where the float panel children of windows wasn't position fixed.
-	Fixed bug where the size of the ok button was hardcoded, caused issues with i18n.
-	Fixed bug where single comment in editor would cause exceptions due to resolve path logic not detecting elements only.
-	Fixed bug where switching alignment of tables in dialogs wouldn't properly remove existing alignments.
-	Fixed bug where the table properties dialog would show columns/rows textboxes.
-	Fixed bug where jQuery wasn't used instead of Sizzle in the jQuery version of TinyMCE.
-	Fixed bug where setting resize option to false whouldn't properly render the word count.
-	Fixed bug where table row type change would produce multiple table section elements.
-	Fixed bug where table row type change on multiple rows would add them in incorrect order.
-	Fixed bug where fullscreen plugin would maximize the editor on resize after toggling it off.
-	Fixed bug where context menu would be position at an incorrect coordinate in inline mode.
-	Fixed bug where inserting lists in inline mode on IE would produce errors since the body would be converted.
-	Fixed bug where the body couldn't be styled properly in custom content_css files.
-	Fixed bug where template plugins menu item would override the image menu item.
-	Fixed bug where IE 7-8 would render the text inside inputs at the wrong vertical location.
-	Fixed bug where IE configured to IE 7 compatibility mode wouldn't render the icons properly.
-	Fixed bug where editor.focus wouldn't properly fire the focusin event on WebKit.
-	Fixed bug where some keyboard shortcuts wouldn't work on IE 8.
-	Fixed bug where the undo state wasn't updated until the end of a typing level.
-	Fixed bug where keyboard shortcuts on Mac OS wasn't working correctly.
-	Fixed bug where empty inline elements would be created when toggling formatting of in empty block.
-	Fixed bug where applying styles on WebKit would fail in inline mode if the user released the mouse button outside the body.
-	Fixed bug where the visual aids menu item wasn't selected if the editor was empty.
-	Fixed so the isDirty/isNotDirty states gets updated to true/false on save() and change events.
-	Fixed so skins have separate CSS files for inline and iframe mode.
-	Fixed so menus and tool tips gets constrained to the current viewport.
-	Fixed so an error is thrown if users load jQuery after the jQuery version of TinyMCE.
-	Fixed so the filetype for media dialog passes out media instead of image as file type.
-	Fixed so it's possible to disable the toolbar by setting it to false.
-	Fixed so autoresize plugin isn't initialized when the editor is in inline mode.
-	Fixed so the inline editing toolbar will be rendered below elements if it doesn't fit above it.
-Version 4.0b3 (2013-05-15)
-	Added new optional advanced tab for image dialog with hspace, vspace, border and style.
-	Added new change event that gets fired when undo levels are added to editor instances.
-	Added new removed_menuitems option enables you to list menu items to remove from menus.
-	Added new external_plugins option enables you to specify external locations for plugins.
-	Added new language_url option enables you to specify an external location for the language pack.
-	Added new table toolbar control that displays a menu for inserting/editing menus.
-	Fixed bug where IE 10 wouldn't load files properly from cache.
-	Fixed bug where image dialog wouldn't properly remove width/height if blanked.
-	Fixed bug where all events wasn't properly unbound when editor instances where removed.
-	Fixed bug where data- attributes wasn't working properly in the SaxParser.
-	Fixed bug where Gecko wouldn't properly render broken images.
-	Fixed bug where Gecko wouldn't produce the same error dialog on paste as other browsers.
-	Fixed bug where is wasn't possible to prevent execCommands in beforeExecCommand event.
-	Fixed bug where the fullpage_hide_in_source_view option wasn't working in the fullpage plugin.
-	Fixed bug where the WindowManager close method wouldn't properly close the top most window.
-	Fixed bug where it wasn't possible to paste in IE 10 due to JS exception.
-	Fixed bug where tab key didn't move to the right child control in tabpanels.
-	Fixed bug where enter inside a form would focus the first button like control in TinyMCE.
-	Fixed bug where it would match scripts that looked like the tinymce base directory incorrectly.
-	Fixed bug where the spellchecker wouldn't properly toggle off the spellcheck mode if no errors where found.
-	Fixed bug in searchreplace plugin where it would remove all spans instead of the marker spans.
-	Fixed issue where selector wouldn't disable existing mode setting.
-	Fixed so it's easier to configure the menu and menubar.
-	Fixed so bodyId/bodyClass is applied to preview as it's done to the editor iframe.
-Version 4.0b2 (2013-04-24)
-	Added new rel_list option to link plugin. Enables you to specify values for a rel drop down.
-	Added new target_list option to link plugin. Enables you to add to or disable the link targets.
-	Added new link_list option to link plugin. Enables you to specify a list of links to pick from.
-	Added new image_list option to image pluigin. Enables you to specify a list of images to pick from.
-	Added new textcolor plugin. This plugin holds the text color and text background color buttons.
-	Fixed bug where alignment of images wasn't working properly on Firefox.
-	Fixed bug where IE 8 would throw error when inserting a table.
-	Fixed bug where IE 8 wouldn't render the element path properly.
-	Fixed bug where old IE versions would render a red focus border.
-	Fixed bug where old IE versions would render a frameborder for iframes.
-	Fixed bug where WebKit wouldn't properly open the cell properties dialog on edge case selection.
-	Fixed bug where charmap wouldn't correctly render all characters in grid.
-	Fixed bug where link dialog wouldn't update the link text properly.
-	Fixed bug where the focus/blur states on inline editors wasn't handled correctly on IE.
-	Fixed bug where IE would throw "unknown error" exception sometimes in ForceBlocks logic.
-	Fixed bug where IE would't properly render disabled buttons in button groups.
-	Fixed bug where tab key wouldn't properly move to next input field in dialogs.
-	Fixed bug where resize handles for tables and images would appear at wrong positions on IE 8.
-	Fixed bug where dialogs would produce stack overflow if title was wider than content.
-	Fixed bug with table cell/row menu items being enabled even if no cell was selected.
-	Fixed so the text to display is after the URL field in the link dialog.
-	Fixed so the width setting applies to the editor panel in modern theme.
-	Fixed so it's easier to make custom icons for buttons using plain old images.
-Version 4.0b1 (2013-04-11)
-	Added new node.js based build process used uglify, amdlc, jake etc.
-	Added new package.json to enable easy installation of dependent npm packages used for building.
-	Added new link, image, charmap, anchor, code, hr plugins since these are now moved out of the theme.
-	Rewrote all plugins and themes from scratch so they match the new UI framework.
-	Replaced all events to use the more common <target>.on/off(<event>) methods instead of <target>.<event>.add/remove.
-	Rewrote the TinyMCE core to use AMD style modules. Gets compiled to an inline library using amdlc.
-	Rewrote all core logic to pass jshint rules. Each file has specific jshint rules.
-	Removed all IE6 specific logic since 4.x will no longer support such an old browser.
-	Reworked the file names and directory structure of the whole project to be more similar to other JS projects.
-	Replaced tinymce.util.Cookie with tinymce.util.LocalStorage. Fallback to userData for IE 7 native localStorage for the rest.
-	Replaced the old 3.x UI with a new modern UI framework.
-	Removed "simple" theme and added new "modern" theme.
-	Removed advhr, advimage, advlink, iespell, inlinepopups, xhtmlxtras and style plugins.
-	Updated Sizzle to the latest version.
diff --git a/extlib/tinymce/js/tinymce/langs/readme.md b/extlib/tinymce/js/tinymce/langs/readme.md
deleted file mode 100644
index a52bf03f..00000000
--- a/extlib/tinymce/js/tinymce/langs/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This is where language files should be placed.
-
-Please DO NOT translate these directly use this service: https://www.transifex.com/projects/p/tinymce/
diff --git a/extlib/tinymce/js/tinymce/license.txt b/extlib/tinymce/js/tinymce/license.txt
deleted file mode 100644
index 1837b0ac..00000000
--- a/extlib/tinymce/js/tinymce/license.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/extlib/tinymce/js/tinymce/plugins/advlist/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/advlist/plugin.min.js
deleted file mode 100644
index da1cdb2b..00000000
--- a/extlib/tinymce/js/tinymce/plugins/advlist/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("advlist",function(t){function e(t,e){var n=[];return tinymce.each(e.split(/[ ,]/),function(t){n.push({text:t.replace(/\-/g," ").replace(/\b\w/g,function(t){return t.toUpperCase()}),data:"default"==t?"":t})}),n}function n(e,n){var i,r=t.dom,a=t.selection;i=r.getParent(a.getNode(),"ol,ul"),i&&i.nodeName==e&&n!==!1||t.execCommand("UL"==e?"InsertUnorderedList":"InsertOrderedList"),n=n===!1?o[e]:n,o[e]=n,i=r.getParent(a.getNode(),"ol,ul"),i&&(r.setStyle(i,"listStyleType",n),i.removeAttribute("data-mce-style")),t.focus()}function i(e){var n=t.dom.getStyle(t.dom.getParent(t.selection.getNode(),"ol,ul"),"listStyleType")||"";e.control.items().each(function(t){t.active(t.settings.data===n)})}var r,a,o={};r=e("OL",t.getParam("advlist_number_styles","default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman")),a=e("UL",t.getParam("advlist_bullet_styles","default,circle,disc,square")),t.addButton("numlist",{type:"splitbutton",tooltip:"Numbered list",menu:r,onshow:i,onselect:function(t){n("OL",t.control.settings.data)},onclick:function(){n("OL",!1)}}),t.addButton("bullist",{type:"splitbutton",tooltip:"Bullet list",menu:a,onshow:i,onselect:function(t){n("UL",t.control.settings.data)},onclick:function(){n("UL",!1)}})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/anchor/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/anchor/plugin.min.js
deleted file mode 100644
index 058e686e..00000000
--- a/extlib/tinymce/js/tinymce/plugins/anchor/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("anchor",function(n){function e(){var e=n.selection.getNode();n.windowManager.open({title:"Anchor",body:{type:"textbox",name:"name",size:40,label:"Name",value:e.name||e.id},onsubmit:function(e){n.execCommand("mceInsertContent",!1,n.dom.createHTML("a",{id:e.data.name}))}})}n.addButton("anchor",{icon:"anchor",tooltip:"Anchor",onclick:e,stateSelector:"a:not([href])"}),n.addMenuItem("anchor",{icon:"anchor",text:"Anchor",context:"insert",onclick:e})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/autolink/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/autolink/plugin.min.js
deleted file mode 100644
index 3d2f58ee..00000000
--- a/extlib/tinymce/js/tinymce/plugins/autolink/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("autolink",function(t){function e(t){o(t,-1,"(",!0)}function n(t){o(t,0,"",!0)}function i(t){o(t,-1,"",!1)}function o(t,e,n){var i,o,r,a,s,l,c,u,d;if(i=t.selection.getRng(!0).cloneRange(),i.startOffset<5){if(u=i.endContainer.previousSibling,!u){if(!i.endContainer.firstChild||!i.endContainer.firstChild.nextSibling)return;u=i.endContainer.firstChild.nextSibling}if(d=u.length,i.setStart(u,d),i.setEnd(u,d),i.endOffset<5)return;o=i.endOffset,a=u}else{if(a=i.endContainer,3!=a.nodeType&&a.firstChild){for(;3!=a.nodeType&&a.firstChild;)a=a.firstChild;3==a.nodeType&&(i.setStart(a,0),i.setEnd(a,a.nodeValue.length))}o=1==i.endOffset?2:i.endOffset-1-e}r=o;do i.setStart(a,o>=2?o-2:0),i.setEnd(a,o>=1?o-1:0),o-=1;while(" "!=i.toString()&&""!==i.toString()&&160!=i.toString().charCodeAt(0)&&o-2>=0&&i.toString()!=n);if(i.toString()==n||160==i.toString().charCodeAt(0)?(i.setStart(a,o),i.setEnd(a,r),o+=1):0===i.startOffset?(i.setStart(a,0),i.setEnd(a,r)):(i.setStart(a,o),i.setEnd(a,r)),l=i.toString(),"."==l.charAt(l.length-1)&&i.setEnd(a,r-1),l=i.toString(),c=l.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+\-]+@)(.+)$/i),c&&("www."==c[1]?c[1]="http://www.":/@$/.test(c[1])&&!/^mailto:/.test(c[1])&&(c[1]="mailto:"+c[1]),s=t.selection.getBookmark(),t.selection.setRng(i),t.execCommand("createlink",!1,c[1]+c[2]),t.selection.moveToBookmark(s),t.nodeChanged(),tinymce.Env.webkit)){t.selection.collapse(!1);var m=Math.min(a.length,r+1);i.setStart(a,m),i.setEnd(a,m),t.selection.setRng(i)}}t.on("keydown",function(e){return 13==e.keyCode?i(t):void 0}),tinymce.Env.ie||(t.on("keypress",function(n){return 41==n.which?e(t):void 0}),t.on("keyup",function(e){return 32==e.keyCode?n(t):void 0}))});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/autoresize/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/autoresize/plugin.min.js
deleted file mode 100644
index 12355aa9..00000000
--- a/extlib/tinymce/js/tinymce/plugins/autoresize/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("autoresize",function(e){function t(a){var r,o,c=e.getDoc(),s=c.body,u=c.documentElement,l=tinymce.DOM,m=n.autoresize_min_height;"setcontent"==a.type&&a.initial||e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen()||(o=tinymce.Env.ie?s.scrollHeight:tinymce.Env.webkit&&0===s.clientHeight?0:s.offsetHeight,o>n.autoresize_min_height&&(m=o),n.autoresize_max_height&&o>n.autoresize_max_height?(m=n.autoresize_max_height,s.style.overflowY="auto",u.style.overflowY="auto"):(s.style.overflowY="hidden",u.style.overflowY="hidden",s.scrollTop=0),m!==i&&(r=m-i,l.setStyle(l.get(e.id+"_ifr"),"height",m+"px"),i=m,tinymce.isWebKit&&0>r&&t(a)))}var n=e.settings,i=0;e.settings.inline||(n.autoresize_min_height=parseInt(e.getParam("autoresize_min_height",e.getElement().offsetHeight),10),n.autoresize_max_height=parseInt(e.getParam("autoresize_max_height",0),10),e.on("init",function(){e.dom.setStyle(e.getBody(),"paddingBottom",e.getParam("autoresize_bottom_margin",50)+"px")}),e.on("change setcontent paste keyup",t),e.getParam("autoresize_on_init",!0)&&e.on("load",t),e.addCommand("mceAutoResize",t))});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/autosave/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/autosave/plugin.min.js
deleted file mode 100644
index 31a46d7f..00000000
--- a/extlib/tinymce/js/tinymce/plugins/autosave/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("autosave",function(t){function e(t,e){var n={s:1e3,m:6e4};return t=/^(\d+)([ms]?)$/.exec(""+(t||e)),(t[2]?n[t[2]]:1)*parseInt(t,10)}function n(){var t=parseInt(m.getItem(f+"autosave.time"),10)||0;return(new Date).getTime()-t>d.autosave_retention?(i(),!1):!0}function i(){m.removeItem(f+"autosave.draft"),m.removeItem(f+"autosave.time")}function a(){c&&t.isDirty()&&(m.setItem(f+"autosave.draft",t.getContent({format:"raw",no_events:!0})),m.setItem(f+"autosave.time",(new Date).getTime()),t.fire("StoreDraft"))}function r(){n()&&(t.setContent(m.getItem(f+"autosave.draft"),{format:"raw"}),i(),t.fire("RestoreDraft"))}function o(){c||(setInterval(function(){t.removed||a()},d.autosave_interval),c=!0)}function s(){var e=this;e.disabled(!n()),t.on("StoreDraft RestoreDraft",function(){e.disabled(!n())}),o()}function l(){t.undoManager.beforeChange(),r(),t.undoManager.add()}function u(){var t;return tinymce.each(tinymce.editors,function(e){e.plugins.autosave&&e.plugins.autosave.storeDraft(),!t&&e.isDirty()&&e.getParam("autosave_ask_before_unload",!0)&&(t=e.translate("You have unsaved changes are you sure you want to navigate away?"))}),t}var c,d=t.settings,m=tinymce.util.LocalStorage,f=t.id;d.autosave_interval=e(d.autosave_interval,"30s"),d.autosave_retention=e(d.autosave_retention,"20m"),t.addButton("restoredraft",{title:"Restore last draft",onclick:l,onPostRender:s}),t.addMenuItem("restoredraft",{text:"Restore last draft",onclick:l,onPostRender:s,context:"file"}),this.storeDraft=a,window.onbeforeunload=u});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/bbcode/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/bbcode/plugin.min.js
deleted file mode 100644
index 70a88a7d..00000000
--- a/extlib/tinymce/js/tinymce/plugins/bbcode/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e){var t=this,n=e.getParam("bbcode_dialect","punbb").toLowerCase();e.on("beforeSetContent",function(e){e.content=t["_"+n+"_bbcode2html"](e.content)}),e.on("postProcess",function(e){e.set&&(e.content=t["_"+n+"_bbcode2html"](e.content)),e.get&&(e.content=t["_"+n+"_html2bbcode"](e.content))})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://www.tinymce.com",infourl:"http://www.tinymce.com/wiki.php/Plugin:bbcode"}},_punbb_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}return e=tinymce.trim(e),t(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]"),t(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"),t(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"),t(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"),t(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"),t(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]"),t(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]"),t(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]"),t(/<font>(.*?)<\/font>/gi,"$1"),t(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]"),t(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]"),t(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]"),t(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]"),t(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]"),t(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]"),t(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]"),t(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]"),t(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]"),t(/<\/(strong|b)>/gi,"[/b]"),t(/<(strong|b)>/gi,"[b]"),t(/<\/(em|i)>/gi,"[/i]"),t(/<(em|i)>/gi,"[i]"),t(/<\/u>/gi,"[/u]"),t(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]"),t(/<u>/gi,"[u]"),t(/<blockquote[^>]*>/gi,"[quote]"),t(/<\/blockquote>/gi,"[/quote]"),t(/<br \/>/gi,"\n"),t(/<br\/>/gi,"\n"),t(/<br>/gi,"\n"),t(/<p>/gi,""),t(/<\/p>/gi,"\n"),t(/&nbsp;|\u00a0/gi," "),t(/&quot;/gi,'"'),t(/&lt;/gi,"<"),t(/&gt;/gi,">"),t(/&amp;/gi,"&"),e},_punbb_bbcode2html:function(e){function t(t,n){e=e.replace(t,n)}return e=tinymce.trim(e),t(/\n/gi,"<br />"),t(/\[b\]/gi,"<strong>"),t(/\[\/b\]/gi,"</strong>"),t(/\[i\]/gi,"<em>"),t(/\[\/i\]/gi,"</em>"),t(/\[u\]/gi,"<u>"),t(/\[\/u\]/gi,"</u>"),t(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>'),t(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>'),t(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />'),t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>'),t(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;'),t(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;'),e}}),tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)}();
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/charmap/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/charmap/plugin.min.js
deleted file mode 100644
index dff18e6e..00000000
--- a/extlib/tinymce/js/tinymce/plugins/charmap/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("charmap",function(e){function t(){function t(e){for(;e;){if("TD"==e.nodeName)return e;e=e.parentNode}}var i,a,r,o;i='<table role="presentation" cellspacing="0" class="mce-charmap"><tbody>';var s=25;for(r=0;10>r;r++){for(i+="<tr>",a=0;s>a;a++){var l=n[r*s+a],c="g"+(r*s+a);i+='<td title="'+l[1]+'"><div id="'+c+'" tabIndex="-1">'+(l?String.fromCharCode(parseInt(l[0],10)):"&nbsp;")+"</div></td>"}i+="</tr>"}i+="</tbody></table>";var u={type:"container",html:i,onclick:function(t){var n=t.target;"DIV"==n.nodeName&&e.execCommand("mceInsertContent",!1,n.firstChild.nodeValue)},onmouseover:function(e){var n=t(e.target);n&&o.find("#preview").text(n.firstChild.firstChild.data)}};o=e.windowManager.open({title:"Special character",spacing:10,padding:10,items:[u,{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:100,minHeight:80}],buttons:[{text:"Close",onclick:function(){o.close()}}]})}var n=[["160","no-break space"],["38","ampersand"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"],["173","soft hyphen"]];e.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:t}),e.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:t,context:"insert"})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/code/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/code/plugin.min.js
deleted file mode 100644
index 30736376..00000000
--- a/extlib/tinymce/js/tinymce/plugins/code/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("code",function(e){function t(){e.windowManager.open({title:"Source code",body:{type:"textbox",name:"code",multiline:!0,minWidth:600,minHeight:500,value:e.getContent({source_view:!0}),spellcheck:!1},onSubmit:function(t){e.setContent(t.data.code)}})}e.addButton("code",{icon:"code",tooltip:"Source code",onclick:t}),e.addMenuItem("code",{icon:"code",text:"Source code",context:"tools",onclick:t})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/compat3x/editable_selects.js b/extlib/tinymce/js/tinymce/plugins/compat3x/editable_selects.js
deleted file mode 100644
index 8d30787d..00000000
--- a/extlib/tinymce/js/tinymce/plugins/compat3x/editable_selects.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * editable_selects.js
- *
- * Copyright, Moxiecode Systems AB
- * Released under LGPL License.
- *
- * License: http://www.tinymce.com/license
- * Contributing: http://www.tinymce.com/contributing
- */
-
-var TinyMCE_EditableSelects = {
-	editSelectElm : null,
-
-	init : function() {
-		var nl = document.getElementsByTagName("select"), i, d = document, o;
-
-		for (i=0; i<nl.length; i++) {
-			if (nl[i].className.indexOf('mceEditableSelect') != -1) {
-				o = new Option(tinyMCEPopup.editor.translate('value'), '__mce_add_custom__');
-
-				o.className = 'mceAddSelectValue';
-
-				nl[i].options[nl[i].options.length] = o;
-				nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;
-			}
-		}
-	},
-
-	onChangeEditableSelect : function(e) {
-		var d = document, ne, se = window.event ? window.event.srcElement : e.target;
-
-		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
-			ne = d.createElement("input");
-			ne.id = se.id + "_custom";
-			ne.name = se.name + "_custom";
-			ne.type = "text";
-
-			ne.style.width = se.offsetWidth + 'px';
-			se.parentNode.insertBefore(ne, se);
-			se.style.display = 'none';
-			ne.focus();
-			ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
-			ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;
-			TinyMCE_EditableSelects.editSelectElm = se;
-		}
-	},
-
-	onBlurEditableSelectInput : function() {
-		var se = TinyMCE_EditableSelects.editSelectElm;
-
-		if (se) {
-			if (se.previousSibling.value != '') {
-				addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
-				selectByValue(document.forms[0], se.id, se.previousSibling.value);
-			} else
-				selectByValue(document.forms[0], se.id, '');
-
-			se.style.display = 'inline';
-			se.parentNode.removeChild(se.previousSibling);
-			TinyMCE_EditableSelects.editSelectElm = null;
-		}
-	},
-
-	onKeyDown : function(e) {
-		e = e || window.event;
-
-		if (e.keyCode == 13)
-			TinyMCE_EditableSelects.onBlurEditableSelectInput();
-	}
-};
diff --git a/extlib/tinymce/js/tinymce/plugins/compat3x/form_utils.js b/extlib/tinymce/js/tinymce/plugins/compat3x/form_utils.js
deleted file mode 100644
index 69d338fc..00000000
--- a/extlib/tinymce/js/tinymce/plugins/compat3x/form_utils.js
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * form_utils.js
- *
- * Copyright, Moxiecode Systems AB
- * Released under LGPL License.
- *
- * License: http://www.tinymce.com/license
- * Contributing: http://www.tinymce.com/contributing
- */
-
-var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
-
-function getColorPickerHTML(id, target_form_element) {
-	var h = "", dom = tinyMCEPopup.dom;
-
-	if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
-		label.id = label.id || dom.uniqueId();
-	}
-
-	h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
-	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';
-
-	return h;
-}
-
-function updateColor(img_id, form_element_id) {
-	document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;
-}
-
-function setBrowserDisabled(id, state) {
-	var img = document.getElementById(id);
-	var lnk = document.getElementById(id + "_link");
-
-	if (lnk) {
-		if (state) {
-			lnk.setAttribute("realhref", lnk.getAttribute("href"));
-			lnk.removeAttribute("href");
-			tinyMCEPopup.dom.addClass(img, 'disabled');
-		} else {
-			if (lnk.getAttribute("realhref"))
-				lnk.setAttribute("href", lnk.getAttribute("realhref"));
-
-			tinyMCEPopup.dom.removeClass(img, 'disabled');
-		}
-	}
-}
-
-function getBrowserHTML(id, target_form_element, type, prefix) {
-	var option = prefix + "_" + type + "_browser_callback", cb, html;
-
-	cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));
-
-	if (!cb)
-		return "";
-
-	html = "";
-	html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
-	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
-
-	return html;
-}
-
-function openBrowser(img_id, target_form_element, type, option) {
-	var img = document.getElementById(img_id);
-
-	if (img.className != "mceButtonDisabled")
-		tinyMCEPopup.openBrowser(target_form_element, type, option);
-}
-
-function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
-	if (!form_obj || !form_obj.elements[field_name])
-		return;
-
-	if (!value)
-		value = "";
-
-	var sel = form_obj.elements[field_name];
-
-	var found = false;
-	for (var i=0; i<sel.options.length; i++) {
-		var option = sel.options[i];
-
-		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
-			option.selected = true;
-			found = true;
-		} else
-			option.selected = false;
-	}
-
-	if (!found && add_custom && value != '') {
-		var option = new Option(value, value);
-		option.selected = true;
-		sel.options[sel.options.length] = option;
-		sel.selectedIndex = sel.options.length - 1;
-	}
-
-	return found;
-}
-
-function getSelectValue(form_obj, field_name) {
-	var elm = form_obj.elements[field_name];
-
-	if (elm == null || elm.options == null || elm.selectedIndex === -1)
-		return "";
-
-	return elm.options[elm.selectedIndex].value;
-}
-
-function addSelectValue(form_obj, field_name, name, value) {
-	var s = form_obj.elements[field_name];
-	var o = new Option(name, value);
-	s.options[s.options.length] = o;
-}
-
-function addClassesToList(list_id, specific_option) {
-	// Setup class droplist
-	var styleSelectElm = document.getElementById(list_id);
-	var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);
-	styles = tinyMCEPopup.getParam(specific_option, styles);
-
-	if (styles) {
-		var stylesAr = styles.split(';');
-
-		for (var i=0; i<stylesAr.length; i++) {
-			if (stylesAr != "") {
-				var key, value;
-
-				key = stylesAr[i].split('=')[0];
-				value = stylesAr[i].split('=')[1];
-
-				styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
-			}
-		}
-	} else {
-		tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {
-			styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);
-		});
-	}
-}
-
-function isVisible(element_id) {
-	var elm = document.getElementById(element_id);
-
-	return elm && elm.style.display != "none";
-}
-
-function convertRGBToHex(col) {
-	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
-
-	var rgb = col.replace(re, "$1,$2,$3").split(',');
-	if (rgb.length == 3) {
-		r = parseInt(rgb[0]).toString(16);
-		g = parseInt(rgb[1]).toString(16);
-		b = parseInt(rgb[2]).toString(16);
-
-		r = r.length == 1 ? '0' + r : r;
-		g = g.length == 1 ? '0' + g : g;
-		b = b.length == 1 ? '0' + b : b;
-
-		return "#" + r + g + b;
-	}
-
-	return col;
-}
-
-function convertHexToRGB(col) {
-	if (col.indexOf('#') != -1) {
-		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
-
-		r = parseInt(col.substring(0, 2), 16);
-		g = parseInt(col.substring(2, 4), 16);
-		b = parseInt(col.substring(4, 6), 16);
-
-		return "rgb(" + r + "," + g + "," + b + ")";
-	}
-
-	return col;
-}
-
-function trimSize(size) {
-	return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
-}
-
-function getCSSSize(size) {
-	size = trimSize(size);
-
-	if (size == "")
-		return "";
-
-	// Add px
-	if (/^[0-9]+$/.test(size))
-		size += 'px';
-	// Sanity check, IE doesn't like broken values
-	else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))
-		return "";
-
-	return size;
-}
-
-function getStyle(elm, attrib, style) {
-	var val = tinyMCEPopup.dom.getAttrib(elm, attrib);
-
-	if (val != '')
-		return '' + val;
-
-	if (typeof(style) == 'undefined')
-		style = attrib;
-
-	return tinyMCEPopup.dom.getStyle(elm, style);
-}
diff --git a/extlib/tinymce/js/tinymce/plugins/compat3x/mctabs.js b/extlib/tinymce/js/tinymce/plugins/compat3x/mctabs.js
deleted file mode 100644
index acb5657e..00000000
--- a/extlib/tinymce/js/tinymce/plugins/compat3x/mctabs.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * mctabs.js
- *
- * Copyright, Moxiecode Systems AB
- * Released under LGPL License.
- *
- * License: http://www.tinymce.com/license
- * Contributing: http://www.tinymce.com/contributing
- */
-
-function MCTabs() {
-	this.settings = [];
-	this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
-};
-
-MCTabs.prototype.init = function(settings) {
-	this.settings = settings;
-};
-
-MCTabs.prototype.getParam = function(name, default_value) {
-	var value = null;
-
-	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
-
-	// Fix bool values
-	if (value == "true" || value == "false")
-		return (value == "true");
-
-	return value;
-};
-
-MCTabs.prototype.showTab =function(tab){
-	tab.className = 'current';
-	tab.setAttribute("aria-selected", true);
-	tab.setAttribute("aria-expanded", true);
-	tab.tabIndex = 0;
-};
-
-MCTabs.prototype.hideTab =function(tab){
-	var t=this;
-
-	tab.className = '';
-	tab.setAttribute("aria-selected", false);
-	tab.setAttribute("aria-expanded", false);
-	tab.tabIndex = -1;
-};
-
-MCTabs.prototype.showPanel = function(panel) {
-	panel.className = 'current'; 
-	panel.setAttribute("aria-hidden", false);
-};
-
-MCTabs.prototype.hidePanel = function(panel) {
-	panel.className = 'panel';
-	panel.setAttribute("aria-hidden", true);
-}; 
-
-MCTabs.prototype.getPanelForTab = function(tabElm) {
-	return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
-};
-
-MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {
-	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;
-
-	tabElm = document.getElementById(tab_id);
-
-	if (panel_id === undefined) {
-		panel_id = t.getPanelForTab(tabElm);
-	}
-
-	panelElm= document.getElementById(panel_id);
-	panelContainerElm = panelElm ? panelElm.parentNode : null;
-	tabContainerElm = tabElm ? tabElm.parentNode : null;
-	selectionClass = t.getParam('selection_class', 'current');
-
-	if (tabElm && tabContainerElm) {
-		nodes = tabContainerElm.childNodes;
-
-		// Hide all other tabs
-		for (i = 0; i < nodes.length; i++) {
-			if (nodes[i].nodeName == "LI") {
-				t.hideTab(nodes[i]);
-			}
-		}
-
-		// Show selected tab
-		t.showTab(tabElm);
-	}
-
-	if (panelElm && panelContainerElm) {
-		nodes = panelContainerElm.childNodes;
-
-		// Hide all other panels
-		for (i = 0; i < nodes.length; i++) {
-			if (nodes[i].nodeName == "DIV")
-				t.hidePanel(nodes[i]);
-		}
-
-		if (!avoid_focus) { 
-			tabElm.focus();
-		}
-
-		// Show selected panel
-		t.showPanel(panelElm);
-	}
-};
-
-MCTabs.prototype.getAnchor = function() {
-	var pos, url = document.location.href;
-
-	if ((pos = url.lastIndexOf('#')) != -1)
-		return url.substring(pos + 1);
-
-	return "";
-};
-
-
-//Global instance
-var mcTabs = new MCTabs();
-
-tinyMCEPopup.onInit.add(function() {
-	var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;
-
-	each(dom.select('div.tabs'), function(tabContainerElm) {
-		var keyNav;
-
-		dom.setAttrib(tabContainerElm, "role", "tablist"); 
-
-		var items = tinyMCEPopup.dom.select('li', tabContainerElm);
-		var action = function(id) {
-			mcTabs.displayTab(id, mcTabs.getPanelForTab(id));
-			mcTabs.onChange.dispatch(id);
-		};
-
-		each(items, function(item) {
-			dom.setAttrib(item, 'role', 'tab');
-			dom.bind(item, 'click', function(evt) {
-				action(item.id);
-			});
-		});
-
-		dom.bind(dom.getRoot(), 'keydown', function(evt) {
-			if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab
-				keyNav.moveFocus(evt.shiftKey ? -1 : 1);
-				tinymce.dom.Event.cancel(evt);
-			}
-		});
-
-		each(dom.select('a', tabContainerElm), function(a) {
-			dom.setAttrib(a, 'tabindex', '-1');
-		});
-
-		keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
-			root: tabContainerElm,
-			items: items,
-			onAction: action,
-			actOnFocus: true,
-			enableLeftRight: true,
-			enableUpDown: true
-		}, tinyMCEPopup.dom);
-	});
-});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/compat3x/tiny_mce_popup.js b/extlib/tinymce/js/tinymce/plugins/compat3x/tiny_mce_popup.js
deleted file mode 100644
index 6ed0d5e9..00000000
--- a/extlib/tinymce/js/tinymce/plugins/compat3x/tiny_mce_popup.js
+++ /dev/null
@@ -1,435 +0,0 @@
-/**
- * Popup.js
- *
- * Copyright, Moxiecode Systems AB
- * Released under LGPL License.
- *
- * License: http://www.tinymce.com/license
- * Contributing: http://www.tinymce.com/contributing
- */
-
-// Some global instances
-var tinymce = null, tinyMCEPopup, tinyMCE;
-
-/**
- * TinyMCE popup/dialog helper class. This gives you easy access to the
- * parent editor instance and a bunch of other things. It's higly recommended
- * that you load this script into your dialogs.
- *
- * @static
- * @class tinyMCEPopup
- */
-tinyMCEPopup = {
-	/**
-	 * Initializes the popup this will be called automatically.
-	 *
-	 * @method init
-	 */
-	init : function() {
-		var t = this, w, ti, settings;
-
-		// Find window & API
-		w = t.getWin();
-		tinymce = w.tinymce;
-		tinyMCE = w.tinyMCE;
-		t.editor = tinymce.EditorManager.activeEditor;
-		t.params = t.editor.windowManager.params;
-		t.features = t.editor.windowManager.features;
-		settings = t.editor.settings;
-
-		// Setup popup CSS path(s)
-		if (settings.popup_css !== false) {
-			if (settings.popup_css) {
-				settings.popup_css = t.documentBaseURI.toAbsolute(settings.popup_css);
-			} else {
-				settings.popup_css = t.baseURI.toAbsolute("themes/" + settings.theme + "/skins/" + settings.skin + "/dialog.css");
-			}
-		}
-
-		if (settings.popup_css_add) {
-			settings.popup_css += ',' + t.documentBaseURI.toAbsolute(settings.popup_css_add);
-		}
-
-		// Setup local DOM
-		t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document, {ownEvents: true, proxy: tinyMCEPopup._eventProxy});
-		t.dom.bind(window, 'ready', t._onDOMLoaded, t);
-
-		// Enables you to skip loading the default css
-		if (t.features.popup_css !== false)
-			t.dom.loadCSS(t.features.popup_css || t.editor.settings.popup_css);
-
-		// Setup on init listeners
-		t.listeners = [];
-
-		/**
-		 * Fires when the popup is initialized.
-		 *
-		 * @event onInit
-		 * @param {tinymce.Editor} editor Editor instance.
-		 * @example
-		 * // Alerts the selected contents when the dialog is loaded
-		 * tinyMCEPopup.onInit.add(function(ed) {
-		 *     alert(ed.selection.getContent());
-		 * });
-		 * 
-		 * // Executes the init method on page load in some object using the SomeObject scope
-		 * tinyMCEPopup.onInit.add(SomeObject.init, SomeObject);
-		 */
-		t.onInit = {
-			add : function(f, s) {
-				t.listeners.push({func : f, scope : s});
-			}
-		};
-
-		t.isWindow = !t.getWindowArg('mce_inline');
-		t.id = t.getWindowArg('mce_window_id');
-	},
-
-	/**
-	 * Returns the reference to the parent window that opened the dialog.
-	 *
-	 * @method getWin
-	 * @return {Window} Reference to the parent window that opened the dialog.
-	 */
-	getWin : function() {
-		// Added frameElement check to fix bug: #2817583
-		return (!window.frameElement && window.dialogArguments) || opener || parent || top;
-	},
-
-	/**
-	 * Returns a window argument/parameter by name.
-	 *
-	 * @method getWindowArg
-	 * @param {String} n Name of the window argument to retrive.
-	 * @param {String} dv Optional default value to return.
-	 * @return {String} Argument value or default value if it wasn't found.
-	 */
-	getWindowArg : function(n, dv) {
-		var v = this.params[n];
-
-		return tinymce.is(v) ? v : dv;
-	},
-
-	/**
-	 * Returns a editor parameter/config option value.
-	 *
-	 * @method getParam
-	 * @param {String} n Name of the editor config option to retrive.
-	 * @param {String} dv Optional default value to return.
-	 * @return {String} Parameter value or default value if it wasn't found.
-	 */
-	getParam : function(n, dv) {
-		return this.editor.getParam(n, dv);
-	},
-
-	/**
-	 * Returns a language item by key.
-	 *
-	 * @method getLang
-	 * @param {String} n Language item like mydialog.something.
-	 * @param {String} dv Optional default value to return.
-	 * @return {String} Language value for the item like "my string" or the default value if it wasn't found.
-	 */
-	getLang : function(n, dv) {
-		return this.editor.getLang(n, dv);
-	},
-
-	/**
-	 * Executed a command on editor that opened the dialog/popup.
-	 *
-	 * @method execCommand
-	 * @param {String} cmd Command to execute.
-	 * @param {Boolean} ui Optional boolean value if the UI for the command should be presented or not.
-	 * @param {Object} val Optional value to pass with the comman like an URL.
-	 * @param {Object} a Optional arguments object.
-	 */
-	execCommand : function(cmd, ui, val, a) {
-		a = a || {};
-		a.skip_focus = 1;
-
-		this.restoreSelection();
-		return this.editor.execCommand(cmd, ui, val, a);
-	},
-
-	/**
-	 * Resizes the dialog to the inner size of the window. This is needed since various browsers
-	 * have different border sizes on windows.
-	 *
-	 * @method resizeToInnerSize
-	 */
-	resizeToInnerSize : function() {
-		var t = this;
-
-		// Detach it to workaround a Chrome specific bug
-		// https://sourceforge.net/tracker/?func=detail&atid=635682&aid=2926339&group_id=103281
-		setTimeout(function() {
-			var vp = t.dom.getViewPort(window);
-
-			t.editor.windowManager.resizeBy(
-				t.getWindowArg('mce_width') - vp.w,
-				t.getWindowArg('mce_height') - vp.h,
-				t.id || window
-			);
-		}, 10);
-	},
-
-	/**
-	 * Will executed the specified string when the page has been loaded. This function
-	 * was added for compatibility with the 2.x branch.
-	 *
-	 * @method executeOnLoad
-	 * @param {String} s String to evalutate on init.
-	 */
-	executeOnLoad : function(s) {
-		this.onInit.add(function() {
-			eval(s);
-		});
-	},
-
-	/**
-	 * Stores the current editor selection for later restoration. This can be useful since some browsers
-	 * looses it's selection if a control element is selected/focused inside the dialogs.
-	 *
-	 * @method storeSelection
-	 */
-	storeSelection : function() {
-		this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark(1);
-	},
-
-	/**
-	 * Restores any stored selection. This can be useful since some browsers
-	 * looses it's selection if a control element is selected/focused inside the dialogs.
-	 *
-	 * @method restoreSelection
-	 */
-	restoreSelection : function() {
-		var t = tinyMCEPopup;
-
-		if (!t.isWindow && tinymce.isIE)
-			t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
-	},
-
-	/**
-	 * Loads a specific dialog language pack. If you pass in plugin_url as a argument
-	 * when you open the window it will load the <plugin url>/langs/<code>_dlg.js lang pack file.
-	 *
-	 * @method requireLangPack
-	 */
-	requireLangPack : function() {
-		var t = this, u = t.getWindowArg('plugin_url') || t.getWindowArg('theme_url');
-
-		if (u && t.editor.settings.language && t.features.translate_i18n !== false && t.editor.settings.language_load !== false) {
-			u += '/langs/' + t.editor.settings.language + '_dlg.js';
-
-			if (!tinymce.ScriptLoader.isDone(u)) {
-				document.write('<script type="text/javascript" src="' + u + '"></script>');
-				tinymce.ScriptLoader.markDone(u);
-			}
-		}
-	},
-
-	/**
-	 * Executes a color picker on the specified element id. When the user
-	 * then selects a color it will be set as the value of the specified element.
-	 *
-	 * @method pickColor
-	 * @param {DOMEvent} e DOM event object.
-	 * @param {string} element_id Element id to be filled with the color value from the picker.
-	 */
-	pickColor : function(e, element_id) {
-		this.execCommand('mceColorPicker', true, {
-			color : document.getElementById(element_id).value,
-			func : function(c) {
-				document.getElementById(element_id).value = c;
-
-				try {
-					document.getElementById(element_id).onchange();
-				} catch (ex) {
-					// Try fire event, ignore errors
-				}
-			}
-		});
-	},
-
-	/**
-	 * Opens a filebrowser/imagebrowser this will set the output value from
-	 * the browser as a value on the specified element.
-	 *
-	 * @method openBrowser
-	 * @param {string} element_id Id of the element to set value in.
-	 * @param {string} type Type of browser to open image/file/flash.
-	 * @param {string} option Option name to get the file_broswer_callback function name from.
-	 */
-	openBrowser : function(element_id, type, option) {
-		tinyMCEPopup.restoreSelection();
-		this.editor.execCallback('file_browser_callback', element_id, document.getElementById(element_id).value, type, window);
-	},
-
-	/**
-	 * Creates a confirm dialog. Please don't use the blocking behavior of this
-	 * native version use the callback method instead then it can be extended.
-	 *
-	 * @method confirm
-	 * @param {String} t Title for the new confirm dialog.
-	 * @param {function} cb Callback function to be executed after the user has selected ok or cancel.
-	 * @param {Object} s Optional scope to execute the callback in.
-	 */
-	confirm : function(t, cb, s) {
-		this.editor.windowManager.confirm(t, cb, s, window);
-	},
-
-	/**
-	 * Creates a alert dialog. Please don't use the blocking behavior of this
-	 * native version use the callback method instead then it can be extended.
-	 *
-	 * @method alert
-	 * @param {String} t Title for the new alert dialog.
-	 * @param {function} cb Callback function to be executed after the user has selected ok.
-	 * @param {Object} s Optional scope to execute the callback in.
-	 */
-	alert : function(tx, cb, s) {
-		this.editor.windowManager.alert(tx, cb, s, window);
-	},
-
-	/**
-	 * Closes the current window.
-	 *
-	 * @method close
-	 */
-	close : function() {
-		var t = this;
-
-		// To avoid domain relaxing issue in Opera
-		function close() {
-			t.editor.windowManager.close(window);
-			tinymce = tinyMCE = t.editor = t.params = t.dom = t.dom.doc = null; // Cleanup
-		};
-
-		if (tinymce.isOpera)
-			t.getWin().setTimeout(close, 0);
-		else
-			close();
-	},
-
-	// Internal functions	
-
-	_restoreSelection : function() {
-		var e = window.event.srcElement;
-
-		if (e.nodeName == 'INPUT' && (e.type == 'submit' || e.type == 'button'))
-			tinyMCEPopup.restoreSelection();
-	},
-
-/*	_restoreSelection : function() {
-		var e = window.event.srcElement;
-
-		// If user focus a non text input or textarea
-		if ((e.nodeName != 'INPUT' && e.nodeName != 'TEXTAREA') || e.type != 'text')
-			tinyMCEPopup.restoreSelection();
-	},*/
-
-	_onDOMLoaded : function() {
-		var t = tinyMCEPopup, ti = document.title, bm, h, nv;
-
-		// Translate page
-		if (t.features.translate_i18n !== false) {
-			h = document.body.innerHTML;
-
-			// Replace a=x with a="x" in IE
-			if (tinymce.isIE)
-				h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"')
-
-			document.dir = t.editor.getParam('directionality','');
-
-			if ((nv = t.editor.translate(h)) && nv != h)
-				document.body.innerHTML = nv;
-
-			if ((nv = t.editor.translate(ti)) && nv != ti)
-				document.title = ti = nv;
-		}
-
-		if (!t.editor.getParam('browser_preferred_colors', false) || !t.isWindow)
-			t.dom.addClass(document.body, 'forceColors');
-
-		document.body.style.display = '';
-
-		// Restore selection in IE when focus is placed on a non textarea or input element of the type text
-		if (tinymce.isIE) {
-			document.attachEvent('onmouseup', tinyMCEPopup._restoreSelection);
-
-			// Add base target element for it since it would fail with modal dialogs
-			t.dom.add(t.dom.select('head')[0], 'base', {target : '_self'});
-		}
-
-		t.restoreSelection();
-		t.resizeToInnerSize();
-
-		// Set inline title
-		if (!t.isWindow)
-			t.editor.windowManager.setTitle(window, ti);
-		else
-			window.focus();
-
-		if (!tinymce.isIE && !t.isWindow) {
-			t.dom.bind(document, 'focus', function() {
-				t.editor.windowManager.focus(t.id);
-			});
-		}
-
-		// Patch for accessibility
-		tinymce.each(t.dom.select('select'), function(e) {
-			e.onkeydown = tinyMCEPopup._accessHandler;
-		});
-
-		// Call onInit
-		// Init must be called before focus so the selection won't get lost by the focus call
-		tinymce.each(t.listeners, function(o) {
-			o.func.call(o.scope, t.editor);
-		});
-
-		// Move focus to window
-		if (t.getWindowArg('mce_auto_focus', true)) {
-			window.focus();
-
-			// Focus element with mceFocus class
-			tinymce.each(document.forms, function(f) {
-				tinymce.each(f.elements, function(e) {
-					if (t.dom.hasClass(e, 'mceFocus') && !e.disabled) {
-						e.focus();
-						return false; // Break loop
-					}
-				});
-			});
-		}
-
-		document.onkeyup = tinyMCEPopup._closeWinKeyHandler;
-	},
-
-	_accessHandler : function(e) {
-		e = e || window.event;
-
-		if (e.keyCode == 13 || e.keyCode == 32) {
-			var elm = e.target || e.srcElement;
-
-			if (elm.onchange)
-				elm.onchange();
-
-			return tinymce.dom.Event.cancel(e);
-		}
-	},
-
-	_closeWinKeyHandler : function(e) {
-		e = e || window.event;
-
-		if (e.keyCode == 27)
-			tinyMCEPopup.close();
-	},
-
-	_eventProxy: function(id) {
-		return function(evt) {
-			tinyMCEPopup.dom.events.callNativeHandler(id, evt);
-		};
-	}
-};
-
-tinyMCEPopup.init();
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/compat3x/validate.js b/extlib/tinymce/js/tinymce/plugins/compat3x/validate.js
deleted file mode 100644
index d13aaa1b..00000000
--- a/extlib/tinymce/js/tinymce/plugins/compat3x/validate.js
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- * validate.js
- *
- * Copyright, Moxiecode Systems AB
- * Released under LGPL License.
- *
- * License: http://www.tinymce.com/license
- * Contributing: http://www.tinymce.com/contributing
- */
-
-/**
-	// String validation:
-
-	if (!Validator.isEmail('myemail'))
-		alert('Invalid email.');
-
-	// Form validation:
-
-	var f = document.forms['myform'];
-
-	if (!Validator.isEmail(f.myemail))
-		alert('Invalid email.');
-*/
-
-var Validator = {
-	isEmail : function(s) {
-		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
-	},
-
-	isAbsUrl : function(s) {
-		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');
-	},
-
-	isSize : function(s) {
-		return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
-	},
-
-	isId : function(s) {
-		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');
-	},
-
-	isEmpty : function(s) {
-		var nl, i;
-
-		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)
-			return true;
-
-		if (s.type == 'checkbox' && !s.checked)
-			return true;
-
-		if (s.type == 'radio') {
-			for (i=0, nl = s.form.elements; i<nl.length; i++) {
-				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)
-					return false;
-			}
-
-			return true;
-		}
-
-		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);
-	},
-
-	isNumber : function(s, d) {
-		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));
-	},
-
-	test : function(s, p) {
-		s = s.nodeType == 1 ? s.value : s;
-
-		return s == '' || new RegExp(p).test(s);
-	}
-};
-
-var AutoValidator = {
-	settings : {
-		id_cls : 'id',
-		int_cls : 'int',
-		url_cls : 'url',
-		number_cls : 'number',
-		email_cls : 'email',
-		size_cls : 'size',
-		required_cls : 'required',
-		invalid_cls : 'invalid',
-		min_cls : 'min',
-		max_cls : 'max'
-	},
-
-	init : function(s) {
-		var n;
-
-		for (n in s)
-			this.settings[n] = s[n];
-	},
-
-	validate : function(f) {
-		var i, nl, s = this.settings, c = 0;
-
-		nl = this.tags(f, 'label');
-		for (i=0; i<nl.length; i++) {
-			this.removeClass(nl[i], s.invalid_cls);
-			nl[i].setAttribute('aria-invalid', false);
-		}
-
-		c += this.validateElms(f, 'input');
-		c += this.validateElms(f, 'select');
-		c += this.validateElms(f, 'textarea');
-
-		return c == 3;
-	},
-
-	invalidate : function(n) {
-		this.mark(n.form, n);
-	},
-	
-	getErrorMessages : function(f) {
-		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
-		nl = this.tags(f, "label");
-		for (i=0; i<nl.length; i++) {
-			if (this.hasClass(nl[i], s.invalid_cls)) {
-				field = document.getElementById(nl[i].getAttribute("for"));
-				values = { field: nl[i].textContent };
-				if (this.hasClass(field, s.min_cls, true)) {
-					message = ed.getLang('invalid_data_min');
-					values.min = this.getNum(field, s.min_cls);
-				} else if (this.hasClass(field, s.number_cls)) {
-					message = ed.getLang('invalid_data_number');
-				} else if (this.hasClass(field, s.size_cls)) {
-					message = ed.getLang('invalid_data_size');
-				} else {
-					message = ed.getLang('invalid_data');
-				}
-				
-				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {
-					return values[b] || '{#' + b + '}';
-				});
-				messages.push(message);
-			}
-		}
-		return messages;
-	},
-
-	reset : function(e) {
-		var t = ['label', 'input', 'select', 'textarea'];
-		var i, j, nl, s = this.settings;
-
-		if (e == null)
-			return;
-
-		for (i=0; i<t.length; i++) {
-			nl = this.tags(e.form ? e.form : e, t[i]);
-			for (j=0; j<nl.length; j++) {
-				this.removeClass(nl[j], s.invalid_cls);
-				nl[j].setAttribute('aria-invalid', false);
-			}
-		}
-	},
-
-	validateElms : function(f, e) {
-		var nl, i, n, s = this.settings, st = true, va = Validator, v;
-
-		nl = this.tags(f, e);
-		for (i=0; i<nl.length; i++) {
-			n = nl[i];
-
-			this.removeClass(n, s.invalid_cls);
-
-			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.size_cls) && !va.isSize(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.id_cls) && !va.isId(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.min_cls, true)) {
-				v = this.getNum(n, s.min_cls);
-
-				if (isNaN(v) || parseInt(n.value) < parseInt(v))
-					st = this.mark(f, n);
-			}
-
-			if (this.hasClass(n, s.max_cls, true)) {
-				v = this.getNum(n, s.max_cls);
-
-				if (isNaN(v) || parseInt(n.value) > parseInt(v))
-					st = this.mark(f, n);
-			}
-		}
-
-		return st;
-	},
-
-	hasClass : function(n, c, d) {
-		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);
-	},
-
-	getNum : function(n, c) {
-		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];
-		c = c.replace(/[^0-9]/g, '');
-
-		return c;
-	},
-
-	addClass : function(n, c, b) {
-		var o = this.removeClass(n, c);
-		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
-	},
-
-	removeClass : function(n, c) {
-		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');
-		return n.className = c != ' ' ? c : '';
-	},
-
-	tags : function(f, s) {
-		return f.getElementsByTagName(s);
-	},
-
-	mark : function(f, n) {
-		var s = this.settings;
-
-		this.addClass(n, s.invalid_cls);
-		n.setAttribute('aria-invalid', 'true');
-		this.markLabels(f, n, s.invalid_cls);
-
-		return false;
-	},
-
-	markLabels : function(f, n, ic) {
-		var nl, i;
-
-		nl = this.tags(f, "label");
-		for (i=0; i<nl.length; i++) {
-			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)
-				this.addClass(nl[i], ic);
-		}
-
-		return null;
-	}
-};
diff --git a/extlib/tinymce/js/tinymce/plugins/contextmenu/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/contextmenu/plugin.min.js
deleted file mode 100644
index 4aabc706..00000000
--- a/extlib/tinymce/js/tinymce/plugins/contextmenu/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("contextmenu",function(e){var t;e.on("contextmenu",function(n){var i;if(n.preventDefault(),i=e.settings.contextmenu||"link image inserttable | cell row column deletetable",t)t.show();else{var o=[];tinymce.each(i.split(/[ ,]/),function(t){var n=e.menuItems[t];"|"==t&&(n={text:t}),n&&(n.shortcut="",o.push(n))});for(var a=0;a<o.length;a++)"|"==o[a].text&&(0===a||a==o.length-1)&&o.splice(a,1);t=new tinymce.ui.Menu({items:o,context:"contextmenu"}),t.renderTo(document.body)}var r={x:n.pageX,y:n.pageY};e.inline||(r=tinymce.DOM.getPos(e.getContentAreaContainer()),r.x+=n.clientX,r.y+=n.clientY),t.moveTo(r.x,r.y),e.on("remove",function(){t.remove(),t=null})})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/directionality/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/directionality/plugin.min.js
deleted file mode 100644
index 60c7f9d5..00000000
--- a/extlib/tinymce/js/tinymce/plugins/directionality/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("directionality",function(e){function t(t){var n,i=e.dom,a=e.selection.getSelectedBlocks();a.length&&(n=i.getAttrib(a[0],"dir"),tinymce.each(a,function(e){i.getParent(e.parentNode,"*[dir='"+t+"']",i.getRoot())||(n!=t?i.setAttrib(e,"dir",t):i.setAttrib(e,"dir",null))}),e.nodeChanged())}function n(e){var t=[];return tinymce.each("h1 h2 h3 h4 h5 h6 div p".split(" "),function(n){t.push(n+"[dir="+e+"]")}),t.join(",")}e.addCommand("mceDirectionLTR",function(){t("ltr")}),e.addCommand("mceDirectionRTL",function(){t("rtl")}),e.addButton("ltr",{title:"Left to right",cmd:"mceDirectionLTR",stateSelector:n("ltr")}),e.addButton("rtl",{title:"Right to left",cmd:"mceDirectionRTL",stateSelector:n("rtl")})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-cool.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-cool.gif
deleted file mode 100644
index ba90cc36..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-cool.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-cry.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-cry.gif
deleted file mode 100644
index 74d897a4..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-cry.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif
deleted file mode 100644
index 963a96b8..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
deleted file mode 100644
index c7cf1011..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-frown.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-frown.gif
deleted file mode 100644
index 716f55e1..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-frown.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-innocent.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-innocent.gif
deleted file mode 100644
index 334d49e0..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-innocent.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-kiss.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-kiss.gif
deleted file mode 100644
index 4efd549e..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-kiss.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-laughing.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-laughing.gif
deleted file mode 100644
index 82c5b182..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-laughing.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
deleted file mode 100644
index ca2451e1..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-sealed.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-sealed.gif
deleted file mode 100644
index fe66220c..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-sealed.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-smile.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-smile.gif
deleted file mode 100644
index fd27edfa..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-smile.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-surprised.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-surprised.gif
deleted file mode 100644
index 0cc9bb71..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-surprised.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
deleted file mode 100644
index 2075dc16..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-undecided.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-undecided.gif
deleted file mode 100644
index bef7e257..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-undecided.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-wink.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-wink.gif
deleted file mode 100644
index 0631c761..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-wink.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-yell.gif b/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-yell.gif
deleted file mode 100644
index 648e6e87..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/img/smiley-yell.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/emoticons/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/emoticons/plugin.min.js
deleted file mode 100644
index f70e7941..00000000
--- a/extlib/tinymce/js/tinymce/plugins/emoticons/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("emoticons",function(e,t){function n(){var e;return e='<table role="presentation" class="mce-grid">',tinymce.each(i,function(n){e+="<tr>",tinymce.each(n,function(n){var i=t+"/img/smiley-"+n+".gif";e+='<td><a href="#" data-mce-url="'+i+'" tabindex="-1"><img src="'+i+'" style="width: 18px; height: 18px"></a></td>'}),e+="</tr>"}),e+="</table>"}var i=[["cool","cry","embarassed","foot-in-mouth"],["frown","innocent","kiss","laughing"],["money-mouth","sealed","smile","surprised"],["tongue-out","undecided","wink","yell"]];e.addButton("emoticons",{type:"panelbutton",popoverAlign:"bc-tl",panel:{autohide:!0,html:n,onclick:function(t){var n=e.dom.getParent(t.target,"a");n&&(e.insertContent('<img src="'+n.getAttribute("data-mce-url")+'" />'),this.hide())}},tooltip:"Emoticons"})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/example/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/example/plugin.min.js
deleted file mode 100644
index 24a64c8e..00000000
--- a/extlib/tinymce/js/tinymce/plugins/example/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("example",function(e){e.addButton("example",{text:"My button",icon:!1,onclick:function(){e.windowManager.open({title:"Example plugin",body:[{type:"textbox",name:"title",label:"Title"}],onsubmit:function(t){e.insertContent("Title: "+t.data.title)}})}}),e.addMenuItem("example",{text:"Example plugin",context:"tools",onclick:function(){e.windowManager.open({title:"TinyMCE site",url:"http://www.tinymce.com",width:800,height:600,buttons:[{text:"Close",onclick:"close"}]})}})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/example_dependency/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/example_dependency/plugin.min.js
deleted file mode 100644
index e61bf473..00000000
--- a/extlib/tinymce/js/tinymce/plugins/example_dependency/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("example_dependency",function(){},["example"]);
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/fullpage/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/fullpage/plugin.min.js
deleted file mode 100644
index 0f15de46..00000000
--- a/extlib/tinymce/js/tinymce/plugins/fullpage/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("fullpage",function(e){function t(){var t=n();e.windowManager.open({title:"Document properties",data:t,defaults:{type:"textbox",size:40},body:[{name:"title",label:"Title"},{name:"keywords",label:"Keywords"},{name:"description",label:"Description"},{name:"robots",label:"Robots"},{name:"author",label:"Author"},{name:"docencoding",label:"Encoding"}],onSubmit:function(e){i(tinymce.extend(t,e.data))}})}function n(){function t(e,t){var n=e.attr(t);return n||""}var n,i,r=a(),o={};return o.fontface=e.getParam("fullpage_default_fontface",""),o.fontsize=e.getParam("fullpage_default_fontsize",""),n=r.firstChild,7==n.type&&(o.xml_pi=!0,i=/encoding="([^"]+)"/.exec(n.value),i&&(o.docencoding=i[1])),n=r.getAll("#doctype")[0],n&&(o.doctype="<!DOCTYPE"+n.value+">"),n=r.getAll("title")[0],n&&n.firstChild&&(o.title=n.firstChild.value),u(r.getAll("meta"),function(e){var t,n=e.attr("name"),i=e.attr("http-equiv");n?o[n.toLowerCase()]=e.attr("content"):"Content-Type"==i&&(t=/charset\s*=\s*(.*)\s*/gi.exec(e.attr("content")),t&&(o.docencoding=t[1]))}),n=r.getAll("html")[0],n&&(o.langcode=t(n,"lang")||t(n,"xml:lang")),n=r.getAll("link")[0],n&&"stylesheet"==n.attr("rel")&&(o.stylesheet=n.attr("href")),n=r.getAll("body")[0],n&&(o.langdir=t(n,"dir"),o.style=t(n,"style"),o.visited_color=t(n,"vlink"),o.link_color=t(n,"link"),o.active_color=t(n,"alink")),o}function i(t){function n(e,t,n){e.attr(t,n?n:void 0)}function i(e){o.firstChild?o.insert(e,o.firstChild):o.append(e)}var r,o,l,c,m,f=e.dom;r=a(),o=r.getAll("head")[0],o||(c=r.getAll("html")[0],o=new d("head",1),c.firstChild?c.insert(o,c.firstChild,!0):c.append(o)),c=r.firstChild,t.xml_pi?(m='version="1.0"',t.docencoding&&(m+=' encoding="'+t.docencoding+'"'),7!=c.type&&(c=new d("xml",7),r.insert(c,r.firstChild,!0)),c.value=m):c&&7==c.type&&c.remove(),c=r.getAll("#doctype")[0],t.doctype?(c||(c=new d("#doctype",10),t.xml_pi?r.insert(c,r.firstChild):i(c)),c.value=t.doctype.substring(9,t.doctype.length-1)):c&&c.remove(),t.docencoding&&(c=null,u(r.getAll("meta"),function(e){"Content-Type"==e.attr("http-equiv")&&(c=e)}),c||(c=new d("meta",1),c.attr("http-equiv","Content-Type"),c.shortEnded=!0,i(c)),c.attr("content","text/html; charset="+t.docencoding)),c=r.getAll("title")[0],t.title?c||(c=new d("title",1),c.append(new d("#text",3)).value=t.title,i(c)):c&&c.remove(),u("keywords,description,author,copyright,robots".split(","),function(e){var n,a,o=r.getAll("meta"),l=t[e];for(n=0;n<o.length;n++)if(a=o[n],a.attr("name")==e)return l?a.attr("content",l):a.remove(),void 0;l&&(c=new d("meta",1),c.attr("name",e),c.attr("content",l),c.shortEnded=!0,i(c))}),c=r.getAll("link")[0],c&&"stylesheet"==c.attr("rel")?t.stylesheet?c.attr("href",t.stylesheet):c.remove():t.stylesheet&&(c=new d("link",1),c.attr({rel:"stylesheet",text:"text/css",href:t.stylesheet}),c.shortEnded=!0,i(c)),c=r.getAll("body")[0],c&&(n(c,"dir",t.langdir),n(c,"style",t.style),n(c,"vlink",t.visited_color),n(c,"link",t.link_color),n(c,"alink",t.active_color),f.setAttribs(e.getBody(),{style:t.style,dir:t.dir,vLink:t.visited_color,link:t.link_color,aLink:t.active_color})),c=r.getAll("html")[0],c&&(n(c,"lang",t.langcode),n(c,"xml:lang",t.langcode)),o.firstChild||o.remove(),l=new tinymce.html.Serializer({validate:!1,indent:!0,apply_source_formatting:!0,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(r),s=l.substring(0,l.indexOf("</body>"))}function a(){return new tinymce.html.DomParser({validate:!1,root_name:"#document"}).parse(s)}function r(t){function n(e){return e.replace(/<\/?[A-Z]+/g,function(e){return e.toLowerCase()})}var i,r,l,d,m=t.content,f="",g=e.dom;t.selection||"raw"==t.format&&s||t.source_view&&e.getParam("fullpage_hide_in_source_view")||(m=m.replace(/<(\/?)BODY/gi,"<$1body"),i=m.indexOf("<body"),-1!=i?(i=m.indexOf(">",i),s=n(m.substring(0,i+1)),r=m.indexOf("</body",i),-1==r&&(r=m.length),t.content=m.substring(i+1,r),c=n(m.substring(r))):(s=o(),c="\n</body>\n</html>"),l=a(),u(l.getAll("style"),function(e){e.firstChild&&(f+=e.firstChild.value)}),d=l.getAll("body")[0],d&&g.setAttribs(e.getBody(),{style:d.attr("style")||"",dir:d.attr("dir")||"",vLink:d.attr("vlink")||"",link:d.attr("link")||"",aLink:d.attr("alink")||""}),g.remove("fullpage_styles"),f&&(g.add(e.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},f),d=g.get("fullpage_styles"),d.styleSheet&&(d.styleSheet.cssText=f)))}function o(){var t,n="",i="";return e.getParam("fullpage_default_xml_pi")&&(n+='<?xml version="1.0" encoding="'+e.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'),n+=e.getParam("fullpage_default_doctype","<!DOCTYPE html>"),n+="\n<html>\n<head>\n",(t=e.getParam("fullpage_default_title"))&&(n+="<title>"+t+"</title>\n"),(t=e.getParam("fullpage_default_encoding"))&&(n+='<meta http-equiv="Content-Type" content="text/html; charset='+t+'" />\n'),(t=e.getParam("fullpage_default_font_family"))&&(i+="font-family: "+t+";"),(t=e.getParam("fullpage_default_font_size"))&&(i+="font-size: "+t+";"),(t=e.getParam("fullpage_default_text_color"))&&(i+="color: "+t+";"),n+="</head>\n<body"+(i?' style="'+i+'"':"")+">\n"}function l(t){t.selection||t.source_view&&e.getParam("fullpage_hide_in_source_view")||(t.content=tinymce.trim(s)+"\n"+tinymce.trim(t.content)+"\n"+tinymce.trim(c))}var s,c,u=tinymce.each,d=tinymce.html.Node;e.addCommand("mceFullPageProperties",t),e.addButton("fullpage",{title:"Document properties",cmd:"mceFullPageProperties"}),e.addMenuItem("fullpage",{text:"Document properties",cmd:"mceFullPageProperties",context:"file"}),e.on("BeforeSetContent",r),e.on("GetContent",l)});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/fullscreen/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/fullscreen/plugin.min.js
deleted file mode 100644
index 92a3b703..00000000
--- a/extlib/tinymce/js/tinymce/plugins/fullscreen/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("fullscreen",function(e){function t(){var e,t,n=window,i=document,a=i.body;return a.offsetWidth&&(e=a.offsetWidth,t=a.offsetHeight),n.innerWidth&&n.innerHeight&&(e=n.innerWidth,t=n.innerHeight),{w:e,h:t}}function n(){function n(){l.setStyle(c,"height",t().h-(s.clientHeight-c.clientHeight))}var s,c,u,d=document.body,m=document.documentElement;o=!o,s=e.getContainer().firstChild,c=e.getContentAreaContainer().firstChild,u=c.style,o?(i=u.width,a=u.height,u.width=u.height="100%",l.addClass(d,"mce-fullscreen"),l.addClass(m,"mce-fullscreen"),l.addClass(s,"mce-fullscreen"),l.bind(window,"resize",n),n(),r=n):(u.width=i,u.height=a,l.removeClass(d,"mce-fullscreen"),l.removeClass(m,"mce-fullscreen"),l.removeClass(s,"mce-fullscreen"),l.unbind(window,"resize",r)),e.fire("FullscreenStateChanged",{state:o})}var i,a,r,o=!1,l=tinymce.DOM;if(!e.settings.inline)return e.on("init",function(){e.addShortcut("Ctrl+Alt+F","",n)}),e.on("remove",function(){r&&l.unbind(window,"resize",r)}),e.addCommand("mceFullScreen",n),e.addMenuItem("fullscreen",{text:"Fullscreen",shortcut:"Ctrl+Alt+F",selectable:!0,onClick:n,onPostRender:function(){var t=this;e.on("FullscreenStateChanged",function(e){t.active(e.state)})},context:"view"}),e.addButton("fullscreen",{tooltip:"Fullscreen",shortcut:"Ctrl+Alt+F",onClick:n,onPostRender:function(){var t=this;e.on("FullscreenStateChanged",function(e){t.active(e.state)})}}),{isFullscreen:function(){return o}}});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/hr/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/hr/plugin.min.js
deleted file mode 100644
index f9268ae0..00000000
--- a/extlib/tinymce/js/tinymce/plugins/hr/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("hr",function(e){e.addCommand("InsertHorizontalRule",function(){e.execCommand("mceInsertContent",!1,"<hr />")}),e.addButton("hr",{icon:"hr",tooltip:"Insert horizontal ruler",cmd:"InsertHorizontalRule"}),e.addMenuItem("hr",{icon:"hr",text:"Horizontal line",cmd:"InsertHorizontalRule",context:"insert"})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/image/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/image/plugin.min.js
deleted file mode 100644
index 7c3b8af4..00000000
--- a/extlib/tinymce/js/tinymce/plugins/image/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("image",function(e){function t(e,t){function n(e,n){i.parentNode.removeChild(i),t({width:e,height:n})}var i=document.createElement("img");i.onload=function(){n(i.clientWidth,i.clientHeight)},i.onerror=function(){n()},i.src=e;var a=i.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left=0,a.width=a.height="auto",document.body.appendChild(i)}function n(t){return function(){var n=e.settings.image_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function i(n){function i(){var e=[{text:"None",value:""}];return tinymce.each(n,function(t){e.push({text:t.text||t.title,value:t.value||t.url,menu:t.menu})}),e}function a(e){var t,n,i,a;t=c.find("#width")[0],n=c.find("#height")[0],i=t.value(),a=n.value(),c.find("#constrain")[0].checked()&&u&&m&&i&&a&&(e.control==t?(a=Math.round(i/u*a),n.value(a)):(i=Math.round(a/m*i),t.value(i))),u=i,m=a}function r(){function t(t){function i(){t.onload=t.onerror=null,e.selection.select(t),e.nodeChanged()}t.onload=function(){n.width||n.height||f.setAttribs(t,{width:t.clientWidth,height:t.clientHeight}),i()},t.onerror=i}var n=c.toJSON();""===n.width&&(n.width=null),""===n.height&&(n.height=null),""===n.style&&(n.style=null),n={src:n.src,alt:n.alt,width:n.width,height:n.height,style:n.style},h?f.setAttribs(h,n):(n.id="__mcenew",e.insertContent(f.createHTML("img",n)),h=f.get("__mcenew"),f.setAttrib(h,"id",null)),t(h)}function o(e){return e&&(e=e.replace(/px$/,"")),e}function l(){t(this.value(),function(e){e.width&&e.height&&(u=e.width,m=e.height,c.find("#width").value(u),c.find("#height").value(m))})}function s(){function e(e){return e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e}var t=c.toJSON(),n=f.parseStyle(t.style);delete n.margin,n["margin-top"]=n["margin-bottom"]=e(t.vspace),n["margin-left"]=n["margin-right"]=e(t.hspace),n["border-width"]=e(t.border),c.find("#style").value(f.serializeStyle(f.parseStyle(f.serializeStyle(n))))}var c,d,u,m,g,f=e.dom,h=e.selection.getNode();u=f.getAttrib(h,"width"),m=f.getAttrib(h,"height"),"IMG"!=h.nodeName||h.getAttribute("data-mce-object")?h=null:d={src:f.getAttrib(h,"src"),alt:f.getAttrib(h,"alt"),width:u,height:m},n&&(g={name:"target",type:"listbox",label:"Image list",values:i(),onselect:function(e){var t=c.find("#alt");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),c.find("#src").value(e.control.value())}});var p=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:l},g,{name:"alt",type:"textbox",label:"Image description"},{type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:a},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:a},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}];e.settings.image_advtab?(h&&(d.hspace=o(h.style.marginLeft||h.style.marginRight),d.vspace=o(h.style.marginTop||h.style.marginBottom),d.border=o(h.style.borderWidth),d.style=e.dom.serializeStyle(e.dom.parseStyle(e.dom.getAttrib(h,"style")))),c=e.windowManager.open({title:"Insert/edit image",data:d,bodyType:"tabpanel",body:[{title:"General",type:"form",items:p},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:s},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:r})):c=e.windowManager.open({title:"Edit image",data:d,body:p,onSubmit:r})}e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:n(i),stateSelector:"img:not([data-mce-object])"}),e.addMenuItem("image",{icon:"image",text:"Insert image",onclick:n(i),context:"insert",prependToContext:!0})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/insertdatetime/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/insertdatetime/plugin.min.js
deleted file mode 100644
index 224554d4..00000000
--- a/extlib/tinymce/js/tinymce/plugins/insertdatetime/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("insertdatetime",function(e){function t(t,n){function i(e,t){if(e=""+e,e.length<t)for(var n=0;n<t-e.length;n++)e="0"+e;return e}return n=n||new Date,t=t.replace("%D","%m/%d/%Y"),t=t.replace("%r","%I:%M:%S %p"),t=t.replace("%Y",""+n.getFullYear()),t=t.replace("%y",""+n.getYear()),t=t.replace("%m",i(n.getMonth()+1,2)),t=t.replace("%d",i(n.getDate(),2)),t=t.replace("%H",""+i(n.getHours(),2)),t=t.replace("%M",""+i(n.getMinutes(),2)),t=t.replace("%S",""+i(n.getSeconds(),2)),t=t.replace("%I",""+((n.getHours()+11)%12+1)),t=t.replace("%p",""+(n.getHours()<12?"AM":"PM")),t=t.replace("%B",""+e.translate(l[n.getMonth()])),t=t.replace("%b",""+e.translate(o[n.getMonth()])),t=t.replace("%A",""+e.translate(r[n.getDay()])),t=t.replace("%a",""+e.translate(a[n.getDay()])),t=t.replace("%%","%")}function n(n){var i=t(n);if(e.settings.insertdatetime_element){var a;a=/%[HMSIp]/.test(n)?t("%Y-%m-%dT%H:%M"):t("%Y-%m-%d"),i='<time datetime="'+a+'">'+i+"</time>";var r=e.dom.getParent(e.selection.getStart(),"time");if(r)return e.dom.setOuterHTML(r,i),void 0}e.insertContent(i)}var i,a="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),r="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),o="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),l="January February March April May June July August September October November December".split(" "),s=[];e.addCommand("mceInsertDate",function(){n(e.getParam("insertdate_dateformat",e.translate("%Y-%m-%d")))}),e.addCommand("mceInsertTime",function(){n(e.getParam("insertdate_timeformat",e.translate("%H:%M:%S")))}),e.addButton("inserttime",{type:"splitbutton",title:"Insert time",onclick:function(){n(i||"%H:%M:%S")},menu:s}),tinymce.each(e.settings.insertdate_formats||["%H:%M:%S","%Y-%m-%d","%I:%M:%S %p","%D"],function(e){s.push({text:t(e),onclick:function(){i=e,n(e)}})}),e.addMenuItem("insertdatetime",{icon:"date",text:"Insert date/time",menu:s,context:"insert"})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/layer/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/layer/plugin.min.js
deleted file mode 100644
index eb1ad4b6..00000000
--- a/extlib/tinymce/js/tinymce/plugins/layer/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("layer",function(e){function t(e){do if(e.className&&-1!=e.className.indexOf("mceItemLayer"))return e;while(e=e.parentNode)}function n(t){var n=e.dom;tinymce.each(n.select("div,p",t),function(e){/^(absolute|relative|fixed)$/i.test(e.style.position)&&(e.hasVisual?n.addClass(e,"mceItemVisualAid"):n.removeClass(e,"mceItemVisualAid"),n.addClass(e,"mceItemLayer"))})}function i(n){var i,o,a=[],r=t(e.selection.getNode()),l=-1,s=-1;for(o=[],tinymce.walk(e.getBody(),function(e){1==e.nodeType&&/^(absolute|relative|static)$/i.test(e.style.position)&&o.push(e)},"childNodes"),i=0;i<o.length;i++)a[i]=o[i].style.zIndex?parseInt(o[i].style.zIndex,10):0,0>l&&o[i]==r&&(l=i);if(0>n){for(i=0;i<a.length;i++)if(a[i]<a[l]){s=i;break}s>-1?(o[l].style.zIndex=a[s],o[s].style.zIndex=a[l]):a[l]>0&&(o[l].style.zIndex=a[l]-1)}else{for(i=0;i<a.length;i++)if(a[i]>a[l]){s=i;break}s>-1?(o[l].style.zIndex=a[s],o[s].style.zIndex=a[l]):o[l].style.zIndex=a[l]+1}e.execCommand("mceRepaint")}function o(){var t=e.dom,n=t.getPos(t.getParent(e.selection.getNode(),"*")),i=e.getBody();e.dom.add(i,"div",{style:{position:"absolute",left:n.x,top:n.y>20?n.y:20,width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},e.selection.getContent()||e.getLang("layer.content")),tinymce.Env.ie&&t.setHTML(i,i.innerHTML)}function a(){var n=t(e.selection.getNode());n||(n=e.dom.getParent(e.selection.getNode(),"DIV,P,IMG")),n&&("absolute"==n.style.position.toLowerCase()?(e.dom.setStyles(n,{position:"",left:"",top:"",width:"",height:""}),e.dom.removeClass(n,"mceItemVisualAid"),e.dom.removeClass(n,"mceItemLayer")):(n.style.left||(n.style.left="20px"),n.style.top||(n.style.top="20px"),n.style.width||(n.style.width=n.width?n.width+"px":"100px"),n.style.height||(n.style.height=n.height?n.height+"px":"100px"),n.style.position="absolute",e.dom.setAttrib(n,"data-mce-style",""),e.addVisual(e.getBody())),e.execCommand("mceRepaint"),e.nodeChanged())}e.addCommand("mceInsertLayer",o),e.addCommand("mceMoveForward",function(){i(1)}),e.addCommand("mceMoveBackward",function(){i(-1)}),e.addCommand("mceMakeAbsolute",function(){a()}),e.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"}),e.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"}),e.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"}),e.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"}),e.on("init",function(){tinymce.Env.ie&&e.getDoc().execCommand("2D-Position",!1,!0)}),e.on("mouseup",function(n){var i=t(n.target);i&&e.dom.setAttrib(i,"data-mce-style","")}),e.on("mousedown",function(n){var i,o=n.target,a=e.getDoc();tinymce.Env.gecko&&(t(o)?"on"!==a.designMode&&(a.designMode="on",o=a.body,i=o.parentNode,i.removeChild(o),i.appendChild(o)):"on"==a.designMode&&(a.designMode="off"))}),e.on("NodeChange",n)});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/legacyoutput/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/legacyoutput/plugin.min.js
deleted file mode 100644
index 4f6f7c1a..00000000
--- a/extlib/tinymce/js/tinymce/plugins/legacyoutput/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){e.on("AddEditor",function(e){e.editor.settings.inline_styles=!1}),e.PluginManager.add("legacyoutput",function(t){t.on("init",function(){var n="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",i=e.explode(t.settings.font_size_style_values),o=t.schema;t.formatter.register({alignleft:{selector:n,attributes:{align:"left"}},aligncenter:{selector:n,attributes:{align:"center"}},alignright:{selector:n,attributes:{align:"right"}},alignjustify:{selector:n,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:!0}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:!0}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(t){return e.inArray(i,t.value)+1}}},forecolor:{inline:"font",attributes:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}}),e.each("b,i,u,strike".split(","),function(e){o.addValidElements(e+"[*]")}),o.getElementRule("font")||o.addValidElements("font[face|size|color|style]"),e.each(n.split(","),function(e){var t=o.getElementRule(e);t&&(t.attributes.align||(t.attributes.align={},t.attributesOrder.push("align")))})})})}(tinymce);
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/link/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/link/plugin.min.js
deleted file mode 100644
index 3387911c..00000000
--- a/extlib/tinymce/js/tinymce/plugins/link/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("link",function(t){function e(e){return function(){var n=t.settings.link_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(t){e(tinymce.util.JSON.parse(t))}}):e(n)}}function n(e){function n(t){var e=d.find("#text");(!e.value()||t.lastControl&&e.value()==t.lastControl.text())&&e.value(t.control.text()),d.find("#href").value(t.control.value())}function l(){var t=[{text:"None",value:""}];return tinymce.each(e,function(e){t.push({text:e.text||e.title,value:e.value||e.url,menu:e.menu})}),t}function i(e){var n=[{text:"None",value:""}];return tinymce.each(t.settings.rel_list,function(t){n.push({text:t.text||t.title,value:t.value,selected:e===t.value})}),n}function a(e){var n=[{text:"None",value:""}];return t.settings.target_list||n.push({text:"New window",value:"_blank"}),tinymce.each(t.settings.target_list,function(t){n.push({text:t.text||t.title,value:t.value,selected:e===t.value})}),n}function r(e){var l=[];return tinymce.each(t.dom.select("a:not([href])"),function(t){var n=t.name||t.id;n&&l.push({text:n,value:"#"+n,selected:-1!=e.indexOf("#"+n)})}),l.length?(l.unshift({text:"None",value:""}),{name:"anchor",type:"listbox",label:"Anchors",values:l,onselect:n}):void 0}function o(){c||0!==v.text.length||this.parent().parent().find("#text")[0].value(this.value())}var u,s,c,d,f,h,x,v={},g=t.selection,m=t.dom;u=g.getNode(),s=m.getParent(u,"a[href]"),s&&g.select(s),v.text=c=g.getContent({format:"text"}),v.href=s?m.getAttrib(s,"href"):"",v.target=s?m.getAttrib(s,"target"):"",v.rel=s?m.getAttrib(s,"rel"):"","IMG"==u.nodeName&&(v.text=c=" "),e&&(f={type:"listbox",label:"Link list",values:l(),onselect:n}),t.settings.target_list!==!1&&(x={name:"target",type:"listbox",label:"Target",values:a(v.target)}),t.settings.rel_list&&(h={name:"rel",type:"listbox",label:"Rel",values:i(v.rel)}),d=t.windowManager.open({title:"Insert link",data:v,body:[{name:"href",type:"filepicker",filetype:"file",size:40,autofocus:!0,label:"Url",onchange:o,onkeyup:o},{name:"text",type:"textbox",size:40,label:"Text to display",onchange:function(){v.text=this.value()}},r(v.href),f,h,x],onSubmit:function(e){function n(e,n){window.setTimeout(function(){t.windowManager.confirm(e,n)},0)}function l(){i.text!=c?s?(t.focus(),s.innerHTML=i.text,m.setAttribs(s,{href:a,target:i.target?i.target:null,rel:i.rel?i.rel:null}),g.select(s)):t.insertContent(m.createHTML("a",{href:a,target:i.target?i.target:null,rel:i.rel?i.rel:null},i.text)):t.execCommand("mceInsertLink",!1,{href:a,target:i.target,rel:i.rel?i.rel:null})}var i=e.data,a=i.href;return a?a.indexOf("@")>0&&-1==a.indexOf("//")&&-1==a.indexOf("mailto:")?(n("The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",function(t){t&&(a="mailto:"+a),l()}),void 0):/^\s*www\./i.test(a)?(n("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(t){t&&(a="http://"+a),l()}),void 0):(l(),void 0):(t.execCommand("unlink"),void 0)}})}t.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Ctrl+K",onclick:e(n),stateSelector:"a[href]"}),t.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",stateSelector:"a[href]"}),t.addShortcut("Ctrl+K","",e(n)),this.showDialog=n,t.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Ctrl+K",onclick:e(n),stateSelector:"a[href]",context:"insert",prependToContext:!0})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/lists/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/lists/plugin.min.js
deleted file mode 100644
index 1d4f342e..00000000
--- a/extlib/tinymce/js/tinymce/plugins/lists/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("lists",function(e){var t=this;e.on("init",function(){function n(e){function t(t){var i,a,r;a=e[t?"startContainer":"endContainer"],r=e[t?"startOffset":"endOffset"],1==a.nodeType&&(i=b.create("span",{"data-mce-type":"bookmark"}),a.hasChildNodes()?(r=Math.min(r,a.childNodes.length-1),a.insertBefore(i,a.childNodes[r])):a.appendChild(i),a=i,r=0),n[t?"startContainer":"endContainer"]=a,n[t?"startOffset":"endOffset"]=r}var n={};return t(!0),t(),n}function i(e){function t(t){function n(e){for(var t=e.parentNode.firstChild,n=0;t;){if(t==e)return n;(1!=t.nodeType||"bookmark"!=t.getAttribute("data-mce-type"))&&n++,t=t.nextSibling}return-1}var i,a,r;i=r=e[t?"startContainer":"endContainer"],a=e[t?"startOffset":"endOffset"],1==i.nodeType&&(t?(a=n(i),i=i.parentNode):(a=n(i),i=i.parentNode),b.remove(r)),e[t?"startContainer":"endContainer"]=i,e[t?"startOffset":"endOffset"]=a}t(!0),t();var n=b.createRng();n.setStart(e.startContainer,e.startOffset),n.setEnd(e.endContainer,e.endOffset),x.setRng(n)}function a(e){return e&&/^(OL|UL)$/.test(e.nodeName)}function r(e){return e.parentNode.firstChild==e}function o(e){return e.parentNode.lastChild==e}function l(t){return t&&!!e.schema.getTextBlockElements()[t.nodeName]}function s(t,n){var i,a;if(e.settings.forced_root_block&&(n=n||e.settings.forced_root_block),a=n?b.create(n):b.createFragment(),t)for(;i=t.firstChild;)a.appendChild(i);return e.settings.forced_root_block||a.appendChild(b.create("br")),a.hasChildNodes()||tinymce.isIE||(a.innerHTML='<br data-mce-bogus="1">'),a}function c(){return tinymce.grep(x.getSelectedBlocks(),function(e){return"LI"==e.nodeName})}function d(){return tinymce.grep(x.getSelectedBlocks(),l)}function u(e,t,n){var i,a;n=n||s(t),i=b.createRng(),i.setStartAfter(t),i.setEndAfter(e),a=i.extractContents(),b.isEmpty(a)||b.insertAfter(a,e),b.isEmpty(n)||b.insertAfter(n,e),b.isEmpty(t.parentNode)&&b.remove(t.parentNode),b.remove(t)}function m(e){var t,n;if(t=e.nextSibling,t&&a(t)&&t.nodeName==e.nodeName){for(;n=t.firstChild;)e.appendChild(n);b.remove(t)}if(t=e.previousSibling,t&&a(t)&&t.nodeName==e.nodeName){for(;n=t.firstChild;)e.insertBefore(n,e.firstChild);b.remove(t)}}function f(e){tinymce.each(tinymce.grep(b.select("ol,ul",e)),function(e){var t,n=e.parentNode;"LI"==n.nodeName&&n.firstChild==e&&(t=n.previousSibling,t&&"LI"==t.nodeName&&(t.appendChild(e),b.isEmpty(n)&&b.remove(n))),a(n)&&(t=n.previousSibling,t&&"LI"==t.nodeName&&t.appendChild(e))})}function g(){var e,t=n(x.getRng(!0));return tinymce.each(c(),function(t){var n,i;return n=t.previousSibling,n&&"UL"==n.nodeName?(n.appendChild(t),void 0):n&&"LI"==n.nodeName&&a(n.lastChild)?(n.lastChild.appendChild(t),void 0):(n=t.nextSibling,n&&"UL"==n.nodeName?(n.insertBefore(t,n.firstChild),void 0):(n&&"LI"==n.nodeName&&a(t.lastChild)||(n=t.previousSibling,n&&"LI"==n.nodeName&&(i=b.create(t.parentNode.nodeName),n.appendChild(i),i.appendChild(t)),e=!0),void 0))}),i(t),e}function p(){function e(e){b.isEmpty(e)&&b.remove(e)}var t,l=n(x.getRng(!0));return tinymce.each(c(),function(n){var i,l=n.parentNode,c=l.parentNode;if(r(n)&&o(n))if("LI"==c.nodeName)b.insertAfter(n,c),e(c);else{if(!a(c))return;b.remove(l,!0)}else if(r(n))if("LI"==c.nodeName)b.insertAfter(n,c),i=b.create("LI"),i.appendChild(l),b.insertAfter(i,n),e(c);else{if(!a(c))return;c.insertBefore(n,l)}else if(o(n))if("LI"==c.nodeName)b.insertAfter(n,c);else{if(!a(c))return;b.insertAfter(n,l)}else{if("LI"==c.nodeName)l=c,i=s(n,"LI");else{if(!a(c))return;i=s(n,"LI")}u(l,n,i),f(l.parentNode)}t=!0}),i(l),t}function h(t){function r(){function t(t){var n,i,a=e.getBody();for(n=o[t?"startContainer":"endContainer"],i=o[t?"startOffset":"endOffset"],1==n.nodeType&&(n=n.childNodes[Math.min(i,n.childNodes.length-1)]||n);n.parentNode!=a;){if(l(n))return n;if(/^(TD|TH)$/.test(n.parentNode.nodeName))return n;n=n.parentNode}return n}function n(e,t){var n,i=[];if(!l(e)){for(;e&&(n=e[t?"previousSibling":"nextSibling"],!b.isBlock(n)&&n);)e=n;for(;e;)i.push(e),e=e[t?"nextSibling":"previousSibling"]}return i}var i,a,r=t(!0),s=t();a=n(r,!0),r!=s&&(a=a.concat(n(s).reverse())),tinymce.each(a,function(e){if(!b.isBlock(e)||"BR"==e.nodeName){if(!i||"BR"==e.nodeName){if("BR"==e.nodeName&&(!e.nextSibling||b.isBlock(e.nextSibling)&&"BR"!=e.nextSibling.nodeName))return b.remove(e),!1;i=b.create("p"),c.push(i),e.parentNode.insertBefore(i,e)}return"BR"!=e.nodeName?i.appendChild(e):b.remove(e),e==s?!1:void 0}})}var o=x.getRng(!0),s=n(o),c=d();r(),tinymce.each(c,function(e){var n,i;i=e.previousSibling,i&&a(i)&&i.nodeName==t?(n=i,e=b.rename(e,"LI"),i.appendChild(e)):(n=b.create(t),e.parentNode.insertBefore(n,e),n.appendChild(e),e=b.rename(e,"LI")),m(n)}),i(s)}function y(){var e=n(x.getRng(!0));tinymce.each(c(),function(e){var t,n;for(t=e;t;t=t.parentNode)a(t)&&(n=t);u(n,e)}),i(e)}function v(e){var t=b.getParent(x.getStart(),"OL,UL");if(t)if(t.nodeName==e)y(e);else{var a=n(x.getRng(!0));m(b.rename(t,e)),i(a)}else h(e)}var b=e.dom,x=e.selection;t.backspaceDelete=function(e){function t(e,t){var n=e.startContainer,i=e.startOffset;if(3==n.nodeType&&(t?i<n.data.length:i>0))return n;for(var a=new tinymce.dom.TreeWalker(e.startContainer);n=a[t?"next":"prev"]();)if(3==n.nodeType&&n.data.length>0)return n}function r(e,t){var n,i,r=e.parentNode;for(a(t.lastChild)&&(i=t.lastChild),n=t.lastChild,n&&"BR"==n.nodeName&&e.hasChildNodes()&&b.remove(n);n=e.firstChild;)t.appendChild(n);i&&t.appendChild(i),b.remove(e),b.isEmpty(r)&&b.remove(r)}if(x.isCollapsed()){var o=b.getParent(x.getStart(),"LI");if(o){var l=x.getRng(!0),s=b.getParent(t(l,e),"LI");if(s&&s!=o){var c=n(l);return e?r(s,o):r(o,s),i(c),!0}if(!s&&!e&&y(o.parentNode.nodeName))return!0}}},e.addCommand("Indent",function(){return g()?void 0:!0}),e.addCommand("Outdent",function(){return p()?void 0:!0}),e.addCommand("InsertUnorderedList",function(){v("UL")}),e.addCommand("InsertOrderedList",function(){v("OL")})}),e.on("keydown",function(e){e.keyCode==tinymce.util.VK.BACKSPACE?t.backspaceDelete()&&e.preventDefault():e.keyCode==tinymce.util.VK.DELETE&&t.backspaceDelete(!0)&&e.preventDefault()})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/media/moxieplayer.swf b/extlib/tinymce/js/tinymce/plugins/media/moxieplayer.swf
deleted file mode 100644
index 19c771be..00000000
--- a/extlib/tinymce/js/tinymce/plugins/media/moxieplayer.swf
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/plugins/media/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/media/plugin.min.js
deleted file mode 100644
index 3842ec81..00000000
--- a/extlib/tinymce/js/tinymce/plugins/media/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("media",function(e,t){function n(e){return-1!=e.indexOf(".mp3")?"audio/mpeg":-1!=e.indexOf(".wav")?"audio/wav":-1!=e.indexOf(".mp4")?"video/mp4":-1!=e.indexOf(".webm")?"video/webm":-1!=e.indexOf(".ogg")?"video/ogg":""}function i(){function t(e){var t,a,r,o;t=n.find("#width")[0],a=n.find("#height")[0],r=t.value(),o=a.value(),n.find("#constrain")[0].checked()&&i&&s&&r&&o&&(e.control==t?(o=Math.round(r/i*o),a.value(o)):(r=Math.round(o/s*r),t.value(r))),i=r,s=o}var n,i,s,c;c=l(e.selection.getNode()),i=c.width,s=c.height,n=e.windowManager.open({title:"Insert/edit video",data:c,bodyType:"tabpanel",body:[{title:"General",type:"form",onShowTab:function(){this.fromJSON(o(this.next().find("#embed").value()))},items:[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source"},{name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"},{name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"},{type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:t},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:t},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}]},{title:"Embed",type:"panel",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,onShowTab:function(){this.find("#embed").value(r(this.parent().toJSON()))},items:[{type:"label",text:"Paste your embed code below:"},{type:"textbox",flex:1,name:"embed",value:a(),multiline:!0,label:"Source"}]}],onSubmit:function(){e.insertContent(r(this.toJSON()))}})}function a(){var t=e.selection.getNode();return t.getAttribute("data-mce-object")?e.selection.getContent():void 0}function r(i){var a="";return i.source1||(tinymce.extend(i,o(i.embed)),i.source1)?(i.source1=e.convertURL(i.source1,"source"),i.source2=e.convertURL(i.source2,"source"),i.source1mime=n(i.source1),i.source2mime=n(i.source2),i.poster=e.convertURL(i.poster,"poster"),i.flashPlayerUrl=e.convertURL(t+"/moxieplayer.swf","movie"),i.embed?a=s(i.embed,i,!0):(tinymce.each(c,function(e){var t,n,a;if(t=e.regex.exec(i.source1)){for(a=e.url,n=0;t[n];n++)a=a.replace("$"+n,function(){return t[n]});i.source1=a,i.type=e.type,i.width=e.w,i.height=e.h}}),i.width=i.width||300,i.height=i.height||150,tinymce.each(i,function(t,n){i[n]=e.dom.encode(t)}),"iframe"==i.type?a+='<iframe src="'+i.source1+'" width="'+i.width+'" height="'+i.height+'"></iframe>':-1!=i.source1mime.indexOf("audio")?e.settings.audio_template_callback?a=e.settings.audio_template_callback(i):a+='<audio controls="controls" src="'+i.source1+'">'+(i.source2?'\n<source src="'+i.source2+'"'+(i.source2mime?' type="'+i.source2mime+'"':"")+" />\n":"")+"</audio>":a=e.settings.video_template_callback?e.settings.video_template_callback(i):'<video width="'+i.width+'" height="'+i.height+'"'+(i.poster?' poster="'+i.poster+'"':"")+' controls="controls">\n'+'<source src="'+i.source1+'"'+(i.source1mime?' type="'+i.source1mime+'"':"")+" />\n"+(i.source2?'<source src="'+i.source2+'"'+(i.source2mime?' type="'+i.source2mime+'"':"")+" />\n":"")+"</video>"),a):""}function o(e){var t={};return new tinymce.html.SaxParser({validate:!1,special:"script,noscript",start:function(e,n){t.source1||"param"!=e||(t.source1=n.map.movie),("iframe"==e||"object"==e||"embed"==e||"video"==e||"audio"==e)&&(t=tinymce.extend(n.map,t)),"source"==e&&(t.source1?t.source2||(t.source2=n.map.src):t.source1=n.map.src)}}).parse(e),t.source1=t.source1||t.src||t.data,t.source2=t.source2||"",t.poster=t.poster||"",t}function l(t){return t.getAttribute("data-mce-object")?o(e.serializer.serialize(t,{selection:!0})):{}}function s(e,t,n){function i(e,t){var n,i,a,r;for(n in t)if(a=""+t[n],e.map[n])for(i=e.length;i--;)r=e[i],r.name==n&&(a?(e.map[n]=a,r.value=a):(delete e.map[n],e.splice(i,1)));else a&&(e.push({name:n,value:a}),e.map[n]=a)}var a=new tinymce.html.Writer,r=0;return new tinymce.html.SaxParser({validate:!1,special:"script,noscript",comment:function(e){a.comment(e)},cdata:function(e){a.cdata(e)},text:function(e,t){a.text(e,t)},start:function(e,o,l){switch(e){case"video":case"object":case"img":case"iframe":i(o,{width:t.width,height:t.height})}if(n)switch(e){case"video":i(o,{poster:t.poster,src:""}),t.source2&&i(o,{src:""});break;case"iframe":i(o,{src:t.source1});break;case"source":if(r++,2>=r&&(i(o,{src:t["source"+r],type:t["source"+r+"mime"]}),!t["source"+r]))return}a.start(e,o,l)},end:function(e){if("video"==e&&n)for(var o=1;2>=o;o++)if(t["source"+o]){var l=[];l.map={},o>r&&(i(l,{src:t["source"+o],type:t["source"+o+"mime"]}),a.start("source",l,!0))}a.end(e)}},new tinymce.html.Schema({})).parse(e),a.getContent()}var c=[{regex:/youtu\.be\/([a-z1-9.-_]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$1"},{regex:/youtube\.com(.+)v=([^&]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$2"},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"http://player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc"},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'http://maps.google.com/maps/ms?msid=$2&output=embed"'}];e.on("ResolveName",function(e){var t;1==e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)}),e.on("preInit",function(){var t=e.schema.getSpecialElements();tinymce.each("video audio iframe object".split(" "),function(e){t[e]=new RegExp("</"+e+"[^>]*>","gi")}),e.schema.addValidElements("object[id|style|width|height|classid|codebase|*],embed[id|style|width|height|type|src|*],video[*],audio[*]");var n=e.schema.getBoolAttrs();tinymce.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(e){n[e]={}}),e.parser.addNodeFilter("iframe,video,audio,object,embed",function(t,n){for(var i,a,r,o,l,s,c,u=t.length;u--;){for(a=t[u],r=new tinymce.html.Node("img",1),r.shortEnded=!0,s=a.attributes,i=s.length;i--;)o=s[i].name,l=s[i].value,"width"!==o&&"height"!==o&&"style"!==o&&(("data"==o||"src"==o)&&(l=e.convertURL(l,o)),r.attr("data-mce-p-"+o,l));c=a.firstChild&&a.firstChild.value,c&&(r.attr("data-mce-html",escape(c)),r.firstChild=null),r.attr({width:a.attr("width")||"300",height:a.attr("height")||("audio"==n?"30":"150"),style:a.attr("style"),src:tinymce.Env.transparentSrc,"data-mce-object":n,"class":"mce-object mce-object-"+n}),a.replace(r)}}),e.serializer.addAttributeFilter("data-mce-object",function(e,t){for(var n,i,a,r,o,l,s=e.length;s--;){for(n=e[s],i=new tinymce.html.Node(n.attr(t),1),"audio"!=n.attr(t)&&i.attr({width:n.attr("width"),height:n.attr("height")}),i.attr({style:n.attr("style")}),r=n.attributes,a=r.length;a--;){var c=r[a].name;0===c.indexOf("data-mce-p-")&&i.attr(c.substr(11),r[a].value)}o=n.attr("data-mce-html"),o&&(l=new tinymce.html.Node("#text",3),l.raw=!0,l.value=unescape(o),i.append(l)),n.replace(i)}})}),e.on("ObjectSelected",function(e){"audio"==e.target.getAttribute("data-mce-object")&&e.preventDefault()}),e.on("objectResized",function(e){var t,n=e.target;n.getAttribute("data-mce-object")&&(t=n.getAttribute("data-mce-html"),t&&(t=unescape(t),n.setAttribute("data-mce-html",escape(s(t,{width:e.width,height:e.height})))))}),e.addButton("media",{tooltip:"Insert/edit video",onclick:i,stateSelector:"img[data-mce-object=video]"}),e.addMenuItem("media",{icon:"media",text:"Insert video",onclick:i,context:"insert",prependToContext:!0})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/nonbreaking/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/nonbreaking/plugin.min.js
deleted file mode 100644
index 866339c7..00000000
--- a/extlib/tinymce/js/tinymce/plugins/nonbreaking/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("nonbreaking",function(e){var t=e.getParam("nonbreaking_force_tab");if(e.addCommand("mceNonBreaking",function(){e.insertContent(e.plugins.visualchars&&e.plugins.visualchars.state?'<span data-mce-bogus="1" class="mce-nbsp">&nbsp;</span>':"&nbsp;")}),e.addButton("nonbreaking",{title:"Insert nonbreaking space",cmd:"mceNonBreaking"}),e.addMenuItem("nonbreaking",{text:"Nonbreaking space",cmd:"mceNonBreaking",context:"insert"}),t){var n=+t>1?+t:3;e.on("keydown",function(t){if(9==t.keyCode){if(t.shiftKey)return;t.preventDefault();for(var i=0;n>i;i++)e.execCommand("mceNonBreaking")}})}});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/noneditable/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/noneditable/plugin.min.js
deleted file mode 100644
index dd15d59e..00000000
--- a/extlib/tinymce/js/tinymce/plugins/noneditable/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("noneditable",function(e){function t(){function t(e){var t;if(1===e.nodeType){if(t=e.getAttribute(s),t&&"inherit"!==t)return t;if(t=e.contentEditable,"inherit"!==t)return t}return null}function n(e){for(var n;e;){if(n=t(e))return"false"===n?e:null;e=e.parentNode}}function i(e){for(;e;){if(e.id===g)return e;e=e.parentNode}}function o(e){var t;if(e)for(t=new r(e,e),e=t.current();e;e=t.next())if(3===e.nodeType)return e}function a(n,i){var o,a;return"false"===t(n)&&m.isBlock(n)?(f.select(n),void 0):(a=m.createRng(),"true"===t(n)&&(n.firstChild||n.appendChild(e.getDoc().createTextNode(" ")),n=n.firstChild,i=!0),o=m.create("span",{id:g,"data-mce-bogus":!0},p),i?n.parentNode.insertBefore(o,n):m.insertAfter(o,n),a.setStart(o.firstChild,1),a.collapse(!0),f.setRng(a),o)}function l(e){var t,n,a,r;if(e)t=f.getRng(!0),t.setStartBefore(e),t.setEndBefore(e),n=o(e),n&&n.nodeValue.charAt(0)==p&&(n=n.deleteData(0,1)),m.remove(e,!0),f.setRng(t);else for(a=i(f.getStart());(e=m.get(g))&&e!==r;)a!==e&&(n=o(e),n&&n.nodeValue.charAt(0)==p&&(n=n.deleteData(0,1)),m.remove(e,!0)),r=e}function d(){function e(e,n){var i,o,a,l,s;if(i=c.startContainer,o=c.startOffset,3==i.nodeType){if(s=i.nodeValue.length,o>0&&s>o||(n?o==s:0===o))return}else{if(!(o<i.childNodes.length))return n?null:e;var d=!n&&o>0?o-1:o;i=i.childNodes[d],i.hasChildNodes()&&(i=i.firstChild)}for(a=new r(i,e);l=a[n?"prev":"next"]();){if(3===l.nodeType&&l.nodeValue.length>0)return;if("true"===t(l))return l}return e}var i,o,s,c,d;l(),s=f.isCollapsed(),i=n(f.getStart()),o=n(f.getEnd()),(i||o)&&(c=f.getRng(!0),s?(i=i||o,(d=e(i,!0))?a(d,!0):(d=e(i,!1))?a(d,!1):f.select(i)):(c=f.getRng(!0),i&&c.setStartBefore(i),o&&c.setEndAfter(o),f.setRng(c)))}function u(o){function a(e,t){for(;e=e[t?"previousSibling":"nextSibling"];)if(3!==e.nodeType||e.nodeValue.length>0)return e}function s(e,t){f.select(e),f.collapse(t)}function u(o){function a(e){for(var t=s;t;){if(t===e)return;t=t.parentNode}m.remove(e),d()}function r(){var i,r,l=e.schema.getNonEmptyElements();for(r=new tinymce.dom.TreeWalker(s,e.getBody());(i=o?r.prev():r.next())&&!l[i.nodeName.toLowerCase()]&&!(3===i.nodeType&&tinymce.trim(i.nodeValue).length>0);)if("false"===t(i))return a(i),!0;return n(i)?!0:!1}var l,s,c,u;if(f.isCollapsed()){if(l=f.getRng(!0),s=l.startContainer,c=l.startOffset,s=i(s)||s,u=n(s))return a(u),!1;if(3==s.nodeType&&(o?c>0:c<s.nodeValue.length))return!0;if(1==s.nodeType&&(s=s.childNodes[c]||s),r())return!1}return!0}var g,p,h,y,v=o.keyCode;if(h=f.getStart(),y=f.getEnd(),g=n(h)||n(y),g&&(112>v||v>124)&&v!=c.DELETE&&v!=c.BACKSPACE){if((tinymce.isMac?o.metaKey:o.ctrlKey)&&(67==v||88==v||86==v))return;if(o.preventDefault(),v==c.LEFT||v==c.RIGHT){var b=v==c.LEFT;if(e.dom.isBlock(g)){var x=b?g.previousSibling:g.nextSibling,w=new r(x,x),C=b?w.prev():w.next();s(C,!b)}else s(g,b)}}else if(v==c.LEFT||v==c.RIGHT||v==c.BACKSPACE||v==c.DELETE){if(p=i(h)){if(v==c.LEFT||v==c.BACKSPACE)if(g=a(p,!0),g&&"false"===t(g)){if(o.preventDefault(),v!=c.LEFT)return m.remove(g),void 0;s(g,!0)}else l(p);if(v==c.RIGHT||v==c.DELETE)if(g=a(p),g&&"false"===t(g)){if(o.preventDefault(),v!=c.RIGHT)return m.remove(g),void 0;s(g,!1)}else l(p)}if((v==c.BACKSPACE||v==c.DELETE)&&!u(v==c.BACKSPACE))return o.preventDefault(),!1}}var m=e.dom,f=e.selection,g="mce_noneditablecaret",p="";e.on("mousedown",function(n){var i=e.selection.getNode();"false"===t(i)&&i==n.target&&d()}),e.on("mouseup keyup",d),e.on("keydown",u)}function n(t){var n=a.length,i=t.content,r=tinymce.trim(o);if("raw"!=t.format){for(;n--;)i=i.replace(a[n],function(t){var n=arguments,o=n[n.length-2];return o>0&&'"'==i.charAt(o-1)?t:'<span class="'+r+'" data-mce-content="'+e.dom.encode(n[0])+'">'+e.dom.encode("string"==typeof n[1]?n[1]:n[0])+"</span>"});t.content=i}}var i,o,a,r=tinymce.dom.TreeWalker,l="contenteditable",s="data-mce-"+l,c=tinymce.util.VK;i=" "+tinymce.trim(e.getParam("noneditable_editable_class","mceEditable"))+" ",o=" "+tinymce.trim(e.getParam("noneditable_noneditable_class","mceNonEditable"))+" ",a=e.getParam("noneditable_regexp"),a&&!a.length&&(a=[a]),e.on("PreInit",function(){t(),a&&e.on("BeforeSetContent",n),e.parser.addAttributeFilter("class",function(e){for(var t,n,a=e.length;a--;)n=e[a],t=" "+n.attr("class")+" ",-1!==t.indexOf(i)?n.attr(s,"true"):-1!==t.indexOf(o)&&n.attr(s,"false")}),e.serializer.addAttributeFilter(s,function(e){for(var t,n=e.length;n--;)t=e[n],a&&t.attr("data-mce-content")?(t.name="#text",t.type=3,t.raw=!0,t.value=t.attr("data-mce-content")):(t.attr(l,null),t.attr(s,null))}),e.parser.addAttributeFilter(l,function(e){for(var t,n=e.length;n--;)t=e[n],t.attr(s,t.attr(l)),t.attr(l,null)})})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/pagebreak/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/pagebreak/plugin.min.js
deleted file mode 100644
index 8f535fa1..00000000
--- a/extlib/tinymce/js/tinymce/plugins/pagebreak/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("pagebreak",function(e){var t,n="mce-pagebreak",i=e.getParam("pagebreak_separator","<!-- pagebreak -->"),a='<img src="'+tinymce.Env.transparentSrc+'" class="'+n+'" data-mce-resize="false" />';t=new RegExp(i.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(e){return"\\"+e}),"gi"),e.addCommand("mcePageBreak",function(){e.execCommand("mceInsertContent",0,a)}),e.addButton("pagebreak",{title:"Page break",cmd:"mcePageBreak"}),e.addMenuItem("pagebreak",{text:"Page break",icon:"pagebreak",cmd:"mcePageBreak",context:"insert"}),e.on("ResolveName",function(t){"IMG"==t.target.nodeName&&e.dom.hasClass(t.target,n)&&(t.name="pagebreak")}),e.on("click",function(t){t=t.target,"IMG"===t.nodeName&&e.dom.hasClass(t,n)&&e.selection.select(t)}),e.on("BeforeSetContent",function(e){e.content=e.content.replace(t,a)}),e.on("PreInit",function(){e.serializer.addNodeFilter("img",function(e){for(var t,n,a=e.length;a--;)t=e[a],n=t.attr("class"),n&&-1!==n.indexOf("mce-pagebreak")&&(t.type=3,t.value=i,t.raw=!0)})})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/paste/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/paste/plugin.min.js
deleted file mode 100644
index d1b15b7d..00000000
--- a/extlib/tinymce/js/tinymce/plugins/paste/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/pasteplugin/Clipboard",c="tinymce/Env",d="tinymce/util/Tools",u="tinymce/util/VK",f="tinymce/pasteplugin/WordFilter",p="tinymce/html/DomParser",m="tinymce/html/Schema",h="tinymce/html/Serializer",g="tinymce/html/Node",v="tinymce/pasteplugin/Quirks",y="tinymce/pasteplugin/Plugin",b="tinymce/PluginManager";r(l,[c,d,u],function(e,t,n){function r(){return!e.gecko&&("ClipboardEvent"in window||e.webkit&&"FocusEvent"in window)}return function(i){function o(){return(new Date).getTime()}function a(e){return n.metaKeyPressed(e)&&86==e.keyCode||e.shiftKey&&45==e.keyCode}function s(e){return e.innerText||e.textContent}function l(){return o()-h<100||"text"==m.pasteFormat}function c(e,n){return t.each(n,function(t){e=t.constructor==RegExp?e.replace(t,""):e.replace(t[0],t[1])}),e}function d(t){var n=i.fire("PastePreProcess",{content:t});t=n.content,i.settings.paste_data_images||(t=t.replace(/<img src=\"data:image[^>]+>/g,"")),(i.settings.paste_remove_styles||i.settings.paste_remove_styles_if_webkit!==!1&&e.webkit)&&(t=t.replace(/ style=\"[^\"]+\"/g,"")),n.isDefaultPrevented()||i.insertContent(t)}function u(e){e=i.dom.encode(e).replace(/\r\n/g,"\n");var t=i.dom.getParent(i.selection.getStart(),i.dom.isBlock);e=t&&/^(PRE|DIV)$/.test(t.nodeName)||!i.settings.forced_root_block?c(e,[[/\n/g,"<br>"]]):c(e,[[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]]);var n=i.fire("PastePreProcess",{content:e});n.isDefaultPrevented()||i.insertContent(n.content)}function f(){var e=i.dom.getViewPort().y,t=i.dom.add(i.getBody(),"div",{contentEditable:!1,"data-mce-bogus":"1",style:"position: absolute; top: "+e+"px; left: 0; width: 1px; height: 1px; overflow: hidden"},'<div contentEditable="true" data-mce-bogus="1">X</div>');return i.dom.bind(t,"beforedeactivate focusin focusout",function(e){e.stopPropagation()}),t}function p(e){i.dom.unbind(e),i.dom.remove(e)}var m=this,h;if(i.on("keydown",function(e){n.metaKeyPressed(e)&&e.shiftKey&&86==e.keyCode&&(h=o())}),r())i.on("paste",function(e){function t(e,t){for(var r=0;r<n.types.length;r++)if(n.types[r]==e)return t(n.getData(e)),!0}var n=e.clipboardData;n&&(e.preventDefault(),l()?t("text/plain",u)||t("text/html",d):t("text/html",d)||t("text/plain",u))});else{if(e.ie){var g=0;i.on("keydown",function(e){if(a(e)&&!e.isDefaultPrevented()){e.stopImmediatePropagation();var t=f();g=o(),i.dom.bind(t,"paste",function(){setTimeout(function(){i.selection.setRng(n),p(t),l()?u(s(t.firstChild)):d(t.firstChild.innerHTML)},0)});var n=i.selection.getRng();t.firstChild.focus(),t.firstChild.innerText=""}}),i.on("init",function(){var e=i.dom;i.dom.bind(i.getBody(),"paste",function(t){if(o()-g>100){var n,r=f();t.preventDefault(),e.bind(r,"paste",function(e){e.stopPropagation(),n=!0});var a=i.selection.getRng(),c=e.doc.body.createTextRange();if(c.moveToElementText(r.firstChild),c.execCommand("Paste"),p(r),!n)return i.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents."),void 0;i.selection.setRng(a),l()?u(s(r.firstChild)):d(r.firstChild.innerHTML)}})})}else i.on("init",function(){i.dom.bind(i.getBody(),"paste",function(e){e.preventDefault(),i.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents.")})}),i.on("keydown",function(e){if(a(e)&&!e.isDefaultPrevented()){e.stopImmediatePropagation();var t=f(),n=i.selection.getRng();i.selection.select(t,!0),i.dom.bind(t,"paste",function(e){e.stopPropagation(),setTimeout(function(){p(t),i.lastRng=n,i.selection.setRng(n);var e=t.firstChild;e.lastChild&&"BR"==e.lastChild.nodeName&&e.removeChild(e.lastChild),l()?u(s(e)):d(e.innerHTML)},0)})}});i.settings.paste_data_images||i.on("drop",function(e){var t=e.dataTransfer;t&&t.files&&t.files.length>0&&e.preventDefault()})}i.paste_block_drop&&i.on("dragend dragover draggesture dragdrop drop drag",function(e){e.preventDefault(),e.stopPropagation()}),this.paste=d,this.pasteText=u}}),r(f,[d,p,m,h,g],function(e,t,n,r,i){return function(o){var a=e.each;o.on("PastePreProcess",function(s){function l(e){a(e,function(e){u=e.constructor==RegExp?u.replace(e,""):u.replace(e[0],e[1])})}function c(e){function t(e,t,a,s){var l=e._listLevel||o;l!=o&&(o>l?n&&(n=n.parent.parent):(r=n,n=null)),n&&n.name==a?n.append(e):(r=r||n,n=new i(a,1),s>1&&n.attr("start",""+s),e.wrap(n)),e.name="li",t.value="";var c=t.next;c&&3==c.type&&(c.value=c.value.replace(/^\u00a0+/,"")),l>o&&r.lastChild.append(n),o=l}for(var n,r,o=1,a=e.getAll("p"),s=0;s<a.length;s++)if(e=a[s],"p"==e.name&&e.firstChild){for(var l="",c=e.firstChild;c&&!(l=c.value);)c=c.firstChild;if(/^\s*[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*$/.test(l)){t(e,c,"ul");continue}if(/^\s*\w+\./.test(l)){var d=/([0-9])\./.exec(l),u=1;d&&(u=parseInt(d[1],10)),t(e,c,"ol",u);continue}n=null}}function d(t,n){if("p"===t.name){var r=/mso-list:\w+ \w+([0-9]+)/.exec(n);r&&(t._listLevel=parseInt(r[1],10))}if(o.getParam("paste_retain_style_properties","none")){var i="";if(e.each(o.dom.parseStyle(n),function(e,t){switch(t){case"horiz-align":return t="text-align",void 0;case"vert-align":return t="vertical-align",void 0;case"font-color":case"mso-foreground":return t="color",void 0;case"mso-background":case"mso-highlight":t="background"}("all"==f||p&&p[t])&&(i+=t+":"+e+";")}),i)return i}return null}var u=s.content,f,p;if(f=o.settings.paste_retain_style_properties,f&&(p=e.makeMap(f)),o.settings.paste_enable_default_filters!==!1&&/class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(s.content)){s.wordContent=!0,l([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\xa0"],[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(e,t){return t.length>0?t.replace(/./," ").slice(Math.floor(t.length/2)).split("").join("\xa0"):""}]]);var m=new n({valid_elements:"@[style],-strong/b,-em/i,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-table,-tr,-td[colspan|rowspan],-th,-thead,-tfoot,-tbody,-a[!href],sub,sup,strike"}),h=new t({},m);h.addAttributeFilter("style",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("style",d(n,n.attr("style"))),"span"!=n.name||n.attributes.length||n.unwrap()});var g=h.parse(u);c(g),s.content=new r({},m).serialize(g)}})}}),r(v,[c,d],function(e,t){return function(n){function r(e){n.on("PastePreProcess",function(t){t.content=e(t.content)})}function i(e,n){return t.each(n,function(t){e=t.constructor==RegExp?e.replace(t,""):e.replace(t[0],t[1])}),e}function o(e){return e=i(e,[/^[\s\S]*<!--StartFragment-->|<!--EndFragment-->[\s\S]*$/g,[/<span class="Apple-converted-space">\u00a0<\/span>/g,"\xa0"],/<br>$/])}function a(e){if(!s){var r=[];t.each(n.schema.getBlockElements(),function(e,t){r.push(t)}),s=new RegExp("(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*(<\\/?("+r.join("|")+")[^>]*>)(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*","g")}return e=i(e,[[s,"$1"]]),e=i(e,[[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}var s;e.webkit&&r(o),e.ie&&r(a)}}),r(y,[b,l,f,v],function(e,t,n,r){var i;e.add("paste",function(e){var o=this,a;o.clipboard=a=new t(e),o.quirks=new r(e),o.wordFilter=new n(e),e.settings.paste_as_text&&(o.clipboard.pasteFormat="text"),e.addCommand("mceInsertClipboardContent",function(e,t){t.content&&o.clipboard.paste(t.content),t.text&&o.clipboard.pasteText(t.text)}),e.addMenuItem("pastetext",{text:"Paste as text",selectable:!0,active:a.pasteFormat,onclick:function(){"text"==a.pasteFormat?(this.active(!1),a.pasteFormat="html"):(a.pasteFormat="text",this.active(!0),i||(e.windowManager.alert("Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off."),i=!0))}})})}),a([l,f,v,y])}(this);
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/preview/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/preview/plugin.min.js
deleted file mode 100644
index b8430c64..00000000
--- a/extlib/tinymce/js/tinymce/plugins/preview/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("preview",function(e){var t=e.settings;e.addCommand("mcePreview",function(){e.windowManager.open({title:"Preview",width:parseInt(e.getParam("plugin_preview_width","650"),10),height:parseInt(e.getParam("plugin_preview_height","500"),10),html:'<iframe src="javascript:\'\'" frameborder="0"></iframe>',buttons:{text:"Close",onclick:function(){this.parent().parent().close()}},onPostRender:function(){var n,i=this.getEl("body").firstChild.contentWindow.document,a="";tinymce.each(e.contentCSS,function(t){a+='<link type="text/css" rel="stylesheet" href="'+e.documentBaseURI.toAbsolute(t)+'">'});var r=t.body_id||"tinymce";-1!=r.indexOf("=")&&(r=e.getParam("body_id","","hash"),r=r[e.id]||r);var o=t.body_class||"";-1!=o.indexOf("=")&&(o=e.getParam("body_class","","hash"),o=o[e.id]||""),n="<!DOCTYPE html><html><head>"+a+"</head>"+'<body id="'+r+'" class="mce-content-body '+o+'">'+e.getContent()+"</body>"+"</html>",i.open(),i.write(n),i.close()}})}),e.addButton("preview",{title:"Preview",cmd:"mcePreview"}),e.addMenuItem("preview",{text:"Preview",cmd:"mcePreview",context:"view"})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/print/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/print/plugin.min.js
deleted file mode 100644
index abc37b5f..00000000
--- a/extlib/tinymce/js/tinymce/plugins/print/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("print",function(t){t.addCommand("mcePrint",function(){t.getWin().print()}),t.addButton("print",{title:"Print",cmd:"mcePrint"}),t.addShortcut("Ctrl+P","","mcePrint"),t.addMenuItem("print",{text:"Print",cmd:"mcePrint",icon:"print",shortcut:"Ctrl+P",context:"file"})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/save/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/save/plugin.min.js
deleted file mode 100644
index 00cb68c6..00000000
--- a/extlib/tinymce/js/tinymce/plugins/save/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("save",function(e){function t(){var t,n;return t=tinymce.DOM.getParent(e.id,"form"),!e.getParam("save_enablewhendirty")||e.isDirty()?(tinymce.triggerSave(),(n=e.getParam("save_onsavecallback"))?(e.execCallback("save_onsavecallback",e)&&(e.startContent=tinymce.trim(e.getContent({format:"raw"})),e.nodeChanged()),void 0):(t?(e.isNotDirty=!0,(!t.onsubmit||t.onsubmit())&&("function"==typeof t.submit?t.submit():e.windowManager.alert("Error: Form submit field collision.")),e.nodeChanged()):e.windowManager.alert("Error: No form element found."),void 0)):void 0}function n(){var t,n=tinymce.trim(e.startContent);return(t=e.getParam("save_oncancelcallback"))?(e.execCallback("save_oncancelcallback",e),void 0):(e.setContent(n),e.undoManager.clear(),e.nodeChanged(),void 0)}function i(){var t=this;e.on("nodeChange",function(){t.disabled(!e.isDirty())})}e.addCommand("mceSave",t),e.addCommand("mceCancel",n),e.addButton("save",{icon:"save",text:"Save",cmd:"mceSave",disabled:!0,onPostRender:i}),e.addButton("cancel",{text:"Cancel",icon:!1,cmd:"mceCancel",disabled:!0,onPostRender:i}),e.addShortcut("ctrl+s","","mceSave")});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/searchreplace/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/searchreplace/plugin.min.js
deleted file mode 100644
index 56ffa92a..00000000
--- a/extlib/tinymce/js/tinymce/plugins/searchreplace/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){function e(e,t,n,i,a){function r(e,t){if(t=t||0,!e[0])throw"findAndReplaceDOMText cannot handle zero-length matches";var n=e.index;if(t>0){var i=e[t];if(!i)throw"Invalid capture group";n+=e[0].indexOf(i),e[0]=i}return[n,n+e[0].length,[e[0]]]}function o(e){var t;if(3===e.nodeType)return e.data;if(f[e.nodeName])return"";if(t="",(m[e.nodeName]||g[e.nodeName])&&(t+="\n"),e=e.firstChild)do t+=o(e);while(e=e.nextSibling);return t}function l(e,t,n){var i,a,r,o,l=[],c=0,s=e,d=t.shift(),u=0;e:for(;;){if((m[s.nodeName]||g[s.nodeName])&&c++,3===s.nodeType&&(!a&&s.length+c>=d[1]?(a=s,o=d[1]-c):i&&l.push(s),!i&&s.length+c>d[0]&&(i=s,r=d[0]-c),c+=s.length),i&&a){if(s=n({startNode:i,startNodeIndex:r,endNode:a,endNodeIndex:o,innerNodes:l,match:d[2],matchIndex:u}),c-=a.length-o,i=null,a=null,l=[],d=t.shift(),u++,!d)break}else{if(!f[s.nodeName]&&s.firstChild){s=s.firstChild;continue}if(s.nextSibling){s=s.nextSibling;continue}}for(;;){if(s.nextSibling){s=s.nextSibling;break}if(s.parentNode===e)break e;s=s.parentNode}}}function c(e){var t;if("function"!=typeof e){var n=e.nodeType?e:u.createElement(e);t=function(e,t){var i=n.cloneNode(!1);return i.setAttribute("data-mce-index",t),e&&i.appendChild(u.createTextNode(e)),i}}else t=e;return function(e){var n,i,a,r=e.startNode,o=e.endNode,l=e.matchIndex;if(r===o){var c=r;a=c.parentNode,e.startNodeIndex>0&&(n=u.createTextNode(c.data.substring(0,e.startNodeIndex)),a.insertBefore(n,c));var s=t(e.match[0],l);return a.insertBefore(s,c),e.endNodeIndex<c.length&&(i=u.createTextNode(c.data.substring(e.endNodeIndex)),a.insertBefore(i,c)),c.parentNode.removeChild(c),s}n=u.createTextNode(r.data.substring(0,e.startNodeIndex)),i=u.createTextNode(o.data.substring(e.endNodeIndex));for(var d=t(r.data.substring(e.startNodeIndex),l),m=[],f=0,g=e.innerNodes.length;g>f;++f){var h=e.innerNodes[f],p=t(h.data,l);h.parentNode.replaceChild(p,h),m.push(p)}var v=t(o.data.substring(0,e.endNodeIndex),l);return a=r.parentNode,a.insertBefore(n,r),a.insertBefore(d,r),a.removeChild(r),a=o.parentNode,a.insertBefore(v,o),a.insertBefore(i,o),a.removeChild(o),v}}var s,d,u,m,f,g,h=[],p=0;if(u=t.ownerDocument,m=a.getBlockElements(),f=a.getWhiteSpaceElements(),g=a.getShortEndedElements(),d=o(t)){if(e.global)for(;s=e.exec(d);)h.push(r(s,i));else s=d.match(e),h.push(r(s,i));return h.length&&(p=h.length,l(t,h,c(n))),p}}function t(t){function n(){var e=tinymce.ui.Factory.create({type:"window",layout:"flex",pack:"center",align:"center",onClose:function(){t.focus(),o=!1,l.unmarkAllMatches()},buttons:[{text:"Find",onclick:function(){e.find("form")[0].submit()}},{text:"Replace",disabled:!0,onclick:function(){l.replace(e.find("#replace").value())||e.statusbar.items().slice(1).disabled(!0)}},{text:"Replace all",disabled:!0,onclick:function(){l.replaceAll(e.find("#replace").value()),e.statusbar.items().slice(1).disabled(!0)}},{type:"spacer",flex:1},{text:"Prev",disabled:!0,onclick:function(){l.prev()}},{text:"Next",disabled:!0,onclick:function(){l.next()}}],title:"Find and replace",items:{type:"form",padding:20,labelGap:30,spacing:10,onsubmit:function(t){var n,i,a,r,o;return t.preventDefault(),a=e.find("#case").checked(),o=e.find("#words").checked(),r=e.find("#find").value(),r.length?(r=r.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),r=o?"\\b"+r+"\\b":r,i=new RegExp(r,a?"g":"gi"),n=l.markAllMatches(i),n?l.first():tinymce.ui.MessageBox.alert("Could not find the specified string."),e.statusbar.items().slice(1).disabled(0===n),void 0):(l.unmarkAllMatches(),e.statusbar.items().slice(1).disabled(!0),void 0)},items:[{type:"textbox",name:"find",size:40,label:"Find",value:t.selection.getNode().src},{type:"textbox",name:"replace",size:40,label:"Replace with"},{type:"checkbox",name:"case",text:"Match case",label:" "},{type:"checkbox",name:"words",text:"Whole words",label:" "}]}}).renderTo().reflow();o=!0}function i(e){var t=e.parentNode;t.insertBefore(e.firstChild,e),e.parentNode.removeChild(e)}function a(e,n){function i(){var i,o;for(i=n?t.getBody()[e?"firstChild":"lastChild"]:l[e?"endContainer":"startContainer"],o=new tinymce.dom.TreeWalker(i,t.getBody());i=o.current();){if(1==i.nodeType&&"SPAN"==i.nodeName&&null!==i.getAttribute("data-mce-index"))for(c=i.getAttribute("data-mce-index"),a=i.firstChild;i=o.current();){if(1==i.nodeType&&"SPAN"==i.nodeName&&null!==i.getAttribute("data-mce-index")){if(i.getAttribute("data-mce-index")!==c)return;r=i.firstChild}o[e?"next":"prev"]()}o[e?"next":"prev"]()}}var a,r,o=t.selection,l=o.getRng(!0),c=-1;return e=e!==!1,i(),a&&r&&(t.focus(),e?(l.setStart(a,0),l.setEnd(r,r.length)):(l.setStart(r,0),l.setEnd(a,a.length)),o.scrollIntoView(a.parentNode),o.setRng(l)),c}function r(e){e.parentNode.removeChild(e)}var o,l=this,c=-1;l.init=function(e){e.addMenuItem("searchreplace",{text:"Find and replace",shortcut:"Ctrl+F",onclick:n,separator:"before",context:"edit"}),e.addButton("searchreplace",{tooltip:"Find and replace",shortcut:"Ctrl+F",onclick:n}),e.shortcuts.add("Ctrl+F","",n)},l.markAllMatches=function(n){var i,a;return a=t.dom.create("span",{"class":"mce-match-marker","data-mce-bogus":1}),i=t.getBody(),l.unmarkAllMatches(i),e(n,i,a,!1,t.schema)},l.first=function(){return c=a(!0,!0),-1!==c},l.next=function(){return c=a(!0),-1!==c},l.prev=function(){return c=a(!1),-1!==c},l.replace=function(e,n,o){var l,s,d,u,m,f;if(-1===c&&(c=a(n)),f=a(n),d=t.getBody(),s=tinymce.toArray(d.getElementsByTagName("span")),s.length)for(l=0;l<s.length;l++){var g=s[l].getAttribute("data-mce-index");if(null!==g&&g.length&&(u=m=s[l].getAttribute("data-mce-index"),o||u===c))for(e.length?(s[l].firstChild.nodeValue=e,i(s[l])):r(s[l]);s[++l];)if(u=s[l].getAttribute("data-mce-index"),null!==g&&g.length){if(u!==m){l--;break}r(s[l])}}return-1==f&&(f=a(n,!0)),c=f,o&&t.selection.setCursorLocation(t.getBody(),0),t.undoManager.add(),-1!==c},l.replaceAll=function(e){l.replace(e,!0,!0)},l.unmarkAllMatches=function(){var e,n,a;for(a=t.getBody(),n=a.getElementsByTagName("span"),e=n.length;e--;)a=n[e],a.getAttribute("data-mce-index")&&i(a)},t.on("beforeaddundo keydown",function(e){return o?(e.preventDefault(),!1):void 0})}tinymce.PluginManager.add("searchreplace",t)}();
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/spellchecker/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/spellchecker/plugin.min.js
deleted file mode 100644
index 9cbf0315..00000000
--- a/extlib/tinymce/js/tinymce/plugins/spellchecker/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],o=0;o<e.length;++o){if(n=s[e[o]]||i(e[o]),!n)throw"module definition dependecy not found: "+e[o];r.push(n)}t.apply(null,r)}function r(e,r,o){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(o===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=o.apply(null,arguments)})}function o(e){return!!s[e]}function i(t){for(var n=e,r=t.split(/[.\/]/),o=0;o<r.length;++o){if(!n[r[o]])return;n=n[r[o]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var o=e,i=n[r],a=i.split(/[.\/]/),l=0;l<a.length-1;++l)o[a[l]]===t&&(o[a[l]]={}),o=o[a[l]];o[a[a.length-1]]=s[i]}}var s={},l="tinymce/spellcheckerplugin/DomTextMatcher",c="tinymce/spellcheckerplugin/Plugin",d="tinymce/PluginManager",u="tinymce/util/Tools",f="tinymce/ui/Menu",p="tinymce/dom/DOMUtils",m="tinymce/util/JSONRequest",h="tinymce/util/URI";r(l,[],function(){return function(e,t,n){function r(e){if(!e[0])throw"findAndReplaceDOMText cannot handle zero-length matches";var t=e.index;return[t,t+e[0].length,[e[0]]]}function o(e){var t;if(3===e.nodeType)return e.data;if(g[e.nodeName])return"";if(t="",(h[e.nodeName]||v[e.nodeName])&&(t+="\n"),e=e.firstChild)do t+=o(e);while(e=e.nextSibling);return t}function i(e,t,n){var r,o,i,a,s=[],l=0,c=e,d=t.shift(),u=0;e:for(;;){if((h[c.nodeName]||v[c.nodeName])&&l++,3===c.nodeType&&(!o&&c.length+l>=d[1]?(o=c,a=d[1]-l):r&&s.push(c),!r&&c.length+l>d[0]&&(r=c,i=d[0]-l),l+=c.length),r&&o){if(c=n({startNode:r,startNodeIndex:i,endNode:o,endNodeIndex:a,innerNodes:s,match:d[2],matchIndex:u}),l-=o.length-a,r=null,o=null,s=[],d=t.shift(),u++,!d)break}else{if(!g[c.nodeName]&&c.firstChild){c=c.firstChild;continue}if(c.nextSibling){c=c.nextSibling;continue}}for(;;){if(c.nextSibling){c=c.nextSibling;break}if(c.parentNode===e)break e;c=c.parentNode}}}function a(e){var t;if("function"!=typeof e){var n=e.nodeType?e:m.createElement(e);t=function(e,t){var r=n.cloneNode(!1);return r.setAttribute("data-mce-index",t),e&&r.appendChild(m.createTextNode(e)),r}}else t=e;return function r(e){var n,r,o,i=e.startNode,a=e.endNode,s=e.matchIndex;if(i===a){var l=i;o=l.parentNode,e.startNodeIndex>0&&(n=m.createTextNode(l.data.substring(0,e.startNodeIndex)),o.insertBefore(n,l));var c=t(e.match[0],s);return o.insertBefore(c,l),e.endNodeIndex<l.length&&(r=m.createTextNode(l.data.substring(e.endNodeIndex)),o.insertBefore(r,l)),l.parentNode.removeChild(l),c}n=m.createTextNode(i.data.substring(0,e.startNodeIndex)),r=m.createTextNode(a.data.substring(e.endNodeIndex));for(var d=t(i.data.substring(e.startNodeIndex),s),u=[],f=0,p=e.innerNodes.length;p>f;++f){var h=e.innerNodes[f],g=t(h.data,s);h.parentNode.replaceChild(g,h),u.push(g)}var v=t(a.data.substring(0,e.endNodeIndex),s);return o=i.parentNode,o.insertBefore(n,i),o.insertBefore(d,i),o.removeChild(i),o=a.parentNode,o.insertBefore(v,a),o.insertBefore(r,a),o.removeChild(a),v}}function s(e){var t=[];return l(function(n,r){e(n,r)&&t.push(n)}),u=t,this}function l(e){for(var t=0,n=u.length;n>t&&e(u[t],t)!==!1;t++);return this}function c(e){return u.length&&(p=u.length,i(t,u,a(e))),this}var d,u=[],f,p=0,m,h,g,v;if(m=t.ownerDocument,h=n.getBlockElements(),g=n.getWhiteSpaceElements(),v=n.getShortEndedElements(),f=o(t),f&&e.global)for(;d=e.exec(f);)u.push(r(d));return{text:f,count:p,matches:u,each:l,filter:s,mark:c}}}),r(c,[l,d,u,f,p,m,h],function(e,t,n,r,o,i,a){t.add("spellchecker",function(t,s){function l(e){for(var t in e)return!1;return!0}function c(e,i){var a=[],s=g[i];n.each(s,function(e){a.push({text:e,onclick:function(){t.insertContent(e),u()}})}),a.push.apply(a,[{text:"-"},{text:"Ignore",onclick:function(){p(e,i)}},{text:"Ignore all",onclick:function(){p(e,i,!0)}},{text:"Finish",onclick:m}]),y=new r({items:a,context:"contextmenu",onautohide:function(e){-1!=e.target.className.indexOf("spellchecker")&&e.preventDefault()},onhide:function(){y.remove(),y=null}}),y.renderTo(document.body);var l=o.DOM.getPos(t.getContentAreaContainer()),c=t.dom.getPos(e);l.x+=c.x,l.y+=c.y,y.moveTo(l.x,l.y+e.offsetHeight)}function d(){function n(e){return t.setProgressState(!1),l(e)?(t.windowManager.alert("No misspellings found"),v=!1,void 0):(g=e,o.filter(function(t){return!!e[t[2][0]]}).mark(t.dom.create("span",{"class":"mce-spellchecker-word","data-mce-bogus":1})),o=null,t.fire("SpellcheckStart"),void 0)}function r(e,n,r){i.sendRPC({url:new a(s).toAbsolute(b.spellchecker_rpc_url),method:e,params:{lang:b.spellchecker_language||"en",words:n},success:function(e){r(e)},error:function(e,n){e="JSON Parse error."==e?"Non JSON response:"+n.responseText:"Error: "+e,t.windowManager.alert(e),t.setProgressState(!1),o=null,v=!1}})}var o,c=[],d={};if(v)return m(),void 0;v=!0;var u=t.getParam("spellchecker_wordchar_pattern")||new RegExp('[^\\s!"#$%&()*+,-./:;<=>?@[\\]^_{|}`\xa7\xa9\xab\xae\xb1\xb6\xb7\xb8\xbb\xbc\xbd\xbe\xbf\xd7\xf7\xa4\u201d\u201c\u201e]+',"g");o=new e(u,t.getBody(),t.schema).each(function(e){var t=e[2][0];if(!d[t]){if(/^\d+$/.test(t)||1==t.length)return;c.push(t),d[t]=!0}}),t.setProgressState(!0);var f=b.spellchecker_callback||r;f("spellcheck",c,n)}function u(){t.dom.select("span.mce-spellchecker-word").length||m()}function f(e){var t=e.parentNode;t.insertBefore(e.firstChild,e),e.parentNode.removeChild(e)}function p(e,r,o){o?n.each(t.dom.select("span.mce-spellchecker-word"),function(e){var t=e.innerText||e.textContent;t==r&&f(e)}):f(e),u()}function m(){var e,n,r;for(v=!1,r=t.getBody(),n=r.getElementsByTagName("span"),e=n.length;e--;)r=n[e],r.getAttribute("data-mce-index")&&f(r);t.fire("SpellcheckEnd")}function h(e){var n,r,o,i=-1,a,s;for(e=""+e,n=t.getBody().getElementsByTagName("span"),r=0;r<n.length&&(o=n[r],"mce-spellchecker-word"!=o.className||(i=o.getAttribute("data-mce-index"),i===e&&(i=e,a||(a=o.firstChild),s=o.firstChild),i===e||!s));r++);var l=t.dom.createRng();return l.setStart(a,0),l.setEnd(s,s.length),t.selection.setRng(l),l}var g,v,y,b=t.settings;t.on("click",function(e){if("mce-spellchecker-word"==e.target.className){e.preventDefault();var t=h(e.target.getAttribute("data-mce-index"));c(e.target,t.toString())}}),t.addMenuItem("spellchecker",{text:"Spellcheck",context:"tools",onclick:d,selectable:!0,onPostRender:function(){var e=this;t.on("SpellcheckStart SpellcheckEnd",function(){e.active(v)})}}),t.addButton("spellchecker",{tooltip:"Spellcheck",onclick:d,onPostRender:function(){var e=this;t.on("SpellcheckStart SpellcheckEnd",function(){e.active(v)})}}),t.on("remove",function(){y&&(y.remove(),y=null)})})}),a([l,c])}(this);
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/tabfocus/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/tabfocus/plugin.min.js
deleted file mode 100644
index bd71785a..00000000
--- a/extlib/tinymce/js/tinymce/plugins/tabfocus/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("tabfocus",function(e){function n(e){9===e.keyCode&&e.preventDefault()}function t(n){function t(n){function t(e){return"BODY"===e.nodeName||"hidden"!=e.type&&"none"!=e.style.display&&"hidden"!=e.style.visibility&&t(e.parentNode)}function r(e){return e.tabIndex||"INPUT"==e.nodeName||"TEXTAREA"==e.nodeName}function a(e){return!r(e)&&"-1"!=e.getAttribute("tabindex")&&t(e)}if(d=i.select(":input:enabled,*[tabindex]:not(iframe)"),o(d,function(n,t){return n.id==e.id?(u=t,!1):void 0}),n>0){for(c=u+1;c<d.length;c++)if(a(d[c]))return d[c]}else for(c=u-1;c>=0;c--)if(a(d[c]))return d[c];return null}var u,d,a,c;if(9===n.keyCode&&(a=r(e.getParam("tab_focus",e.getParam("tabfocus_elements",":prev,:next"))),1==a.length&&(a[1]=a[0],a[0]=":prev"),d=n.shiftKey?":prev"==a[0]?t(-1):i.get(a[0]):":next"==a[1]?t(1):i.get(a[1]))){var f=tinymce.get(d.id||d.name);d.id&&f?f.focus():window.setTimeout(function(){tinymce.Env.webkit||window.focus(),d.focus()},10),n.preventDefault()}}var i=tinymce.DOM,o=tinymce.each,r=tinymce.explode;e.on("init",function(){e.inline&&tinymce.DOM.setAttrib(e.getBody(),"tabIndex",null)}),e.on("keyup",n),tinymce.Env.gecko?e.on("keypress keydown",t):e.on("keydown",t)});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/table/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/table/plugin.min.js
deleted file mode 100644
index c7c2e8ed..00000000
--- a/extlib/tinymce/js/tinymce/plugins/table/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/tableplugin/TableGrid",c="tinymce/util/Tools",d="tinymce/Env",u="tinymce/tableplugin/Quirks",f="tinymce/util/VK",p="tinymce/tableplugin/CellSelection",m="tinymce/dom/TreeWalker",h="tinymce/tableplugin/Plugin",g="tinymce/PluginManager";r(l,[c,d],function(e,t){function n(e,t){return parseInt(e.getAttribute(t)||1,10)}var r=e.each;return function(i,o){function a(){var e=0;R=[],r(["thead","tbody","tfoot"],function(t){var i=H.select("> "+t+" tr",o);r(i,function(i,o){o+=e,r(H.select("> td, > th",i),function(e,r){var i,a,s,l;if(R[o])for(;R[o][r];)r++;for(s=n(e,"rowspan"),l=n(e,"colspan"),a=o;o+s>a;a++)for(R[a]||(R[a]=[]),i=r;r+l>i;i++)R[a][i]={part:t,real:a==o&&i==r,elm:e,rowspan:s,colspan:l}})}),e+=i.length})}function s(e,t){return e=e.cloneNode(t),e.removeAttribute("id"),e}function l(e,t){var n;return n=R[t],n?n[e]:void 0}function c(e,t,n){e&&(n=parseInt(n,10),1===n?e.removeAttribute(t,1):e.setAttribute(t,n,1))}function d(e){return e&&(H.hasClass(e.elm,"mce-item-selected")||e==P)}function u(){var e=[];return r(o.rows,function(t){r(t.cells,function(n){return H.hasClass(n,"mce-item-selected")||n==P.elm?(e.push(t),!1):void 0})}),e}function f(){var e=H.createRng();e.setStartAfter(o),e.setEndAfter(o),M.setRng(e),H.remove(o)}function p(n){var o,a={};return i.settings.table_clone_elements!==!1&&(a=e.makeMap((i.settings.table_clone_elements||"strong em b i span font h1 h2 h3 h4 h5 h6 p div").toUpperCase(),/[ ,]/)),e.walk(n,function(e){var i;return 3==e.nodeType?(r(H.getParents(e.parentNode,null,n).reverse(),function(e){a[e.nodeName]&&(e=s(e,!1),o?i&&i.appendChild(e):o=i=e,i=e)}),i&&(i.innerHTML=t.ie?"&nbsp;":'<br data-mce-bogus="1" />'),!1):void 0},"childNodes"),n=s(n,!1),c(n,"rowSpan",1),c(n,"colSpan",1),o?n.appendChild(o):t.ie||(n.innerHTML='<br data-mce-bogus="1" />'),n}function m(){var e=H.createRng(),t;return r(H.select("tr",o),function(e){0===e.cells.length&&H.remove(e)}),0===H.select("tr",o).length?(e.setStartBefore(o),e.setEndBefore(o),M.setRng(e),H.remove(o),void 0):(r(H.select("thead,tbody,tfoot",o),function(e){0===e.rows.length&&H.remove(e)}),a(),t=R[Math.min(R.length-1,A.y)],t&&(M.select(t[Math.min(t.length-1,A.x)].elm,!0),M.collapse(!0)),void 0)}function h(e,t,n,r){var i,o,a,s,l;for(i=R[t][e].elm.parentNode,a=1;n>=a;a++)if(i=H.getNext(i,"tr")){for(o=e;o>=0;o--)if(l=R[t+a][o].elm,l.parentNode==i){for(s=1;r>=s;s++)H.insertAfter(p(l),l);break}if(-1==o)for(s=1;r>=s;s++)i.insertBefore(p(i.cells[0]),i.cells[0])}}function g(){r(R,function(e,t){r(e,function(e,r){var i,o,a;if(d(e)&&(e=e.elm,i=n(e,"colspan"),o=n(e,"rowspan"),i>1||o>1)){for(c(e,"rowSpan",1),c(e,"colSpan",1),a=0;i-1>a;a++)H.insertAfter(p(e),e);h(r,t,o-1,i)}})})}function v(t,n,i){var o,s,u,f,p,h,v,y,b,C,x;if(t?(o=S(t),s=o.x,u=o.y,f=s+(n-1),p=u+(i-1)):(A=B=null,r(R,function(e,t){r(e,function(e,n){d(e)&&(A||(A={x:n,y:t}),B={x:n,y:t})})}),s=A.x,u=A.y,f=B.x,p=B.y),y=l(s,u),b=l(f,p),y&&b&&y.part==b.part){for(g(),a(),y=l(s,u).elm,c(y,"colSpan",f-s+1),c(y,"rowSpan",p-u+1),v=u;p>=v;v++)for(h=s;f>=h;h++)R[v]&&R[v][h]&&(t=R[v][h].elm,t!=y&&(C=e.grep(t.childNodes),r(C,function(e){y.appendChild(e)}),C.length&&(C=e.grep(y.childNodes),x=0,r(C,function(e){"BR"==e.nodeName&&H.getAttrib(e,"data-mce-bogus")&&x++<C.length-1&&y.removeChild(e)})),H.remove(t)));m()}}function y(e){var t,i,o,a,l,u,f,m,h;for(r(R,function(n,i){return r(n,function(n){return d(n)&&(n=n.elm,l=n.parentNode,u=s(l,!1),t=i,e)?!1:void 0}),e?!t:void 0}),a=0;a<R[0].length;a++)if(R[t][a]&&(i=R[t][a].elm,i!=o)){if(e){if(t>0&&R[t-1][a]&&(m=R[t-1][a].elm,h=n(m,"rowSpan"),h>1)){c(m,"rowSpan",h+1);continue}}else if(h=n(i,"rowspan"),h>1){c(i,"rowSpan",h+1);continue}f=p(i),c(f,"colSpan",i.colSpan),u.appendChild(f),o=i}u.hasChildNodes()&&(e?l.parentNode.insertBefore(u,l):H.insertAfter(u,l))}function b(e){var t,i;r(R,function(n){return r(n,function(n,r){return d(n)&&(t=r,e)?!1:void 0}),e?!t:void 0}),r(R,function(r,o){var a,s,l;r[t]&&(a=r[t].elm,a!=i&&(l=n(a,"colspan"),s=n(a,"rowspan"),1==l?e?(a.parentNode.insertBefore(p(a),a),h(t,o,s-1,l)):(H.insertAfter(p(a),a),h(t,o,s-1,l)):c(a,"colSpan",a.colSpan+1),i=a))})}function C(){var t=[];r(R,function(i){r(i,function(i,o){d(i)&&-1===e.inArray(t,o)&&(r(R,function(e){var t=e[o].elm,r;r=n(t,"colSpan"),r>1?c(t,"colSpan",r-1):H.remove(t)}),t.push(o))})}),m()}function x(){function e(e){var t,i,o;t=H.getNext(e,"tr"),r(e.cells,function(e){var t=n(e,"rowSpan");t>1&&(c(e,"rowSpan",t-1),i=S(e),h(i.x,i.y,1,1))}),i=S(e.cells[0]),r(R[i.y],function(e){var t;e=e.elm,e!=o&&(t=n(e,"rowSpan"),1>=t?H.remove(e):c(e,"rowSpan",t-1),o=e)})}var t;t=u(),r(t.reverse(),function(t){e(t)}),m()}function w(){var e=u();return H.remove(e),m(),e}function _(){var e=u();return r(e,function(t,n){e[n]=s(t,!0)}),e}function N(e,t){var n=u(),i=n[t?0:n.length-1],o=i.cells.length;e&&(r(R,function(e){var t;return o=0,r(e,function(e){e.real&&(o+=e.colspan),e.elm.parentNode==i&&(t=1)}),t?!1:void 0}),t||e.reverse(),r(e,function(e){var n,r=e.cells.length,a;for(n=0;r>n;n++)a=e.cells[n],c(a,"colSpan",1),c(a,"rowSpan",1);for(n=r;o>n;n++)e.appendChild(p(e.cells[r-1]));for(n=o;r>n;n++)H.remove(e.cells[n]);t?i.parentNode.insertBefore(e,i):H.insertAfter(e,i)}),H.removeClass(H.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"))}function S(e){var t;return r(R,function(n,i){return r(n,function(n,r){return n.elm==e?(t={x:r,y:i},!1):void 0}),!t}),t}function E(e){A=S(e)}function k(){var e,t;return e=t=0,r(R,function(n,i){r(n,function(n,r){var o,a;d(n)&&(n=R[i][r],r>e&&(e=r),i>t&&(t=i),n.real&&(o=n.colspan-1,a=n.rowspan-1,o&&r+o>e&&(e=r+o),a&&i+a>t&&(t=i+a)))})}),{x:e,y:t}}function T(e){var t,n,r,i,o,a,s,l,c,d;if(B=S(e),A&&B){for(t=Math.min(A.x,B.x),n=Math.min(A.y,B.y),r=Math.max(A.x,B.x),i=Math.max(A.y,B.y),o=r,a=i,d=n;a>=d;d++)e=R[d][t],e.real||t-(e.colspan-1)<t&&(t-=e.colspan-1);for(c=t;o>=c;c++)e=R[n][c],e.real||n-(e.rowspan-1)<n&&(n-=e.rowspan-1);for(d=n;i>=d;d++)for(c=t;r>=c;c++)e=R[d][c],e.real&&(s=e.colspan-1,l=e.rowspan-1,s&&c+s>o&&(o=c+s),l&&d+l>a&&(a=d+l));for(H.removeClass(H.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"),d=n;a>=d;d++)for(c=t;o>=c;c++)R[d][c]&&H.addClass(R[d][c].elm,"mce-item-selected")}}var R,A,B,P,M=i.selection,H=M.dom;o=o||H.getParent(M.getStart(),"table"),a(),P=H.getParent(M.getStart(),"th,td"),P&&(A=S(P),B=k(),P=l(A.x,A.y)),e.extend(this,{deleteTable:f,split:g,merge:v,insertRow:y,insertCol:b,deleteCols:C,deleteRows:x,cutRows:w,copyRows:_,pasteRows:N,getPos:S,setStartCell:E,setEndCell:T})}}),r(u,[f,d,c],function(e,t,n){function r(e,t){return parseInt(e.getAttribute(t)||1,10)}var i=n.each;return function(n){function o(){function t(t){function o(e,r){var i=e?"previousSibling":"nextSibling",o=n.dom.getParent(r,"tr"),s=o[i];if(s)return g(n,r,s,e),t.preventDefault(),!0;var d=n.dom.getParent(o,"table"),u=o.parentNode,f=u.nodeName.toLowerCase();if("tbody"===f||f===(e?"tfoot":"thead")){var p=a(e,d,u,"tbody");if(null!==p)return l(e,p,r)}return c(e,o,i,d)}function a(e,t,r,i){var o=n.dom.select(">"+i,t),a=o.indexOf(r);if(e&&0===a||!e&&a===o.length-1)return s(e,t);if(-1===a){var l="thead"===r.tagName.toLowerCase()?0:o.length-1;return o[l]}return o[a+(e?-1:1)]}function s(e,t){var r=e?"thead":"tfoot",i=n.dom.select(">"+r,t);return 0!==i.length?i[0]:null}function l(e,r,i){var o=d(r,e);return o&&g(n,i,o,e),t.preventDefault(),!0}function c(e,r,i,a){var s=a[i];if(s)return u(s),!0;var l=n.dom.getParent(a,"td,th");if(l)return o(e,l,t);var c=d(r,!e);return u(c),t.preventDefault(),!1}function d(e,t){var r=e&&e[t?"lastChild":"firstChild"];return r&&"BR"===r.nodeName?n.dom.getParent(r,"td,th"):r}function u(e){n.selection.setCursorLocation(e,0)}function f(){return b==e.UP||b==e.DOWN}function p(e){var t=e.selection.getNode(),n=e.dom.getParent(t,"tr");return null!==n}function m(e){for(var t=0,n=e;n.previousSibling;)n=n.previousSibling,t+=r(n,"colspan");return t}function h(e,t){var n=0,o=0;return i(e.children,function(e,i){return n+=r(e,"colspan"),o=i,n>t?!1:void 0}),o}function g(e,t,r,i){var o=m(n.dom.getParent(t,"td,th")),a=h(r,o),s=r.childNodes[a],l=d(s,i);u(l||s)}function v(e){var t=n.selection.getNode(),r=n.dom.getParent(t,"td,th"),i=n.dom.getParent(e,"td,th");return r&&r!==i&&y(r,i)}function y(e,t){return n.dom.getParent(e,"TABLE")===n.dom.getParent(t,"TABLE")}var b=t.keyCode;if(f()&&p(n)){var C=n.selection.getNode();setTimeout(function(){v(C)&&o(!t.shiftKey&&b===e.UP,C,t)},0)}}n.on("KeyDown",function(e){t(e)})}function a(){function e(e,t){var n=t.ownerDocument,r=n.createRange(),i;return r.setStartBefore(t),r.setEnd(e.endContainer,e.endOffset),i=n.createElement("body"),i.appendChild(r.cloneContents()),0===i.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length}n.on("KeyDown",function(t){var r,i,o=n.dom;(37==t.keyCode||38==t.keyCode)&&(r=n.selection.getRng(),i=o.getParent(r.startContainer,"table"),i&&n.getBody().firstChild==i&&e(r,i)&&(r=o.createRng(),r.setStartBefore(i),r.setEndBefore(i),n.selection.setRng(r),t.preventDefault()))})}function s(){n.on("KeyDown SetContent VisualAid",function(){var e;for(e=n.getBody().lastChild;e;e=e.previousSibling)if(3==e.nodeType){if(e.nodeValue.length>0)break}else if(1==e.nodeType&&!e.getAttribute("data-mce-bogus"))break;e&&"TABLE"==e.nodeName&&(n.settings.forced_root_block?n.dom.add(n.getBody(),n.settings.forced_root_block,null,t.ie?"&nbsp;":'<br data-mce-bogus="1" />'):n.dom.add(n.getBody(),"br",{"data-mce-bogus":"1"}))}),n.on("PreProcess",function(e){var t=e.node.lastChild;t&&("BR"==t.nodeName||1==t.childNodes.length&&("BR"==t.firstChild.nodeName||"\xa0"==t.firstChild.nodeValue))&&t.previousSibling&&"TABLE"==t.previousSibling.nodeName&&n.dom.remove(t)})}function l(){function e(e,t,n,r){var i=3,o=e.dom.getParent(t.startContainer,"TABLE"),a,s,l;return o&&(a=o.parentNode),s=t.startContainer.nodeType==i&&0===t.startOffset&&0===t.endOffset&&r&&("TR"==n.nodeName||n==a),l=("TD"==n.nodeName||"TH"==n.nodeName)&&!r,s||l}function t(){var t=n.selection.getRng(),r=n.selection.getNode(),i=n.dom.getParent(t.startContainer,"TD,TH");if(e(n,t,r,i)){i||(i=r);for(var o=i.lastChild;o.lastChild;)o=o.lastChild;t.setEnd(o,o.nodeValue.length),n.selection.setRng(t)}}n.on("KeyDown",function(){t()}),n.on("MouseDown",function(e){2!=e.button&&t()})}t.webkit&&(o(),l()),t.gecko&&(a(),s())}}),r(p,[l,m,c],function(e,t,n){return function(r){function i(){r.getBody().style.webkitUserSelect="",c&&(r.dom.removeClass(r.dom.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"),c=!1)}var o=r.dom,a,s,l,c=!0;return r.on("MouseDown",function(e){2!=e.button&&(i(),s=o.getParent(e.target,"td,th"),l=o.getParent(s,"table"))}),o.bind(r.getDoc(),"mouseover",function(t){var n,i,d=t.target;if(s&&(a||d!=s)&&("TD"==d.nodeName||"TH"==d.nodeName)){i=o.getParent(d,"table"),i==l&&(a||(a=new e(r,i),a.setStartCell(s),r.getBody().style.webkitUserSelect="none"),a.setEndCell(d),c=!0),n=r.selection.getSel();try{n.removeAllRanges?n.removeAllRanges():n.empty()}catch(u){}t.preventDefault()}}),r.on("MouseUp",function(){function e(e,r){var o=new t(e,e);do{if(3==e.nodeType&&0!==n.trim(e.nodeValue).length)return r?i.setStart(e,0):i.setEnd(e,e.nodeValue.length),void 0;if("BR"==e.nodeName)return r?i.setStartBefore(e):i.setEndBefore(e),void 0}while(e=r?o.next():o.prev())}var i,c=r.selection,d,u,f,p,m;if(s){if(a&&(r.getBody().style.webkitUserSelect=""),d=o.select("td.mce-item-selected,th.mce-item-selected"),d.length>0){i=o.createRng(),f=d[0],m=d[d.length-1],i.setStartBefore(f),i.setEndAfter(f),e(f,1),u=new t(f,o.getParent(d[0],"table"));do if("TD"==f.nodeName||"TH"==f.nodeName){if(!o.hasClass(f,"mce-item-selected"))break;p=f}while(f=u.next());e(p),c.setRng(i)}r.nodeChanged(),s=a=l=null}}),r.on("KeyUp",function(){i()}),{clear:i}}}),r(h,[l,u,p,c,m,d,g],function(e,t,n,r,i,o,a){function s(r){function i(e){return e?e.replace(/px$/,""):""}function a(e){return/^[0-9]+$/.test(e)&&(e+="px"),e}function s(e){l("left center right".split(" "),function(t){r.formatter.remove("align"+t,{},e)})}function c(){var e=r.dom,t,n,c;t=r.dom.getParent(r.selection.getStart(),"table"),c=!1,n={width:i(e.getStyle(t,"width")||e.getAttrib(t,"width")),height:i(e.getStyle(t,"height")||e.getAttrib(t,"height")),cellspacing:e.getAttrib(t,"cellspacing"),cellpadding:e.getAttrib(t,"cellpadding"),border:e.getAttrib(t,"border"),caption:!!e.select("caption",t)[0]},l("left center right".split(" "),function(e){r.formatter.matchNode(t,"align"+e)&&(n.align=e)}),r.windowManager.open({title:"Table properties",items:{type:"form",layout:"grid",columns:2,data:n,defaults:{type:"textbox",maxWidth:50},items:[c?{label:"Cols",name:"cols",disabled:!0}:null,c?{label:"Rows",name:"rows",disabled:!0}:null,{label:"Width",name:"width"},{label:"Height",name:"height"},{label:"Cell spacing",name:"cellspacing"},{label:"Cell padding",name:"cellpadding"},{label:"Border",name:"border"},{label:"Caption",name:"caption",type:"checkbox"},{label:"Alignment",minWidth:90,name:"align",type:"listbox",text:"None",maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]}]},onsubmit:function(){var n=this.toJSON(),i;r.undoManager.transact(function(){r.dom.setAttribs(t,{cellspacing:n.cellspacing,cellpadding:n.cellpadding,border:n.border}),r.dom.setStyles(t,{width:a(n.width),height:a(n.height)}),i=e.select("caption",t)[0],i&&!n.caption&&e.remove(i),!i&&n.caption&&(i=e.create("caption"),o.ie||(i.innerHTML='<br data-mce-bogus="1"/>'),t.insertBefore(i,t.firstChild)),s(t),n.align&&r.formatter.apply("align"+n.align,{},t),r.focus(),r.addVisual()})}})}function d(e,t){r.windowManager.open({title:"Merge cells",body:[{label:"Cols",name:"cols",type:"textbox",size:10},{label:"Rows",name:"rows",type:"textbox",size:10}],onsubmit:function(){var n=this.toJSON();r.undoManager.transact(function(){e.merge(t,n.cols,n.rows)})}})}function u(){var e=r.dom,t,n,o=[];o=r.dom.select("td.mce-item-selected,th.mce-item-selected"),t=r.dom.getParent(r.selection.getStart(),"td,th"),!o.length&&t&&o.push(t),t=t||o[0],n={width:i(e.getStyle(t,"width")||e.getAttrib(t,"width")),height:i(e.getStyle(t,"height")||e.getAttrib(t,"height")),scope:e.getAttrib(t,"scope")},n.type=t.nodeName.toLowerCase(),l("left center right".split(" "),function(e){r.formatter.matchNode(t,"align"+e)&&(n.align=e)}),r.windowManager.open({title:"Cell properties",items:{type:"form",data:n,layout:"grid",columns:2,defaults:{type:"textbox",maxWidth:50},items:[{label:"Width",name:"width"},{label:"Height",name:"height"},{label:"Cell type",name:"type",type:"listbox",text:"None",minWidth:90,maxWidth:null,menu:[{text:"Cell",value:"td"},{text:"Header cell",value:"th"}]},{label:"Scope",name:"scope",type:"listbox",text:"None",minWidth:90,maxWidth:null,menu:[{text:"None",value:""},{text:"Row",value:"row"},{text:"Column",value:"col"},{text:"Row group",value:"rowgroup"},{text:"Column group",value:"colgroup"}]},{label:"Alignment",name:"align",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]}]},onsubmit:function(){var t=this.toJSON();r.undoManager.transact(function(){l(o,function(n){r.dom.setAttrib(n,"scope",t.scope),r.dom.setStyles(n,{width:a(t.width),height:a(t.height)}),t.type&&n.nodeName.toLowerCase()!=t.type&&(n=e.rename(n,t.type)),s(n),t.align&&r.formatter.apply("align"+t.align,{},n)}),r.focus()})}})}function f(){var e=r.dom,t,n,o,c,d=[];t=r.dom.getParent(r.selection.getStart(),"table"),n=r.dom.getParent(r.selection.getStart(),"td,th"),l(t.rows,function(t){l(t.cells,function(r){return e.hasClass(r,"mce-item-selected")||r==n?(d.push(t),!1):void 0})}),o=d[0],c={height:i(e.getStyle(o,"height")||e.getAttrib(o,"height")),scope:e.getAttrib(o,"scope")},c.type=o.parentNode.nodeName.toLowerCase(),l("left center right".split(" "),function(e){r.formatter.matchNode(o,"align"+e)&&(c.align=e)}),r.windowManager.open({title:"Row properties",items:{type:"form",data:c,columns:2,defaults:{type:"textbox"},items:[{type:"listbox",name:"type",label:"Row type",text:"None",maxWidth:null,menu:[{text:"Header",value:"thead"},{text:"Body",value:"tbody"},{text:"Footer",value:"tfoot"}]},{type:"listbox",name:"align",label:"Alignment",text:"None",maxWidth:null,menu:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"Height",name:"height"}]},onsubmit:function(){var t=this.toJSON(),n,i,o;r.undoManager.transact(function(){var c=t.type;l(d,function(l){r.dom.setAttrib(l,"scope",t.scope),r.dom.setStyles(l,{height:a(t.height)}),c!=l.parentNode.nodeName.toLowerCase()&&(n=e.getParent(l,"table"),i=l.parentNode,o=e.select(c,n)[0],o||(o=e.create(c),n.firstChild?n.insertBefore(o,n.firstChild):n.appendChild(o)),o.appendChild(l),i.hasChildNodes()||e.remove(i)),s(l),t.align&&r.formatter.apply("align"+t.align,{},l)}),r.focus()})}})}function p(e){return function(){r.execCommand(e)}}function m(e,t){var n,i,a;for(a="<table><tbody>",n=0;t>n;n++){for(a+="<tr>",i=0;e>i;i++)a+="<td>"+(o.ie?" ":"<br>")+"</td>";a+="</tr>"}a+="</tbody></table>",r.insertContent(a)}function h(e,t){function n(){e.disabled(!r.dom.getParent(r.selection.getStart(),t)),r.selection.selectorChanged(t,function(t){e.disabled(!t)})}r.initialized?n():r.on("init",n)}function g(){h(this,"table")}function v(){h(this,"td,th")}function y(){var e="";e='<table role="presentation" class="mce-grid mce-grid-border">';for(var t=0;10>t;t++){e+="<tr>";for(var n=0;10>n;n++)e+='<td><a href="#" data-mce-index="'+n+","+t+'"></a></td>';e+="</tr>"}return e+="</table>",e+='<div class="mce-text-center">0 x 0</div>'}var b,C,x=this;r.addMenuItem("inserttable",{text:"Insert table",icon:"table",context:"table",onhide:function(){r.dom.removeClass(this.menu.items()[0].getEl().getElementsByTagName("a"),"mce-active")},menu:[{type:"container",html:y(),onmousemove:function(e){var t=e.target;if("A"==t.nodeName){var n=r.dom.getParent(t,"table"),i=t.getAttribute("data-mce-index");if(i!=this.lastPos){i=i.split(","),i[0]=parseInt(i[0],10),i[1]=parseInt(i[1],10);for(var o=0;10>o;o++)for(var a=0;10>a;a++)r.dom.toggleClass(n.rows[o].childNodes[a].firstChild,"mce-active",a<=i[0]&&o<=i[1]);n.nextSibling.innerHTML=i[0]+1+" x "+(i[1]+1),this.lastPos=i}}},onclick:function(e){"A"==e.target.nodeName&&this.lastPos&&(e.preventDefault(),m(this.lastPos[0]+1,this.lastPos[1]+1),this.parent().cancel())}}]}),r.addMenuItem("tableprops",{text:"Table properties",context:"table",onPostRender:g,onclick:c}),r.addMenuItem("deletetable",{text:"Delete table",context:"table",onPostRender:g,cmd:"mceTableDelete"}),r.addMenuItem("cell",{separator:"before",text:"Cell",context:"table",menu:[{text:"Cell properties",onclick:p("mceTableCellProps"),onPostRender:v},{text:"Merge cells",onclick:p("mceTableMergeCells"),onPostRender:v},{text:"Split cell",onclick:p("mceTableSplitCells"),onPostRender:v}]}),r.addMenuItem("row",{text:"Row",context:"table",menu:[{text:"Insert row before",onclick:p("mceTableInsertRowBefore"),onPostRender:v},{text:"Insert row after",onclick:p("mceTableInsertRowAfter"),onPostRender:v},{text:"Delete row",onclick:p("mceTableDeleteRow"),onPostRender:v},{text:"Row properties",onclick:p("mceTableRowProps"),onPostRender:v},{text:"-"},{text:"Cut row",onclick:p("mceTableCutRow"),onPostRender:v},{text:"Copy row",onclick:p("mceTableCopyRow"),onPostRender:v},{text:"Paste row before",onclick:p("mceTablePasteRowBefore"),onPostRender:v},{text:"Paste row after",onclick:p("mceTablePasteRowAfter"),onPostRender:v}]}),r.addMenuItem("column",{text:"Column",context:"table",menu:[{text:"Insert column before",onclick:p("mceTableInsertColBefore"),onPostRender:v},{text:"Insert column after",onclick:p("mceTableInsertColAfter"),onPostRender:v},{text:"Delete column",onclick:p("mceTableDeleteCol"),onPostRender:v}]});var w=[];l("inserttable tableprops deletetable | cell row column".split(" "),function(e){"|"==e?w.push({text:"-"}):w.push(r.menuItems[e])}),r.addButton("table",{type:"menubutton",title:"Table",menu:w}),o.isIE||r.on("click",function(e){e=e.target,"TABLE"===e.nodeName&&(r.selection.select(e),r.nodeChanged())}),x.quirks=new t(r),r.on("Init",function(){b=r.windowManager,x.cellSelection=new n(r)}),l({mceTableSplitCells:function(e){e.split()},mceTableMergeCells:function(e){var t,n,i;i=r.dom.getParent(r.selection.getStart(),"th,td"),i&&(t=i.rowSpan,n=i.colSpan),r.dom.select("td.mce-item-selected,th.mce-item-selected").length?e.merge():d(e,i)},mceTableInsertRowBefore:function(e){e.insertRow(!0)},mceTableInsertRowAfter:function(e){e.insertRow()},mceTableInsertColBefore:function(e){e.insertCol(!0)},mceTableInsertColAfter:function(e){e.insertCol()},mceTableDeleteCol:function(e){e.deleteCols()},mceTableDeleteRow:function(e){e.deleteRows()},mceTableCutRow:function(e){C=e.cutRows()},mceTableCopyRow:function(e){C=e.copyRows()},mceTablePasteRowBefore:function(e){e.pasteRows(C,!0)},mceTablePasteRowAfter:function(e){e.pasteRows(C)},mceTableDelete:function(e){e.deleteTable()}},function(t,n){r.addCommand(n,function(){var n=new e(r);n&&(t(n),r.execCommand("mceRepaint"),x.cellSelection.clear())})}),l({mceInsertTable:function(){c()},mceTableRowProps:f,mceTableCellProps:u},function(e,t){r.addCommand(t,function(t,n){e(n)})})}var l=r.each;a.add("table",s)}),a([l,u,p,h])}(this);
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/template/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/template/plugin.min.js
deleted file mode 100644
index d628daa1..00000000
--- a/extlib/tinymce/js/tinymce/plugins/template/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("template",function(e){function t(){function t(e){var t=e.control.value();t.url?tinymce.util.XHR.send({url:t.url,success:function(e){a=e,n.find("iframe")[0].html(e)}}):(a=t.content,n.find("iframe")[0].html(t.content)),n.find("#description")[0].text(e.control.value().description)}var n,a,r=[];return e.settings.templates?(tinymce.each(e.settings.templates,function(e){r.push({selected:!r.length,text:e.title,value:{url:e.url,content:e.content,description:e.description}})}),n=e.windowManager.open({title:"Insert template",body:[{type:"listbox",name:"template",flex:0,label:"Templates",values:r,onselect:t},{type:"label",name:"description",label:"Description",text:" "},{type:"iframe",minWidth:600,minHeight:400,border:1}],onsubmit:function(){i(!1,a)}}),n.find("listbox")[0].fire("select"),void 0):(e.windowManager.alert("No templates defined"),void 0)}function n(t,n){function a(e,t){if(e=""+e,e.length<t)for(var n=0;n<t-e.length;n++)e="0"+e;return e}var i="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),r="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),o="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),l="January February March April May June July August September October November December".split(" ");return n=n||new Date,t=t.replace("%D","%m/%d/%Y"),t=t.replace("%r","%I:%M:%S %p"),t=t.replace("%Y",""+n.getFullYear()),t=t.replace("%y",""+n.getYear()),t=t.replace("%m",a(n.getMonth()+1,2)),t=t.replace("%d",a(n.getDate(),2)),t=t.replace("%H",""+a(n.getHours(),2)),t=t.replace("%M",""+a(n.getMinutes(),2)),t=t.replace("%S",""+a(n.getSeconds(),2)),t=t.replace("%I",""+((n.getHours()+11)%12+1)),t=t.replace("%p",""+(n.getHours()<12?"AM":"PM")),t=t.replace("%B",""+e.translate(l[n.getMonth()])),t=t.replace("%b",""+e.translate(o[n.getMonth()])),t=t.replace("%A",""+e.translate(r[n.getDay()])),t=t.replace("%a",""+e.translate(i[n.getDay()])),t=t.replace("%%","%")}function a(t){var n=e.dom,a=e.getParam("template_replace_values");r(n.select("*",t),function(e){r(a,function(t,i){n.hasClass(e,i)&&"function"==typeof a[i]&&a[i](e)})})}function i(t,i){function o(e,t){return new RegExp("\\b"+t+"\\b","g").test(e.className)}var l,c,s=e.dom,d=e.selection.getContent();r(e.getParam("template_replace_values"),function(e,t){"function"!=typeof e&&(i=i.replace(new RegExp("\\{\\$"+t+"\\}","g"),e))}),l=s.create("div",null,i),c=s.select(".mceTmpl",l),c&&c.length>0&&(l=s.create("div",null),l.appendChild(c[0].cloneNode(!0))),r(s.select("*",l),function(t){o(t,e.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))&&(t.innerHTML=n(e.getParam("template_cdate_format",e.getLang("template.cdate_format")))),o(t,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(t.innerHTML=n(e.getParam("template_mdate_format",e.getLang("template.mdate_format")))),o(t,e.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))&&(t.innerHTML=d)}),a(l),e.execCommand("mceInsertContent",!1,l.innerHTML),e.addVisual()}var r=tinymce.each;e.addCommand("mceInsertTemplate",i),e.addButton("template",{title:"Insert template",onclick:t}),e.addMenuItem("template",{text:"Insert template",onclick:t,context:"insert"}),e.on("PreProcess",function(t){var i=e.dom;r(i.select("div",t.node),function(t){i.hasClass(t,"mceTmpl")&&(r(i.select("*",t),function(t){i.hasClass(t,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(t.innerHTML=n(e.getParam("template_mdate_format",e.getLang("template.mdate_format"))))}),a(t))})})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/textcolor/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/textcolor/plugin.min.js
deleted file mode 100644
index 201f4e54..00000000
--- a/extlib/tinymce/js/tinymce/plugins/textcolor/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("textcolor",function(e){function t(){var t,n,a=[];for(n=e.settings.textcolor_map||["000000","Black","993300","Burnt orange","333300","Dark olive","003300","Dark green","003366","Dark azure","000080","Navy Blue","333399","Indigo","333333","Very dark gray","800000","Maroon","FF6600","Orange","808000","Olive","008000","Green","008080","Teal","0000FF","Blue","666699","Grayish blue","808080","Gray","FF0000","Red","FF9900","Amber","99CC00","Yellow green","339966","Sea green","33CCCC","Turquoise","3366FF","Royal blue","800080","Purple","999999","Medium gray","FF00FF","Magenta","FFCC00","Gold","FFFF00","Yellow","00FF00","Lime","00FFFF","Aqua","00CCFF","Sky blue","993366","Brown","C0C0C0","Silver","FF99CC","Pink","FFCC99","Peach","FFFF99","Light yellow","CCFFCC","Pale green","CCFFFF","Pale cyan","99CCFF","Light sky blue","CC99FF","Plum","FFFFFF","White"],t=0;t<n.length;t+=2)a.push({text:n[t+1],color:n[t]});return a}function n(){var n,a,i,r,o,l,c,s,d,u=this;for(n=t(),i='<table class="mce-grid mce-grid-border mce-colorbutton-grid" role="presentation" cellspacing="0"><tbody>',r=n.length-1,o=e.settings.textcolor_rows||5,l=e.settings.textcolor_cols||8,s=0;o>s;s++){for(i+="<tr>",c=0;l>c;c++)d=s*l+c,d>r?i+="<td></td>":(a=n[d],i+='<td><div id="'+u._id+"-"+d+'"'+' data-mce-color="'+a.color+'"'+' role="option"'+' tabIndex="-1"'+' style="'+(a?"background-color: #"+a.color:"")+'"'+' title="'+a.text+'">'+"</div>"+"</td>");i+="</tr>"}return i+="</tbody></table>"}function a(t){var n,a=this.parent();(n=t.target.getAttribute("data-mce-color"))&&(a.hidePanel(),n="#"+n,a.color(n),e.execCommand(a.settings.selectcmd,!1,n))}function i(){var t=this;t._color&&e.execCommand(t.settings.selectcmd,!1,t._color)}e.addButton("forecolor",{type:"colorbutton",tooltip:"Text color",popoverAlign:"bc-tl",selectcmd:"ForeColor",panel:{html:n,onclick:a},onclick:i}),e.addButton("backcolor",{type:"colorbutton",tooltip:"Background color",popoverAlign:"bc-tl",selectcmd:"HiliteColor",panel:{html:n,onclick:a},onclick:i})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/visualblocks/css/visualblocks.css b/extlib/tinymce/js/tinymce/plugins/visualblocks/css/visualblocks.css
deleted file mode 100644
index 7a3a47a3..00000000
--- a/extlib/tinymce/js/tinymce/plugins/visualblocks/css/visualblocks.css
+++ /dev/null
@@ -1,114 +0,0 @@
-.mce-visualblocks p {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin-left: 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
-}
-
-.mce-visualblocks h1 {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin-left: 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
-}
-
-.mce-visualblocks h2 {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin-left: 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
-}
-
-.mce-visualblocks h3 {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin-left: 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
-}
-
-.mce-visualblocks h4 {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin-left: 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
-}
-
-.mce-visualblocks h5 {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin-left: 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
-}
-
-.mce-visualblocks h6 {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin-left: 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
-}
-
-.mce-visualblocks div {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin-left: 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
-}
-
-.mce-visualblocks section {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin: 0 0 1em 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
-}
-
-.mce-visualblocks article {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin: 0 0 1em 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
-}
-
-.mce-visualblocks blockquote {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
-}
-
-.mce-visualblocks address {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin: 0 0 1em 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
-}
-
-.mce-visualblocks pre {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin-left: 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
-}
-
-.mce-visualblocks figure {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin: 0 0 1em 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
-}
-
-.mce-visualblocks hgroup {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin: 0 0 1em 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
-}
-
-.mce-visualblocks aside {
-	padding-top: 10px;
-	border: 1px dashed #BBB;
-	margin: 0 0 1em 3px;
-	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
-}
-
-.mce-visualblocks figcaption {
-	border: 1px dashed #BBB;
-}
diff --git a/extlib/tinymce/js/tinymce/plugins/visualblocks/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/visualblocks/plugin.min.js
deleted file mode 100644
index 1cb40081..00000000
--- a/extlib/tinymce/js/tinymce/plugins/visualblocks/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("visualblocks",function(e,t){function n(){var t=this;e.on("VisualBlocks",function(){t.active(e.dom.hasClass(e.getBody(),"mce-visualblocks"))})}var i,a,r;window.NodeList&&(e.addCommand("mceVisualBlocks",function(){var n,o=e.dom;i||(i=o.uniqueId(),n=o.create("link",{id:i,rel:"stylesheet",href:t+"/css/visualblocks.css"}),e.getDoc().getElementsByTagName("head")[0].appendChild(n)),e.on("PreviewFormats AfterPreviewFormats",function(t){r&&o.toggleClass(e.getBody(),"mce-visualblocks","afterpreviewformats"==t.type)}),o.toggleClass(e.getBody(),"mce-visualblocks"),r=e.dom.hasClass(e.getBody(),"mce-visualblocks"),a&&a.active(o.hasClass(e.getBody(),"mce-visualblocks")),e.fire("VisualBlocks")}),e.addButton("visualblocks",{title:"Show blocks",cmd:"mceVisualBlocks",onPostRender:n}),e.addMenuItem("visualblocks",{text:"Show blocks",cmd:"mceVisualBlocks",onPostRender:n,selectable:!0,context:"view",prependToContext:!0}),e.on("init",function(){e.settings.visualblocks_default_state&&e.execCommand("mceVisualBlocks",!1,null,{skip_focus:!0})}),e.on("remove",function(){e.dom.removeClass(e.getBody(),"mce-visualblocks")}))});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/visualchars/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/visualchars/plugin.min.js
deleted file mode 100644
index 44742388..00000000
--- a/extlib/tinymce/js/tinymce/plugins/visualchars/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("visualchars",function(e){function t(t){var n,a,r,o,l,s,c=e.getBody(),d=e.selection;if(i=!i,e.fire("VisualChars",{state:i}),t&&(s=d.getBookmark()),i)for(a=[],tinymce.walk(c,function(e){3==e.nodeType&&e.nodeValue&&-1!=e.nodeValue.indexOf(" ")&&a.push(e)},"childNodes"),r=0;r<a.length;r++){for(o=a[r].nodeValue,o=o.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mce-nbsp">$1</span>'),l=e.dom.create("div",null,o);n=l.lastChild;)e.dom.insertAfter(n,a[r]);e.dom.remove(a[r])}else for(a=e.dom.select("span.mce-nbsp",c),r=a.length-1;r>=0;r--)e.dom.remove(a[r],1);d.moveToBookmark(s)}function n(){var t=this;e.on("VisualChars",function(e){t.active(e.state)})}var i;e.addCommand("mceVisualChars",t),e.addButton("visualchars",{title:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n}),e.addMenuItem("visualchars",{text:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n,selectable:!0,context:"view",prependToContext:!0}),e.on("beforegetcontent",function(e){i&&"raw"!=e.format&&!e.draft&&(i=!0,t(!1))})});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/plugins/wordcount/plugin.min.js b/extlib/tinymce/js/tinymce/plugins/wordcount/plugin.min.js
deleted file mode 100644
index 8c419801..00000000
--- a/extlib/tinymce/js/tinymce/plugins/wordcount/plugin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.PluginManager.add("wordcount",function(e){function t(){e.theme.panel.find("#wordcount").text(["Words: {0}",a.getCount()])}var n,i,a=this;n=e.getParam("wordcount_countregex",/[\w\u2019\x27\-]+/g),i=e.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\x27\x22_+=\\\/\-]*/g),e.on("init",function(){var n=e.theme.panel&&e.theme.panel.find("#statusbar")[0];n&&window.setTimeout(function(){n.insert({type:"label",name:"wordcount",text:["Words: {0}",a.getCount()],classes:"wordcount"},0),e.on("setcontent beforeaddundo",t),e.on("keyup",function(e){32==e.keyCode&&t()})},0)}),a.getCount=function(){var t=e.getContent({format:"raw"}),a=0;if(t){t=t.replace(/\.\.\./g," "),t=t.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," "),t=t.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," "),t=t.replace(i,"");var o=t.match(n);o&&(a=o.length)}return a}});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/content.inline.min.css b/extlib/tinymce/js/tinymce/skins/lightgray/content.inline.min.css
deleted file mode 100644
index 771b83e5..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/content.inline.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-object{border:1px dotted #3a3a3a;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px!important;height:9px!important;border:1px dotted #3a3a3a;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp{background:#AAA}hr{cursor:default}.mce-match-marker{background:green;color:#fff}.mce-spellchecker-word{background:url(img/wline.gif) repeat-x bottom left;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td.mce-item-selected,th.mce-item-selected{background-color:#39f!important}.mce-edit-focus{outline:1px dotted #333}
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/content.min.css b/extlib/tinymce/js/tinymce/skins/lightgray/content.min.css
deleted file mode 100644
index b9bbab14..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/content.min.css
+++ /dev/null
@@ -1 +0,0 @@
-body{background-color:#fff;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px;scrollbar-3dlight-color:#f0f0ee;scrollbar-arrow-color:#676662;scrollbar-base-color:#f0f0ee;scrollbar-darkshadow-color:#ddd;scrollbar-face-color:#e0e0dd;scrollbar-highlight-color:#f0f0ee;scrollbar-shadow-color:#f0f0ee;scrollbar-track-color:#f5f5f5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px}.mce-object{border:1px dotted #3a3a3a;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px!important;height:9px!important;border:1px dotted #3a3a3a;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp{background:#AAA}hr{cursor:default}.mce-match-marker{background:green;color:#fff}.mce-spellchecker-word{background:url(img/wline.gif) repeat-x bottom left;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td.mce-item-selected,th.mce-item-selected{background-color:#39f!important}.mce-edit-focus{outline:1px dotted #333}
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.eot b/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.eot
deleted file mode 100644
index 42a34a57..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.eot
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.svg b/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.svg
deleted file mode 100644
index 93a8f347..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.svg
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon.
-<iconset grid="16"></iconset>
-</metadata>
-<defs>
-<font id="icomoon-small" horiz-adv-x="512" >
-<font-face units-per-em="512" ascent="480" descent="-32" />
-<missing-glyph horiz-adv-x="512" />
-<glyph unicode="&#xe020;" d="M 352.00,64.00l0.00,18.502 c 75.674,30.814, 128.00,96.91, 128.00,173.498c0.00,106.039-100.288,192.00-224.00,192.00S 32.00,362.039, 32.00,256.00
-	c0.00-76.588, 52.327-142.684, 128.00-173.498L 160.00,64.00 L 64.00,64.00 l-32.00,48.00l0.00-112.00 l 160.00,0.00 L 192.00,111.406 c-50.45,25.681-85.333,80.77-85.333,144.594
-	c0.00,88.366, 66.859,160.00, 149.333,160.00c 82.474,0.00, 149.333-71.634, 149.333-160.00c0.00-63.824-34.883-118.913-85.333-144.594L 320.00,0.00 l 160.00,0.00 L 480.00,112.00 l-32.00-48.00
-	L 352.00,64.00 z" />
-<glyph unicode="&#xe013;" d="M 128.00,448.00l0.00-448.00 l 128.00,128.00l 128.00-128.00L 384.00,448.00 L 128.00,448.00 z M 352.00,85.255l-96.00,96.00l-96.00-96.00L 160.00,416.00 l 192.00,0.00 L 352.00,85.255 z" />
-<glyph unicode="&#xe012;" d="M 463.637,364.892l-66.745,66.744C 386.34,442.188, 372.276,448.00, 357.293,448.00s-29.047-5.812-39.598-16.363l-82.746-82.745
-		c-21.834-21.834-21.834-57.362,0.00-79.196l 1.373-1.373l 33.941,33.941l-1.373,1.373c-3.066,3.066-3.066,8.247,0.00,11.313l 82.746,82.746
-		C 353.641,399.70, 356.04,400.00, 357.292,400.00s 3.651-0.299, 5.656-2.305l 66.745-66.744c 3.066-3.067, 3.066-8.249, 0.001-11.314l-82.747-82.747
-		c-2.004-2.004-4.403-2.304-5.655-2.304s-3.651,0.30-5.656,2.306l-1.373,1.373l-33.94-33.942l 1.371-1.371
-		c 10.553-10.554, 24.615-16.364, 39.60-16.364s 29.047,5.812, 39.598,16.363l 82.747,82.746C 485.47,307.53, 485.47,343.057, 463.637,364.892
-		zM 275.678,179.678l-33.941-33.941l 1.373-1.373c 2.004-2.004, 2.305-4.403, 2.305-5.655c0.00-1.253-0.299-3.651-2.303-5.657
-		l-82.747-82.745c-2.005-2.005-4.405-2.305-5.657-2.305s-3.652,0.30-5.657,2.305L 82.305,117.05C 80.30,119.055, 80.00,121.455, 80.00,122.707
-		s 0.299,3.65, 2.305,5.656l 82.745,82.744c 2.005,2.006, 4.405,2.306, 5.657,2.306s 3.652-0.30, 5.657-2.306l 1.373-1.371l 33.941,33.94
-		l-1.373,1.373c-10.552,10.552-24.615,16.363-39.598,16.363s-29.046-5.812-39.598-16.363l-82.744-82.743
-		C 37.812,151.754, 32.00,137.689, 32.00,122.707s 5.812-29.047, 16.363-39.599l 66.745-66.745C 125.661,5.812, 139.724,0.00, 154.707,0.00
-		s 29.046,5.812, 39.598,16.363l 82.747,82.746c 10.552,10.552, 16.361,24.615, 16.361,39.598s-5.812,29.047-16.363,39.598
-		L 275.678,179.678zM 400.00,61.00c-4.862,0.00-9.725,1.854-13.435,5.565l-64.00,63.999c-7.422,7.42-7.422,19.449,0.00,26.869
-			c 7.42,7.422, 19.448,7.422, 26.868,0.00l 64.00-64.00c 7.422-7.42, 7.422-19.448,0.00-26.868C 409.725,62.854, 404.862,61.00, 400.00,61.00zM 304.00,0.00c-8.837,0.00-16.00,7.163-16.00,16.00l0.00,64.00 c0.00,8.837, 7.163,16.00, 16.00,16.00s 16.00-7.163, 16.00-16.00l0.00-64.00 C 320.00,7.163, 312.837,0.00, 304.00,0.00zM 464.00,160.00l-64.00,0.00 c-8.837,0.00-16.00,7.163-16.00,16.00s 7.163,16.00, 16.00,16.00l 64.00,0.00 c 8.837,0.00, 16.00-7.163, 16.00-16.00S 472.837,160.00, 464.00,160.00zM 112.00,387.00c 4.862,0.00, 9.725-1.854, 13.435-5.565l 64.00-64.00c 7.421-7.42, 7.421-19.449,0.00-26.869c-7.42-7.422-19.449-7.422-26.869,0.00
-			l-64.00,64.00c-7.421,7.42-7.421,19.449,0.00,26.869C 102.275,385.146, 107.138,387.00, 112.00,387.00zM 208.00,448.00c 8.837,0.00, 16.00-7.163, 16.00-16.00l0.00-64.00 c0.00-8.837-7.163-16.00-16.00-16.00s-16.00,7.163-16.00,16.00L 192.00,432.00 C 192.00,440.837, 199.163,448.00, 208.00,448.00zM 48.00,288.00l 64.00,0.00 c 8.837,0.00, 16.00-7.163, 16.00-16.00s-7.163-16.00-16.00-16.00L 48.00,256.00 c-8.837,0.00-16.00,7.163-16.00,16.00S 39.163,288.00, 48.00,288.00z" />
-<glyph unicode="&#xe011;" d="M 463.637,364.892l-66.745,66.744C 386.34,442.188, 372.276,448.00, 357.293,448.00s-29.047-5.812-39.598-16.363l-82.746-82.745
-		c-21.834-21.834-21.834-57.362,0.00-79.196l 1.373-1.373l 33.941,33.941l-1.373,1.373c-3.066,3.066-3.066,8.247,0.00,11.313l 82.746,82.746
-		C 353.641,399.70, 356.04,400.00, 357.292,400.00s 3.651-0.299, 5.656-2.305l 66.745-66.744c 3.066-3.067, 3.066-8.249, 0.001-11.314l-82.747-82.747
-		c-2.004-2.004-4.403-2.304-5.655-2.304s-3.651,0.30-5.656,2.306l-1.373,1.373l-33.94-33.942l 1.371-1.371
-		c 10.553-10.554, 24.615-16.364, 39.60-16.364s 29.047,5.812, 39.598,16.363l 82.747,82.746C 485.47,307.53, 485.47,343.057, 463.637,364.892
-		zM 275.678,179.678l-33.941-33.941l 1.373-1.373c 2.004-2.004, 2.305-4.403, 2.305-5.655c0.00-1.253-0.299-3.651-2.303-5.657
-		l-82.747-82.745c-2.005-2.005-4.405-2.305-5.657-2.305s-3.652,0.30-5.657,2.305L 82.305,117.05C 80.30,119.055, 80.00,121.455, 80.00,122.707
-		s 0.299,3.65, 2.305,5.656l 82.745,82.744c 2.005,2.006, 4.405,2.306, 5.657,2.306s 3.652-0.30, 5.657-2.306l 1.373-1.371l 33.941,33.94
-		l-1.373,1.373c-10.552,10.552-24.615,16.363-39.598,16.363s-29.046-5.812-39.598-16.363l-82.744-82.743
-		C 37.812,151.754, 32.00,137.689, 32.00,122.707s 5.812-29.047, 16.363-39.599l 66.745-66.745C 125.661,5.812, 139.724,0.00, 154.707,0.00
-		s 29.046,5.812, 39.598,16.363l 82.747,82.746c 10.552,10.552, 16.361,24.615, 16.361,39.598s-5.812,29.047-16.363,39.598
-		L 275.678,179.678zM 176.00,125.00c-4.862,0.00-9.725,1.855-13.435,5.564c-7.42,7.42-7.42,19.449,0.00,26.869l 160.00,160.00c 7.42,7.42, 19.448,7.42, 26.868,0.00
-		c 7.422-7.42, 7.422-19.45,0.00-26.87l-160.00-160.00C 185.725,126.855, 180.862,125.00, 176.00,125.00z" />
-<glyph unicode="&#xe010;" d="M 288.00,339.337L 288.00,448.00 l 168.001-168.00L 288.00,112.00L 288.00,223.048 C 92.547,227.633, 130.50,99.50, 160.00,0.00C 16.00,160.00, 53.954,345.437, 288.00,339.337z" />
-<glyph unicode="&#xe00f;" d="M 352.00,0.00c 29.50,99.50, 67.453,227.633-128.00,223.048L 224.00,112.00 L 55.999,280.00L 224.00,448.00l0.00-108.663 C 458.046,345.437, 496.00,160.00, 352.00,0.00z" />
-<glyph unicode="&#xe00e;" d="M 128.214,267.637c 52.90,0.00, 95.786-45.585, 95.786-101.819C 224.00,109.586, 181.114,64.00, 128.214,64.00
-	c-52.901,0.00-95.786,45.585-95.786,101.818L 32.00,180.364C 32.00,292.829, 117.77,384.00, 223.572,384.00l0.00-58.182 c-36.55,0.00-70.913-15.13-96.758-42.602
-	c-4.977-5.289-9.517-10.917-13.612-16.828C 118.094,267.208, 123.105,267.637, 128.214,267.637zM 384.214,267.637c 52.90,0.00, 95.786-45.585, 95.786-101.819C 480.00,109.586, 437.114,64.00, 384.214,64.00
-	c-52.901,0.00-95.786,45.585-95.786,101.818L 288.00,180.364C 288.00,292.829, 373.77,384.00, 479.572,384.00l0.00-58.182 c-36.55,0.00-70.913-15.13-96.758-42.602
-	c-4.978-5.289-9.518-10.917-13.612-16.828C 374.094,267.208, 379.105,267.637, 384.214,267.637z" />
-<glyph unicode="&#xe00c;" d="M 32.00,384.00L 480.00,384.00L 480.00,320.00L 32.00,320.00zM 192.00,192.00L 480.00,192.00L 480.00,128.00L 192.00,128.00zM 192.00,288.00L 480.00,288.00L 480.00,224.00L 192.00,224.00zM 32.00,96.00L 480.00,96.00L 480.00,32.00L 32.00,32.00zM 32.00,288.00L 144.00,208.00L 32.00,128.00 z" />
-<glyph unicode="&#xe00d;" d="M 32.00,384.00L 480.00,384.00L 480.00,320.00L 32.00,320.00zM 32.00,192.00L 320.00,192.00L 320.00,128.00L 32.00,128.00zM 32.00,288.00L 320.00,288.00L 320.00,224.00L 32.00,224.00zM 32.00,96.00L 480.00,96.00L 480.00,32.00L 32.00,32.00zM 480.00,288.00L 368.00,208.00L 480.00,128.00 z" />
-<glyph unicode="&#xe00b;" d="M 192.00,416.00L 480.00,416.00L 480.00,352.00L 192.00,352.00zM 192.00,256.00L 480.00,256.00L 480.00,192.00L 192.00,192.00zM 192.00,96.00L 480.00,96.00L 480.00,32.00L 192.00,32.00zM 160.00,215.00L 160.00,288.00L 128.00,288.00L 128.00,448.00L 64.00,448.00L 64.00,416.00L 96.00,416.00L 96.00,288.00L 64.00,288.00L 64.00,256.00L 128.00,256.00L 128.00,231.00L 64.00,201.00L 64.00,128.00L 128.00,128.00L 128.00,96.00L 64.00,96.00L 64.00,64.00L 128.00,64.00L 128.00,32.00L 64.00,32.00L 64.00,0.00L 160.00,0.00L 160.00,160.00L 96.00,160.00L 96.00,185.00 	z" />
-<glyph unicode="&#xe00a;" d="M 192.00,416.00L 480.00,416.00L 480.00,352.00L 192.00,352.00zM 192.00,256.00L 480.00,256.00L 480.00,192.00L 192.00,192.00zM 192.00,96.00L 480.00,96.00L 480.00,32.00L 192.00,32.00zM 64.00,384.00A32.00,32.00 1620.00 1 1 128.00,384A32.00,32.00 1620.00 1 1 64.00,384zM 64.00,224.00A32.00,32.00 1620.00 1 1 128.00,224A32.00,32.00 1620.00 1 1 64.00,224zM 64.00,64.00A32.00,32.00 1620.00 1 1 128.00,64A32.00,32.00 1620.00 1 1 64.00,64z" />
-<glyph unicode="&#xe009;" d="M 444.00,288.00l-28.00,0.00 L 416.00,416.00 l 32.00,0.00 L 448.00,448.00 L 288.00,448.00 l0.00-32.00 l 32.00,0.00 l0.00-128.00 L 192.00,288.00 L 192.00,416.00 l 32.00,0.00 L 224.00,448.00 L 64.00,448.00 l0.00-32.00 l 32.00,0.00 l0.00-128.00 L 68.00,288.00 c-19.80,0.00-36.00-16.20-36.00-36.00l0.00-216.00 c0.00-19.80, 16.20-36.00, 36.00-36.00l 120.00,0.00 
-	c 19.80,0.00, 36.00,16.20, 36.00,36.00L 224.00,192.00 l 64.00,0.00 l0.00-156.00 c0.00-19.80, 16.20-36.00, 36.00-36.00l 120.00,0.00 c 19.80,0.00, 36.00,16.20, 36.00,36.00L 480.00,252.00 C 480.00,271.80, 463.80,288.00, 444.00,288.00z M 174.00,32.00L 82.00,32.00 
-	c-9.90,0.00-18.00,7.20-18.00,16.00s 8.10,16.00, 18.00,16.00l 92.00,0.00 c 9.90,0.00, 18.00-7.20, 18.00-16.00S 183.90,32.00, 174.00,32.00z M 272.00,224.00l-32.00,0.00 c-8.80,0.00-16.00,7.20-16.00,16.00s 7.20,16.00, 16.00,16.00l 32.00,0.00 
-	c 8.80,0.00, 16.00-7.20, 16.00-16.00S 280.80,224.00, 272.00,224.00z M 430.00,32.00l-92.00,0.00 c-9.90,0.00-18.00,7.20-18.00,16.00s 8.10,16.00, 18.00,16.00l 92.00,0.00 c 9.90,0.00, 18.00-7.20, 18.00-16.00S 439.90,32.00, 430.00,32.00z" />
-<glyph unicode="&#xe008;" d="M 352.00,288.00l0.00,80.00 c0.00,8.80-7.20,16.00-16.00,16.00l-80.00,0.00 L 256.00,416.00 c0.00,17.60-14.40,32.00-32.00,32.00l-64.00,0.00 c-17.602,0.00-32.00-14.40-32.00-32.00l0.00-32.00 L 48.00,384.00 c-8.801,0.00-16.00-7.20-16.00-16.00l0.00-256.00 
-	c0.00-8.80, 7.199-16.00, 16.00-16.00l 112.00,0.00 l0.00-96.00 l 192.00,0.00 l 96.00,96.00L 448.00,288.00 L 352.00,288.00 z M 160.00,415.943c 0.017,0.019, 0.036,0.039, 0.057,0.057l 63.884,0.00 
-	c 0.021-0.018, 0.041-0.038, 0.059-0.057L 224.00,384.00 l-64.00,0.00 L 160.00,415.943 L 160.00,415.943z M 96.00,320.00l0.00,32.00 l 192.00,0.00 l0.00-32.00 L 96.00,320.00 z M 352.00,45.255L 352.00,96.00 l 50.745,0.00 L 352.00,45.255z
-	 M 416.00,128.00l-96.00,0.00 l0.00-96.00 L 192.00,32.00 L 192.00,256.00 l 224.00,0.00 L 416.00,128.00 z" />
-<glyph unicode="&#xe031;" d="M 416.00,320.00l-96.00,0.00 l0.00,32.00 l-96.00,96.00L 32.00,448.00 l0.00-352.00 l 192.00,0.00 l0.00-96.00 l 288.00,0.00 L 512.00,224.00 L 416.00,320.00z M 416.00,274.745L 466.745,224.00L 416.00,224.00 L 416.00,274.745 z M 224.00,402.745L 274.745,352.00
-	L 224.00,352.00 L 224.00,402.745 z M 64.00,416.00l 128.00,0.00 l0.00-96.00 l 96.00,0.00 l0.00-192.00 L 64.00,128.00 L 64.00,416.00 z M 480.00,32.00L 256.00,32.00 l0.00,64.00 l 64.00,0.00 L 320.00,288.00 l 64.00,0.00 l0.00-96.00 l 96.00,0.00 L 480.00,32.00 z" />
-<glyph unicode="&#xe007;" d="M 432.204,144.934c-23.235,23.235-53.469,34.002-80.541,31.403L 320.00,208.00l 96.00,96.00c0.00,0.00, 64.00,64.00,0.00,128.00L 256.00,272.00L 96.00,432.00
-		c-64.00-64.00,0.00-128.00,0.00-128.00l 96.00-96.00l-31.663-31.663c-27.072,2.599-57.305-8.169-80.54-31.403c-37.49-37.49-42.556-93.209-11.313-124.45
-		c 31.241-31.241, 86.96-26.177, 124.45,11.313c 23.235,23.234, 34.001,53.469, 31.403,80.54L 256.00,144.00l 31.664-31.664
-		c-2.598-27.072, 8.168-57.305, 31.403-80.539c 37.489-37.49, 93.209-42.556, 124.449-11.313
-		C 474.76,51.725, 469.694,107.443, 432.204,144.934z M 176.562,100.711c-1.106-12.166-7.51-24.913-17.57-34.973
-		C 147.886,54.631, 133.452,48.00, 120.383,48.00c-5.262,0.00-12.649,1.114-17.958,6.424c-10.703,10.702-8.688,36.566, 11.313,56.568
-		c 11.106,11.107, 25.54,17.738, 38.609,17.738c 5.262,0.00, 12.649-1.114, 17.958-6.424C 176.861,115.751, 177.04,105.962, 176.562,100.711z
-		 M 256.00,176.00c-17.673,0.00-32.00,14.327-32.00,32.00s 14.327,32.00, 32.00,32.00s 32.00-14.327, 32.00-32.00S 273.673,176.00, 256.00,176.00z M 409.576,54.424
-		c-5.31-5.31-12.696-6.424-17.958-6.424c-13.069,0.00-27.503,6.631-38.609,17.738c-10.061,10.06-16.464,22.807-17.569,34.973
-		c-0.479,5.251-0.30,15.04, 6.257,21.596c 5.309,5.311, 12.695,6.424, 17.958,6.424c 13.068,0.00, 27.503-6.631, 38.608-17.737
-		C 418.265,90.99, 420.279,65.126, 409.576,54.424z" />
-<glyph unicode="&#xe006;" d="M 32.00,384.00L 480.00,384.00L 480.00,320.00L 32.00,320.00zM 32.00,192.00L 480.00,192.00L 480.00,128.00L 32.00,128.00zM 32.00,288.00L 480.00,288.00L 480.00,224.00L 32.00,224.00zM 32.00,96.00L 480.00,96.00L 480.00,32.00L 32.00,32.00z" />
-<glyph unicode="&#xe004;" d="M 32.00,384.00L 480.00,384.00L 480.00,320.00L 32.00,320.00zM 32.00,192.00L 480.00,192.00L 480.00,128.00L 32.00,128.00zM 128.00,288.00L 384.00,288.00L 384.00,224.00L 128.00,224.00zM 128.00,96.00L 384.00,96.00L 384.00,32.00L 128.00,32.00z" />
-<glyph unicode="&#xe005;" d="M 32.00,384.00L 480.00,384.00L 480.00,320.00L 32.00,320.00zM 32.00,192.00L 480.00,192.00L 480.00,128.00L 32.00,128.00zM 192.00,288.00L 480.00,288.00L 480.00,224.00L 192.00,224.00zM 192.00,96.00L 480.00,96.00L 480.00,32.00L 192.00,32.00z" />
-<glyph unicode="&#xe003;" d="M 32.00,384.00L 480.00,384.00L 480.00,320.00L 32.00,320.00zM 32.00,192.00L 480.00,192.00L 480.00,128.00L 32.00,128.00zM 32.00,288.00L 320.00,288.00L 320.00,224.00L 32.00,224.00zM 32.00,96.00L 320.00,96.00L 320.00,32.00L 32.00,32.00z" />
-<glyph unicode="&#xe02d;" d="M 480.00,224.00l-4.571,0.00 L 347.062,224.00 c-25.039,17.71-57.215,27.43-91.062,27.43c-44.603,0.00-82.286,25.121-82.286,54.856
-	c0.00,29.735, 37.683,54.857, 82.286,54.857c 37.529,0.00, 70.154-17.788, 79.56-41.143l 56.508,0.00 c-3.965,25.322-18.79,48.984-42.029,66.413
-	C 324.599,405.493, 291.201,416.00, 256.00,416.00c-35.202,0.00-68.598-10.507-94.037-29.587c-27.394-20.545-43.106-49.751-43.106-80.127
-	s 15.712-59.582, 43.106-80.127c 0.978-0.733, 1.971-1.449, 2.973-2.158L 36.571,224.001 L 32.00,224.001 l0.00-32.00 l 256.266,0.00 c 29.104-8.553, 50.021-28.135, 50.021-50.286
-	c0.00-29.734-37.684-54.855-82.286-54.855c-37.53,0.00-70.154,17.787-79.559,41.143l-56.508,0.00 c 3.965-25.32, 18.791-48.984, 42.03-66.413
-	C 187.402,42.508, 220.798,32.00, 256.00,32.00c 35.201,0.00, 68.599,10.508, 94.037,29.587c 27.395,20.545, 43.104,49.751, 43.104,80.127
-	c0.00,17.649-5.327,34.896-15.147,50.286L 480.00,192.00 L 480.00,224.00 z" />
-<glyph unicode="&#xe02c;" d="M 96.00,64.00l 288.00,0.00 l0.00-32.00 L 96.00,32.00 L 96.00,64.00 zM 320.00,416.00l0.00-192.00 c0.00-15.656-7.35-30.812-20.695-42.676C 283.834,167.573, 262.771,160.00, 240.00,160.00c-22.772,0.00-43.834,7.573-59.304,21.324
-	C 167.35,193.188, 160.00,208.344, 160.00,224.00L 160.00,416.00 L 96.00,416.00 l0.00-192.00 c0.00-70.691, 64.471-128.00, 144.00-128.00c 79.529,0.00, 144.00,57.309, 144.00,128.00L 384.00,416.00 L 320.00,416.00 z" />
-<glyph unicode="&#xe02b;" d="M 416.00,416.00l0.00-32.00 l-72.00,0.00 L 216.00,64.00l 72.00,0.00 l0.00-32.00 L 64.00,32.00 l0.00,32.00 l 72.00,0.00 L 264.00,384.00l-72.00,0.00 L 192.00,416.00 L 416.00,416.00 z" />
-<glyph unicode="&#xe02a;" d="M 312.721,232.909C 336.758,251.984, 352.00,280.337, 352.00,312.00c0.00,57.438-50.145,104.00-112.00,104.00L 128.00,416.00 l0.00-384.00 l 144.00,0.00 
-	c 61.856,0.00, 112.00,46.562, 112.00,104.00C 384.00,180.098, 354.441,217.781, 312.721,232.909z M 192.00,328.00c0.00,13.255, 10.745,24.00, 24.00,24.00l 33.602,0.00 
-	C 270.809,352.00, 288.00,330.51, 288.00,304.00s-17.191-48.00-38.398-48.00L 192.00,256.00 L 192.00,328.00 z M 273.60,96.00L 216.00,96.00 c-13.255,0.00-24.00,10.745-24.00,24.00l0.00,72.00 l 81.60,0.00 
-	c 21.209,0.00, 38.40-21.49, 38.40-48.00S 294.809,96.00, 273.60,96.00z" />
-<glyph unicode="&#xe001;" d="M 425.373,358.627l-66.746,66.745C 346.183,437.818, 321.60,448.00, 304.00,448.00L 96.00,448.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-384.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 320.00,0.00 
-	c 17.60,0.00, 32.00,14.40, 32.00,32.00L 448.00,304.00 C 448.00,321.60, 437.817,346.182, 425.373,358.627z M 402.745,336.001c 3.396-3.398, 6.896-9.581, 9.447-16.001L 320.00,320.00 
-	L 320.00,412.193 c 6.42-2.55, 12.602-6.05, 16.00-9.448L 402.745,336.001z M 415.942,32.00L 96.057,32.00 c-0.02,0.017-0.041,0.038-0.057,0.058L 96.00,415.943 
-	c 0.017,0.02, 0.038,0.041, 0.057,0.057L 288.00,416.00 l0.00-128.00 l 128.00,0.00 l0.00-255.942 C 415.983,32.038, 415.962,32.017, 415.942,32.00z" />
-<glyph unicode="&#xe000;" d="M 480.00,40.00L 480.00,335.969 L 368.031,448.00L 72.00,448.00 c-22.091,0.00-40.00-17.908-40.00-40.00l0.00-368.00 c0.00-22.092, 17.909-40.00, 40.00-40.00l 368.00,0.00 
-	C 462.092,0.00, 480.00,17.908, 480.00,40.00z M 288.00,384.00l 32.00,0.00 l0.00-96.00 l-32.00,0.00 L 288.00,384.00 z M 352.00,64.00L 160.00,64.00 L 160.00,191.941 c 0.017,0.021, 0.038,0.041, 0.058,0.059l 191.885,0.00 
-	c 0.02-0.018, 0.041-0.038, 0.058-0.059L 352.00,64.00L 352.00,64.00z M 416.00,64.00l-32.00,0.00 L 384.00,192.00 c0.00,17.60-14.40,32.00-32.00,32.00L 160.00,224.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-128.00 L 96.00,64.00 L 96.00,384.00 
-	l 32.00,0.00 l0.00-96.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 160.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,85.505 l 64.00-64.036L 416.00,64.00 z" />
-<glyph unicode="&#xe01b;" d="M 32.00,384.00l0.00-352.00 l 448.00,0.00 L 480.00,384.00 L 32.00,384.00 z M 192.00,160.00l0.00,64.00 l 128.00,0.00 l0.00-64.00 L 192.00,160.00 z M 320.00,128.00l0.00-64.00 L 192.00,64.00 l0.00,64.00 L 320.00,128.00 z M 320.00,320.00l0.00-64.00 L 192.00,256.00 l0.00,64.00 L 320.00,320.00 z M 160.00,320.00l0.00-64.00 L 64.00,256.00 l0.00,64.00 L 160.00,320.00 
-	z M 64.00,224.00l 96.00,0.00 l0.00-64.00 L 64.00,160.00 L 64.00,224.00 z M 352.00,224.00l 96.00,0.00 l0.00-64.00 l-96.00,0.00 L 352.00,224.00 z M 352.00,256.00l0.00,64.00 l 96.00,0.00 l0.00-64.00 L 352.00,256.00 z M 64.00,128.00l 96.00,0.00 l0.00-64.00 L 64.00,64.00 L 64.00,128.00 z M 352.00,64.00l0.00,64.00 l 96.00,0.00 l0.00-64.00 L 352.00,64.00 z" />
-<glyph unicode="&#xe021;" d="M 256.00,410.00c 49.683,0.00, 96.391-19.347, 131.521-54.478S 442.00,273.683, 442.00,224.00s-19.348-96.391-54.479-131.521S 305.683,38.00, 256.00,38.00
-	s-96.391,19.348-131.522,54.479S 70.00,174.317, 70.00,224.00s 19.347,96.391, 54.478,131.522S 206.317,410.00, 256.00,410.00 M 256.00,448.00
-	C 132.288,448.00, 32.00,347.712, 32.00,224.00s 100.288-224.00, 224.00-224.00s 224.00,100.288, 224.00,224.00S 379.712,448.00, 256.00,448.00L 256.00,448.00zM 160.00,288.00A32.00,32.00 1620.00 1 1 224.00,288A32.00,32.00 1620.00 1 1 160.00,288zM 288.00,288.00A32.00,32.00 1620.00 1 1 352.00,288A32.00,32.00 1620.00 1 1 288.00,288zM 256.00,152.00c-50.92,0.00-96.28,18.437-125.583,47.164C 141.98,140.36, 193.806,96.00, 256.00,96.00c 62.194,0.00, 114.02,44.36, 125.584,103.164
-	C 352.28,170.437, 306.92,152.00, 256.00,152.00z" />
-<glyph unicode="&#xe023;" d="M 240.00,288.00L 144.00,384.00L 208.00,448.00L 32.00,448.00L 32.00,272.00L 96.00,336.00L 192.00,240.00 zM 320.00,240.00L 416.00,336.00L 480.00,272.00L 480.00,448.00L 304.00,448.00L 368.00,384.00L 272.00,288.00 zM 272.00,160.00L 368.00,64.00L 304.00,0.00L 480.00,0.00L 480.00,176.00L 416.00,112.00L 320.00,208.00 zM 192.00,208.00L 96.00,112.00L 32.00,176.00L 32.00,0.00L 208.00,0.00L 144.00,64.00L 240.00,160.00 z" />
-<glyph unicode="&#xe01c;" d="M 32.00,256.00L 480.00,256.00L 480.00,192.00L 32.00,192.00z" />
-<glyph unicode="&#xe01d;" d="M 32.00,96.00l 256.00,0.00 l0.00-64.00 L 32.00,32.00 L 32.00,96.00 z M 384.00,384.00L 273.721,384.00 l-91.883-256.00l-66.144,0.00 l 91.881,256.00L 96.00,384.00 L 96.00,448.00 l 288.00,0.00 L 384.00,384.00 z M 464.887,32.00L 400.00,96.887
-	L 335.113,32.00L 304.00,63.113L 368.887,128.00L 304.00,192.887L 335.113,224.00L 400.00,159.113L 464.887,224.00L 496.00,192.887L 431.113,128.00L 496.00,63.113
-	L 464.887,32.00z" />
-<glyph unicode="&#xe022;" d="M 128.00,416.00l 256.00,0.00 l0.00-64.00 L 128.00,352.00 L 128.00,416.00 z M 448.00,320.00L 64.00,320.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-128.00 c0.00-17.60, 14.398-32.00, 32.00-32.00l 64.00,0.00 l0.00-96.00 l 256.00,0.00 l0.00,96.00 l 64.00,0.00 
-	c 17.60,0.00, 32.00,14.40, 32.00,32.00L 480.00,288.00 C 480.00,305.60, 465.60,320.00, 448.00,320.00z M 352.00,64.00L 160.00,64.00 L 160.00,192.00 l 192.00,0.00 L 352.00,64.00 z M 455.20,272.00c0.00-12.813-10.387-23.20-23.199-23.20
-	S 408.80,259.187, 408.80,272.00s 10.389,23.20, 23.201,23.20C 444.814,295.20, 455.20,284.813, 455.20,272.00z" />
-<glyph unicode="&#xe02e;" d="M 192.00,416.00c-61.856,0.00-112.00-50.144-112.00-112.00s 50.144-112.00, 112.00-112.00l0.00-160.00 l 64.00,0.00 L 256.00,352.00 l 32.00,0.00 l0.00-320.00 l 64.00,0.00 L 352.00,352.00 l 64.00,0.00 L 416.00,416.00 L 192.00,416.00 z" />
-<glyph unicode="&#xe02f;" d="M 224.00,416.00c-61.856,0.00-112.00-50.144-112.00-112.00s 50.144-112.00, 112.00-112.00l0.00-160.00 l 64.00,0.00 L 288.00,352.00 l 32.00,0.00 l0.00-320.00 l 64.00,0.00 L 384.00,352.00 l 64.00,0.00 L 448.00,416.00 L 224.00,416.00 zM 32.00,32.00L 144.00,128.00L 32.00,224.00 z" />
-<glyph unicode="&#xe030;" d="M 160.00,416.00C 98.144,416.00, 48.00,365.856, 48.00,304.00s 50.144-112.00, 112.00-112.00l0.00-160.00 l 64.00,0.00 L 224.00,352.00 l 32.00,0.00 l0.00-320.00 l 64.00,0.00 L 320.00,352.00 l 64.00,0.00 L 384.00,416.00 L 160.00,416.00 zM 480.00,224.00L 368.00,128.00L 480.00,32.00 z" />
-<glyph unicode="&#xe026;" d="M 256.00,288.00L 320.00,288.00L 320.00,256.00L 256.00,256.00zM 256.00,96.00L 320.00,96.00L 320.00,64.00L 256.00,64.00zM 288.00,192.00L 352.00,192.00L 352.00,160.00L 288.00,160.00zM 384.00,192.00L 384.00,96.00L 352.00,96.00L 352.00,64.00L 416.00,64.00L 416.00,192.00 	zM 192.00,192.00L 256.00,192.00L 256.00,160.00L 192.00,160.00zM 160.00,96.00L 224.00,96.00L 224.00,64.00L 160.00,64.00zM 160.00,288.00L 224.00,288.00L 224.00,256.00L 160.00,256.00zM 96.00,384.00L 96.00,256.00L 128.00,256.00L 128.00,352.00L 160.00,352.00L 160.00,384.00 	zM 352.00,256.00L 416.00,256.00L 416.00,384.00L 384.00,384.00L 384.00,288.00L 352.00,288.00 	zM 32.00,448.00l0.00-448.00 l 448.00,0.00 L 480.00,448.00 L 32.00,448.00 z M 448.00,32.00L 64.00,32.00 L 64.00,416.00 l 384.00,0.00 L 448.00,32.00 zM 96.00,192.00L 96.00,64.00L 128.00,64.00L 128.00,160.00L 160.00,160.00L 160.00,192.00 	zM 288.00,384.00L 352.00,384.00L 352.00,352.00L 288.00,352.00zM 192.00,384.00L 256.00,384.00L 256.00,352.00L 192.00,352.00z" />
-<glyph unicode="&#xe027;" d="M 408.00,448.00l 8.00-192.00L 96.00,256.00 l 8.00,192.00l 16.00,0.00 l 8.00-160.00l 256.00,0.00 l 8.00,160.00L 408.00,448.00 z M 104.00,0.00l-8.00,160.00l 320.00,0.00 l-8.00-160.00l-16.00,0.00 l-8.00,128.00L 128.00,128.00 l-8.00-128.00L 104.00,0.00 zM 32.00,224.00L 96.00,224.00L 96.00,192.00L 32.00,192.00zM 128.00,224.00L 192.00,224.00L 192.00,192.00L 128.00,192.00zM 224.00,224.00L 288.00,224.00L 288.00,192.00L 224.00,192.00zM 320.00,224.00L 384.00,224.00L 384.00,192.00L 320.00,192.00zM 416.00,224.00L 480.00,224.00L 480.00,192.00L 416.00,192.00z" />
-<glyph unicode="&#xe024;" d="M 480.00,416.00L 480.00,448.00 l-96.00,0.00 c-17.601,0.00-32.00-14.40-32.00-32.00l0.00-160.00 c0.00-7.928, 2.929-15.201, 7.748-20.807L 208.00,105.00l-71.00,74.00l-41.00-35.00l 112.00-144.00l 208.00,224.00l 64.00,0.00 
-		l0.00,32.00 l-96.00,0.00 L 384.00,416.00 L 480.00,416.00 zM 128.00,224.00l 32.00,0.00 L 160.00,416.00 c0.00,17.60-14.40,32.00-32.00,32.00L 64.00,448.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-192.00 l 32.00,0.00 l0.00,96.00 l 64.00,0.00 L 128.00,224.00 z M 64.00,352.00L 64.00,416.00 l 64.00,0.00 l0.00-64.00 L 64.00,352.00 zM 320.00,256.00l0.00,48.00 c0.00,17.60-4.40,32.00-22.00,32.00c 17.60,0.00, 22.00,14.40, 22.00,32.00L 320.00,416.00 c0.00,17.60-14.40,32.00-32.00,32.00l-96.00,0.00 l0.00-224.00 l 96.00,0.00 C 305.60,224.00, 320.00,238.40, 320.00,256.00z
-		 M 224.00,416.00l 64.00,0.00 l0.00-64.00 l-64.00,0.00 L 224.00,416.00 z M 224.00,320.00l 64.00,0.00 l0.00-64.00 l-64.00,0.00 L 224.00,320.00 z" />
-<glyph unicode="&#xe025;" d="M 224.00,224.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 l0.00,64.00 l 64.00,0.00 l0.00-64.00 l 64.00,0.00 l0.00-64.00 l-64.00,0.00 l0.00-64.00 l-64.00,0.00 L 224.00,224.00 z M 480.00,192.00l0.00-160.00 L 32.00,32.00 L 32.00,192.00 l 64.00,0.00 l0.00-96.00 l 320.00,0.00 l0.00,96.00 L 480.00,192.00 z" />
-<glyph unicode="&#xe017;" d="M 208.00,128.00L 112.00,224.00L 208.00,320.00L 176.00,352.00L 48.00,224.00L 176.00,96.00 zM 336.00,352.00L 304.00,320.00L 400.00,224.00L 304.00,128.00L 336.00,96.00L 464.00,224.00 z" />
-<glyph unicode="&#xe016;" d="M 224.00,128.00l 64.00,0.00 l0.00-64.00 l-64.00,0.00 L 224.00,128.00 z M 352.00,352.00c 17.673,0.00, 32.00-14.327, 32.00-32.00l0.00-83.00 l-114.00-77.00l-46.00,0.00 l0.00,32.00 l 96.00,64.00l0.00,32.00 L 160.00,288.00 l0.00,64.00 L 352.00,352.00 z M 256.00,448.00
-	c-59.833,0.00-116.083-23.30-158.392-65.608C 55.301,340.083, 32.00,283.833, 32.00,224.00c0.00-59.832, 23.301-116.084, 65.608-158.392
-	C 139.917,23.30, 196.167,0.00, 256.00,0.00c 59.832,0.00, 116.084,23.30, 158.392,65.608C 456.70,107.916, 480.00,164.168, 480.00,224.00
-	c0.00,59.833-23.30,116.083-65.608,158.392C 372.084,424.70, 315.832,448.00, 256.00,448.00z" />
-<glyph unicode="&#xe014;" d="M 448.00,416.00L 64.00,416.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-320.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 384.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 480.00,384.00 C 480.00,401.60, 465.60,416.00, 448.00,416.00z
-		 M 448.00,64.058c-0.006-0.007-0.015-0.014-0.021-0.021L 352.00,224.00l-80.00-64.00L 160.00,304.00L 64.016,64.042c-0.005,0.005-0.011,0.011-0.016,0.016
-		L 64.00,383.943 c 0.017,0.02, 0.038,0.041, 0.057,0.057l 383.885,0.00 c 0.02-0.017, 0.041-0.038, 0.058-0.058L 448.00,64.058 zM 320.00,304.00A48.00,48.00 1620.00 1 1 416.00,304A48.00,48.00 1620.00 1 1 320.00,304z" />
-<glyph unicode="&#xe015;" d="M 448.00,416.00L 64.00,416.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-320.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 384.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 480.00,384.00 C 480.00,401.60, 465.60,416.00, 448.00,416.00z
-	 M 128.00,64.00L 64.00,64.00 l0.00,64.00 l 64.00,0.00 L 128.00,64.00 z M 128.00,192.00L 64.00,192.00 l0.00,64.00 l 64.00,0.00 L 128.00,192.00 z M 128.00,320.00L 64.00,320.00 L 64.00,384.00 l 64.00,0.00 L 128.00,320.00 z M 352.00,64.00L 160.00,64.00 L 160.00,384.00 l 192.00,0.00 L 352.00,64.00 z M 448.00,64.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 448.00,64.00 z
-	 M 448.00,192.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 448.00,192.00 z M 448.00,320.00l-64.00,0.00 L 384.00,384.00 l 64.00,0.00 L 448.00,320.00 zM 192.00,320.00L 192.00,128.00L 336.00,224.00 z" />
-<glyph unicode="&#xe018;" d="M 38.899,327.688l 40.707-25.441C 105.007,342.804, 144.00,373.974, 190.21,389.37l-15.183,45.547
-		C 118.153,415.968, 70.163,377.604, 38.899,327.688zM 336.973,434.917L 321.79,389.37c 46.211-15.396, 85.202-46.566, 110.604-87.124l 40.706,25.441
-		C 441.837,377.604, 393.847,415.968, 336.973,434.917zM 303.987,127.996c-2.404,0.00-4.846,0.545-7.143,1.693L 224.00,166.111L 224.00,272.00 c0.00,8.836, 7.164,16.00, 16.00,16.00s 16.00-7.164, 16.00-16.00l0.00-86.111 
-		l 55.155-27.578c 7.903-3.951, 11.107-13.562, 7.155-21.466C 315.508,131.238, 309.856,127.997, 303.987,127.996zM 256.00,384.00C 149.961,384.00, 64.00,298.039, 64.00,192.00c0.00-106.039, 85.961-192.00, 192.00-192.00c 106.039,0.00, 192.00,85.961, 192.00,192.00
-	C 448.00,298.039, 362.039,384.00, 256.00,384.00z M 256.00,48.00c-79.529,0.00-144.00,64.471-144.00,144.00c0.00,79.529, 64.471,144.00, 144.00,144.00c 79.529,0.00, 144.00-64.471, 144.00-144.00
-	C 400.00,112.471, 335.529,48.00, 256.00,48.00z" />
-<glyph unicode="&#xe019;" d="M 32.00,252.127c 22.659,24.96, 48.581,46.18, 76.636,62.562C 153.802,341.061, 204.759,355.00, 256.00,355.00
-		c 51.24,0.00, 102.198-13.939, 147.363-40.312c 28.056-16.382, 53.978-37.602, 76.637-62.562l0.00,58.716 
-		c-16.505,14.059-34.062,26.57-52.434,37.297C 375.063,378.796, 315.737,395.00, 256.00,395.00s-119.064-16.204-171.567-46.86
-		C 66.062,337.413, 48.505,324.901, 32.00,310.842L 32.00,252.127 zM 256.00,320.00c-91.598,0.00-172.919-50.278-224.00-128.00c 51.081-77.724, 132.402-128.00, 224.00-128.00c 91.598,0.00, 172.919,50.276, 224.00,128.00
-	C 428.919,269.722, 347.598,320.00, 256.00,320.00z M 256.00,224.00c0.00-17.673-14.327-32.00-32.00-32.00s-32.00,14.327-32.00,32.00c0.00,17.674, 14.327,32.00, 32.00,32.00
-	S 256.00,241.674, 256.00,224.00z M 364.033,131.669C 330.316,111.982, 293.969,102.00, 256.00,102.00s-74.316,9.982-108.033,29.669
-	C 122.19,146.721, 98.659,167.324, 78.91,192.00c 19.749,24.675, 43.28,45.279, 69.058,60.33c 6.638,3.876, 13.379,7.37, 20.213,10.491
-	C 162.925,250.95, 160.00,237.817, 160.00,224.00c0.00-53.02, 42.981-96.00, 96.00-96.00c 53.02,0.00, 96.00,42.98, 96.00,96.00c0.00,13.817-2.925,26.95-8.18,38.821
-	c 6.834-3.122, 13.575-6.615, 20.213-10.491c 25.777-15.051, 49.308-35.655, 69.058-60.33
-	C 413.342,167.324, 389.811,146.721, 364.033,131.669z" />
-<glyph unicode="&#xe01a;" d="M 325.584,338.083C 313.278,379.064, 311.146,384.00, 272.00,384.00l-32.00,0.00 c-39.809,0.00-41.332-5.076-54.209-48.00c0.00-0.001,0.00-0.001-0.001-0.002
-	L 113.791,96.00l 56.818,0.00 l 28.80,96.00l 113.183,0.00 l 28.80-96.00l 56.815,0.00 L 325.584,338.083z M 218.609,256.00l 19.20,68.00c 5.043,16.809, 18.19,15.00, 18.19,15.00
-	s 13.147,1.809, 18.19-15.00l 0.002,0.00 l 19.20-68.00L 218.609,256.00 z" />
-<glyph unicode="&#xe028;" d="M 288.00,448.00 C 411.712,448.00 512.00,347.712 512.00,224.00 C 512.00,100.288 411.712,0.00 288.00,0.00 L 288.00,48.00 C 335.012,48.00 379.209,66.307 412.451,99.549 C 445.693,132.791 464.00,176.988 464.00,224.00 C 464.00,271.011 445.693,315.209 412.451,348.451 C 379.209,381.693 335.012,400.00 288.00,400.00 C 240.989,400.00 196.791,381.693 163.549,348.451 C 137.979,322.882 121.258,290.828 114.896,256.00 L 208.00,256.00 L 96.00,128.00 L -16.00,256.00 L 66.285,256.00 C 81.815,364.551 175.154,448.00 288.00,448.00 ZM 384.00,256.00 L 384.00,192.00 L 256.00,192.00 L 256.00,352.00 L 320.00,352.00 L 320.00,256.00 Z" />
-<glyph unicode="&#xe002;" d="M 512.00,183.771l0.00,80.458 l-79.572,7.957c-4.093,15.021-10.044,29.274-17.605,42.49l 52.298,63.919L 410.595,435.12l-63.918-52.298
-	c-13.217,7.562-27.471,13.513-42.491,17.604L 296.229,480.00l-80.458,0.00 l-7.957-79.573c-15.021-4.093-29.274-10.043-42.49-17.604
-	L 101.405,435.12L 44.88,378.595l 52.298-63.918c-7.562-13.216-13.513-27.47-17.605-42.49L0.00,264.229l0.00-80.458 l 79.573-7.957
-	c 4.093-15.021, 10.043-29.274, 17.605-42.491L 44.88,69.405l 56.524-56.524l 63.919,52.298c 13.216-7.562, 27.47-13.514, 42.49-17.605
-	L 215.771-32.00l 80.458,0.00 l 7.957,79.572c 15.021,4.093, 29.274,10.044, 42.491,17.605l 63.918-52.298l 56.524,56.524l-52.298,63.918
-	c 7.562,13.217, 13.514,27.471, 17.605,42.49L 512.00,183.771z M 352.00,192.00l-64.00-64.00l-64.00,0.00 l-64.00,64.00l0.00,64.00 l 64.00,64.00l 64.00,0.00 l 64.00-64.00L 352.00,192.00 z" />
-<glyph unicode="&#xe01f;" d="M 384.00,377.00 L 384.00,352.00 L 448.00,352.00 L 448.00,320.00 L 352.00,320.00 L 352.00,393.00 L 416.00,423.00 L 416.00,448.00 L 352.00,448.00 L 352.00,480.00 L 448.00,480.00 L 448.00,407.00 ZM 338.00,352.00L 270.00,352.00L 176.00,258.00L 82.00,352.00L 14.00,352.00L 142.00,224.00L 14.00,96.00L 82.00,96.00L 176.00,190.00L 270.00,96.00L 338.00,96.00L 210.00,224.00 z" />
-<glyph unicode="&#xe01e;" d="M 384.00,25.00 L 384.00,0.00 L 448.00,0.00 L 448.00-32.00 L 352.00-32.00 L 352.00,41.00 L 416.00,71.00 L 416.00,96.00 L 352.00,96.00 L 352.00,128.00 L 448.00,128.00 L 448.00,55.00 ZM 338.00,352.00L 270.00,352.00L 176.00,258.00L 82.00,352.00L 14.00,352.00L 142.00,224.00L 14.00,96.00L 82.00,96.00L 176.00,190.00L 270.00,96.00L 338.00,96.00L 210.00,224.00 z" />
-<glyph unicode="&#x20;" horiz-adv-x="256" />
-<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.ttf b/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.ttf
deleted file mode 100644
index 8fad6572..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.ttf
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.woff b/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.woff
deleted file mode 100644
index e5f89435..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon-small.woff
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.eot b/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.eot
deleted file mode 100644
index 0350809a..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.eot
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.svg b/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.svg
deleted file mode 100644
index fa1d05f6..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon.
-<iconset grid="16"></iconset>
-</metadata>
-<defs>
-<font id="icomoon" horiz-adv-x="512" >
-<font-face units-per-em="512" ascent="480" descent="-32" />
-<missing-glyph horiz-adv-x="512" />
-<glyph unicode="&#xe034;" d="M 464.00,416.00L 256.00,416.00L 240.00,448.00L 64.00,448.00L 32.00,384.00L 480.00,384.00 zM 452.17,128.00l 37.43,0.00 L 512.00,352.00L0.00,352.00 l 32.00-320.00l 242.04,0.00 C 221.599,50.888, 184.00,101.133, 184.00,160.00c0.00,74.991, 61.009,136.00, 136.00,136.00
-	c 74.99,0.00, 136.00-61.009, 136.00-136.00C 456.00,149.161, 454.689,138.425, 452.17,128.00zM 501.498,23.125l-99.248,87.346C 410.977,124.931, 416.00,141.878, 416.00,160.00c0.00,53.02-42.98,96.00-96.00,96.00s-96.00-42.98-96.00-96.00
-	s 42.98-96.00, 96.00-96.00c 18.122,0.00, 35.069,5.023, 49.529,13.75l 87.346-99.248c 11.481-13.339, 31.059-14.07, 43.503-1.626l 2.746,2.746
-	C 515.568-7.934, 514.837,11.644, 501.498,23.125z M 320.00,98.00c-34.242,0.00-62.00,27.758-62.00,62.00s 27.758,62.00, 62.00,62.00s 62.00-27.758, 62.00-62.00
-	S 354.242,98.00, 320.00,98.00z" />
-<glyph unicode="&#xe032;" d="M 384.00,352.00L 416.00,352.00L 416.00,320.00L 384.00,320.00zM 320.00,288.00L 352.00,288.00L 352.00,256.00L 320.00,256.00zM 320.00,224.00L 352.00,224.00L 352.00,192.00L 320.00,192.00zM 320.00,160.00L 352.00,160.00L 352.00,128.00L 320.00,128.00zM 256.00,224.00L 288.00,224.00L 288.00,192.00L 256.00,192.00zM 256.00,160.00L 288.00,160.00L 288.00,128.00L 256.00,128.00zM 192.00,160.00L 224.00,160.00L 224.00,128.00L 192.00,128.00zM 384.00,288.00L 416.00,288.00L 416.00,256.00L 384.00,256.00zM 384.00,224.00L 416.00,224.00L 416.00,192.00L 384.00,192.00zM 384.00,160.00L 416.00,160.00L 416.00,128.00L 384.00,128.00zM 384.00,96.00L 416.00,96.00L 416.00,64.00L 384.00,64.00zM 320.00,96.00L 352.00,96.00L 352.00,64.00L 320.00,64.00zM 256.00,96.00L 288.00,96.00L 288.00,64.00L 256.00,64.00zM 192.00,96.00L 224.00,96.00L 224.00,64.00L 192.00,64.00zM 128.00,96.00L 160.00,96.00L 160.00,64.00L 128.00,64.00z"  />
-<glyph unicode="&#xe031;" d="M 416.00,352.00l-96.00,0.00 L 320.00,384.00 L 224.00,480.00L0.00,480.00 l0.00-384.00 l 192.00,0.00 l0.00-128.00 l 320.00,0.00 L 512.00,256.00 L 416.00,352.00z M 416.00,306.745L 466.745,256.00L 416.00,256.00 L 416.00,306.745 z M 224.00,434.745L 274.745,384.00L 224.00,384.00 
-	L 224.00,434.745 z M 32.00,448.00l 160.00,0.00 l0.00-96.00 l 96.00,0.00 l0.00-224.00 L 32.00,128.00 L 32.00,448.00 z M 480.00,0.00L 224.00,0.00 l0.00,96.00 l 96.00,0.00 L 320.00,320.00 l 64.00,0.00 l0.00-96.00 l 96.00,0.00 L 480.00,0.00 z"  />
-<glyph unicode="&#xe030;" d="M 128.00,448.00 L 384.00,448.00 L 384.00,384.00 L 320.00,384.00 L 320.00,0.00 L 256.00,0.00 L 256.00,384.00 L 192.00,384.00 L 192.00,0.00 L 128.00,0.00 L 128.00,224.00 C 66.144,224.00 16.00,274.144 16.00,336.00 C 16.00,397.856 66.144,448.00 128.00,448.00 ZM 480.00,32.00L 352.00,144.00L 480.00,256.00 z"  />
-<glyph unicode="&#xe02f;" d="M 224.00,448.00 L 480.00,448.00 L 480.00,384.00 L 416.00,384.00 L 416.00,0.00 L 352.00,0.00 L 352.00,384.00 L 288.00,384.00 L 288.00,0.00 L 224.00,0.00 L 224.00,224.00 C 162.144,224.00 112.00,274.144 112.00,336.00 C 112.00,397.856 162.144,448.00 224.00,448.00 ZM 32.00,256.00L 160.00,144.00L 32.00,32.00 z"  />
-<glyph unicode="&#xe02e;" d="M 192.00,448.00 L 448.00,448.00 L 448.00,384.00 L 384.00,384.00 L 384.00,0.00 L 320.00,0.00 L 320.00,384.00 L 256.00,384.00 L 256.00,0.00 L 192.00,0.00 L 192.00,224.00 C 130.144,224.00 80.00,274.144 80.00,336.00 C 80.00,397.856 130.144,448.00 192.00,448.00 Z"  />
-<glyph unicode="&#xe02d;" d="M 365.71,221.482 C 397.67,197.513 416.00,163.439 416.00,128.00 C 416.00,92.561 397.67,58.487 365.71,34.518 C 336.031,12.259 297.068,0.00 256.00,0.00 C 214.931,0.00 175.969,12.259 146.29,34.518 C 114.33,58.487 96.00,92.561 96.00,128.00 L 160.00,128.00 C 160.00,93.309 203.963,64.00 256.00,64.00 C 308.037,64.00 352.00,93.309 352.00,128.00 C 352.00,162.691 308.037,192.00 256.00,192.00 C 214.931,192.00 175.969,204.259 146.29,226.518 C 114.33,250.488 96.00,284.561 96.00,320.00 C 96.00,355.439 114.33,389.512 146.29,413.482 C 175.969,435.741 214.931,448.00 256.00,448.00 C 297.068,448.00 336.031,435.741 365.71,413.482 C 397.67,389.512 416.00,355.439 416.00,320.00 L 352.00,320.00 C 352.00,354.691 308.037,384.00 256.00,384.00 C 203.963,384.00 160.00,354.691 160.00,320.00 C 160.00,285.309 203.963,256.00 256.00,256.00 C 297.068,256.00 336.031,243.741 365.71,221.482 ZM0.00,224.00L 512.00,224.00L 512.00,192.00L0.00,192.00z"  />
-<glyph unicode="&#xe02c;" d="M 352.00,448.00 L 416.00,448.00 L 416.00,240.00 C 416.00,160.471 344.366,96.00 256.00,96.00 C 167.635,96.00 96.00,160.471 96.00,240.00 L 96.00,448.00 L 160.00,448.00 L 160.00,240.00 C 160.00,219.917 169.119,200.648 185.677,185.747 C 204.125,169.145 229.10,160.00 256.00,160.00 C 282.90,160.00 307.875,169.145 326.323,185.747 C 342.881,200.648 352.00,219.917 352.00,240.00 L 352.00,448.00 ZM 96.00,64.00L 416.00,64.00L 416.00,0.00L 96.00,0.00z"  />
-<glyph unicode="&#xe02b;" d="M 448.00,448.00 L 448.00,416.00 L 384.00,416.00 L 224.00,32.00 L 288.00,32.00 L 288.00,0.00 L 64.00,0.00 L 64.00,32.00 L 128.00,32.00 L 288.00,416.00 L 224.00,416.00 L 224.00,448.00 Z"  />
-<glyph unicode="&#xe02a;" d="M 353.94,237.674C 372.689,259.945, 384.00,288.678, 384.00,320.00c0.00,70.58-57.421,128.00-128.00,128.00l-64.00,0.00 l-64.00,0.00 L 96.00,448.00 l0.00-448.00 l 32.00,0.00 l 64.00,0.00 l 96.00,0.00 
-	c 70.579,0.00, 128.00,57.421, 128.00,128.00C 416.00,174.478, 391.101,215.248, 353.94,237.674z M 192.00,384.00l 50.75,0.00 c 27.984,0.00, 50.75-28.71, 50.75-64.00
-	s-22.766-64.00-50.75-64.00L 192.00,256.00 L 192.00,384.00 z M 271.50,64.00L 192.00,64.00 L 192.00,192.00 l 79.50,0.00 c 29.225,0.00, 53.00-28.71, 53.00-64.00S 300.725,64.00, 271.50,64.00z"  />
-<glyph unicode="&#xe029;" d="M 192.00,64.00L 288.00,64.00L 288.00-32.00L 192.00-32.00zM 400.00,448.00 C 426.51,448.00 448.00,426.51 448.00,400.00 L 448.00,256.00 L 288.00,160.00 L 288.00,96.00 L 192.00,96.00 L 192.00,192.00 L 352.00,288.00 L 352.00,352.00 L 96.00,352.00 L 96.00,448.00 L 400.00,448.00 Z" />
-<glyph unicode="&#xe028;" d="M 288.00,448.00 C 411.712,448.00 512.00,347.712 512.00,224.00 C 512.00,100.288 411.712,0.00 288.00,0.00 L 288.00,48.00 C 335.012,48.00 379.209,66.307 412.451,99.549 C 445.693,132.791 464.00,176.988 464.00,224.00 C 464.00,271.011 445.693,315.209 412.451,348.451 C 379.209,381.693 335.012,400.00 288.00,400.00 C 240.989,400.00 196.791,381.693 163.549,348.451 C 137.979,322.882 121.258,290.828 114.896,256.00 L 208.00,256.00 L 96.00,128.00 L -16.00,256.00 L 66.285,256.00 C 81.815,364.551 175.154,448.00 288.00,448.00 ZM 384.00,256.00 L 384.00,192.00 L 256.00,192.00 L 256.00,352.00 L 320.00,352.00 L 320.00,256.00 Z"  />
-<glyph unicode="&#xe027;" d="M0.00,224.00L 64.00,224.00L 64.00,192.00L0.00,192.00zM 96.00,224.00L 192.00,224.00L 192.00,192.00L 96.00,192.00zM 224.00,224.00L 288.00,224.00L 288.00,192.00L 224.00,192.00zM 320.00,224.00L 416.00,224.00L 416.00,192.00L 320.00,192.00zM 448.00,224.00L 512.00,224.00L 512.00,192.00L 448.00,192.00zM 440.00,480.00 L 448.00,256.00 L 64.00,256.00 L 72.00,480.00 L 88.00,480.00 L 96.00,288.00 L 416.00,288.00 L 424.00,480.00 ZM 72.00-32.00 L 64.00,160.00 L 448.00,160.00 L 440.00-32.00 L 424.00-32.00 L 416.00,128.00 L 96.00,128.00 L 88.00-32.00 Z"  />
-<glyph unicode="&#xe026;" d="M 192.00,384.00L 256.00,384.00L 256.00,352.00L 192.00,352.00zM 288.00,384.00L 352.00,384.00L 352.00,352.00L 288.00,352.00zM 448.00,384.00 L 448.00,256.00 L 352.00,256.00 L 352.00,288.00 L 416.00,288.00 L 416.00,352.00 L 384.00,352.00 L 384.00,384.00 ZM 160.00,288.00L 224.00,288.00L 224.00,256.00L 160.00,256.00zM 256.00,288.00L 320.00,288.00L 320.00,256.00L 256.00,256.00zM 96.00,352.00 L 96.00,288.00 L 128.00,288.00 L 128.00,256.00 L 64.00,256.00 L 64.00,384.00 L 160.00,384.00 L 160.00,352.00 ZM 192.00,192.00L 256.00,192.00L 256.00,160.00L 192.00,160.00zM 288.00,192.00L 352.00,192.00L 352.00,160.00L 288.00,160.00zM 448.00,192.00 L 448.00,64.00 L 352.00,64.00 L 352.00,96.00 L 416.00,96.00 L 416.00,160.00 L 384.00,160.00 L 384.00,192.00 ZM 160.00,96.00L 224.00,96.00L 224.00,64.00L 160.00,64.00zM 256.00,96.00L 320.00,96.00L 320.00,64.00L 256.00,64.00zM 96.00,160.00 L 96.00,96.00 L 128.00,96.00 L 128.00,64.00 L 64.00,64.00 L 64.00,192.00 L 160.00,192.00 L 160.00,160.00 ZM 480.00,448.00 L 32.00,448.00 L 32.00,0.00 L 480.00,0.00 L 480.00,448.00 Z M 512.00,480.00 L 512.00,480.00 L 512.00-32.00 L 0.00-32.00 L 0.00,480.00 L 512.00,480.00 Z"  />
-<glyph unicode="&#xe025;" d="M 224.00,192.00 L 128.00,192.00 L 128.00,256.00 L 224.00,256.00 L 224.00,352.00 L 288.00,352.00 L 288.00,256.00 L 384.00,256.00 L 384.00,192.00 L 288.00,192.00 L 288.00,96.00 L 224.00,96.00 ZM 512.00,160.00 L 512.00-32.00 L 0.00-32.00 L 0.00,160.00 L 64.00,160.00 L 64.00,32.00 L 448.00,32.00 L 448.00,160.00 Z"  />
-<glyph unicode="&#xe024;" d="M 64.00,352.00l 64.00,0.00 l0.00-96.00 l 32.00,0.00 L 160.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00L 64.00,480.00 C 46.40,480.00, 32.00,465.60, 32.00,448.00l0.00-192.00 l 32.00,0.00 L 64.00,352.00 z M 64.00,448.00l 64.00,0.00 l0.00-64.00 L 64.00,384.00 L 64.00,448.00 z M 480.00,448.00L 480.00,480.00 l-96.00,0.00 
-	c-17.601,0.00-32.00-14.40-32.00-32.00l0.00-160.00 c0.00-17.60, 14.399-32.00, 32.00-32.00l 96.00,0.00 l0.00,32.00 l-96.00,0.00 L 384.00,448.00 L 480.00,448.00 z M 320.00,400.00L 320.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00l-96.00,0.00 l0.00-224.00 l 96.00,0.00 
-	c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,48.00 c0.00,17.60-4.40,32.00-22.00,32.00C 315.60,368.00, 320.00,382.40, 320.00,400.00z M 288.00,288.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 288.00,288.00 z M 288.00,384.00l-64.00,0.00 L 224.00,448.00 l 64.00,0.00 L 288.00,384.00 zM 416.00,192.00 L 208.00-32.00 L 96.00,112.00 L 137.00,147.00 L 208.00,73.00 L 384.00,224.00 Z"  />
-<glyph unicode="&#xe023;" d="M 512.00,480.00 L 512.00,288.00 L 442.87,357.13 L 336.87,251.13 L 283.13,304.87 L 389.13,410.87 L 320.00,480.00 ZM 122.87,410.87 L 228.87,304.87 L 175.13,251.13 L 69.13,357.13 L 0.00,288.00 L 0.00,480.00 L 192.00,480.00 ZM 442.87,90.87 L 512.00,160.00 L 512.00-32.00 L 320.00-32.00 L 389.13,37.13 L 283.13,143.13 L 336.87,196.87 ZM 228.87,143.13 L 122.87,37.13 L 192.00-32.00 L 0.00-32.00 L 0.00,160.00 L 69.13,90.87 L 175.13,196.87 Z"  />
-<glyph unicode="&#xe022;" d="M 128.00,448.00L 384.00,448.00L 384.00,384.00L 128.00,384.00zM 480.00,352.00L 32.00,352.00 C 14.40,352.00,0.00,337.60,0.00,320.00l0.00-160.00 c0.00-17.60, 14.398-32.00, 32.00-32.00l 96.00,0.00 l0.00-128.00 l 256.00,0.00 L 384.00,128.00 l 96.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 512.00,320.00 
-		C 512.00,337.60, 497.60,352.00, 480.00,352.00z M 352.00,32.00L 160.00,32.00 L 160.00,192.00 l 192.00,0.00 L 352.00,32.00 z M 487.20,304.00c0.00-12.813-10.387-23.20-23.199-23.20
-		c-12.813,0.00-23.201,10.387-23.201,23.20s 10.388,23.20, 23.201,23.20C 476.814,327.20, 487.20,316.813, 487.20,304.00z"  />
-<glyph unicode="&#xe021;" d="M 256.00,480.00C 114.615,480.00,0.00,365.386,0.00,224.00c0.00-141.385, 114.614-256.00, 256.00-256.00c 141.385,0.00, 256.00,114.615, 256.00,256.00
-	C 512.00,365.386, 397.385,480.00, 256.00,480.00z M 256.00,8.00c-119.293,0.00-216.00,96.706-216.00,216.00c0.00,119.293, 96.707,216.00, 216.00,216.00c 119.295,0.00, 216.00-96.707, 216.00-216.00
-	C 472.00,104.706, 375.295,8.00, 256.00,8.00z M 192.00,320.00c0.00-17.673-14.327-32.00-32.00-32.00s-32.00,14.327-32.00,32.00s 14.327,32.00, 32.00,32.00S 192.00,337.673, 192.00,320.00z
-	 M 384.00,320.00c0.00-17.673-14.326-32.00-32.00-32.00s-32.00,14.327-32.00,32.00s 14.326,32.00, 32.00,32.00S 384.00,337.673, 384.00,320.00zM 256.00,154.00 C 326.537,154.00 387.344,182.766 415.231,215.596 C 404.795,129.986 337.087,64.00 256.00,64.00 C 174.941,64.00 107.251,130.013 96.778,215.584 C 124.671,182.761 185.471,154.00 256.00,154.00 Z"  />
-<glyph unicode="&#xe020;" d="M 352.00,32.00 L 480.00,32.00 L 512.00,96.00 L 512.00-32.00 L 320.00-32.00 L 320.00,75.107 C 385.556,103.349 432.00,173.688 432.00,256.00 C 432.00,363.216 353.201,447.133 256.00,447.133 C 158.797,447.133 80.00,363.217 80.00,256.00 C 80.00,173.688 126.443,103.349 192.00,75.107 L 192.00-32.00 L 0.00-32.00 L 0.00,96.00 L 32.00,32.00 L 160.00,32.00 L 160.00,48.295 C 66.185,81.525 0.00,161.996 0.00,256.00 C 0.00,379.712 114.615,480.00 256.00,480.00 C 397.385,480.00 512.00,379.712 512.00,256.00 C 512.00,161.996 445.815,81.525 352.00,48.295 L 352.00,32.00 Z"  />
-<glyph unicode="&#xe01f;" d="M 384.00,377.00 L 384.00,352.00 L 448.00,352.00 L 448.00,320.00 L 352.00,320.00 L 352.00,393.00 L 416.00,423.00 L 416.00,448.00 L 352.00,448.00 L 352.00,480.00 L 448.00,480.00 L 448.00,407.00 ZM 338.00,352.00L 270.00,352.00L 176.00,258.00L 82.00,352.00L 14.00,352.00L 142.00,224.00L 14.00,96.00L 82.00,96.00L 176.00,190.00L 270.00,96.00L 338.00,96.00L 210.00,224.00 z"  />
-<glyph unicode="&#xe01e;" d="M 384.00,25.00 L 384.00,0.00 L 448.00,0.00 L 448.00-32.00 L 352.00-32.00 L 352.00,41.00 L 416.00,71.00 L 416.00,96.00 L 352.00,96.00 L 352.00,128.00 L 448.00,128.00 L 448.00,55.00 ZM 338.00,352.00L 270.00,352.00L 176.00,258.00L 82.00,352.00L 14.00,352.00L 142.00,224.00L 14.00,96.00L 82.00,96.00L 176.00,190.00L 270.00,96.00L 338.00,96.00L 210.00,224.00 z"  />
-<glyph unicode="&#xe01d;" d="M0.00,32.00L 288.00,32.00L 288.00-32.00L0.00-32.00zM 96.00,480.00L 448.00,480.00L 448.00,416.00L 96.00,416.00zM 138.694,64.00 L 241.038,456.082 L 302.963,439.918 L 204.838,64.00 ZM 464.887-32.00 L 400.00,32.887 L 335.113-32.00 L 304.00-0.887 L 368.887,64.00 L 304.00,128.887 L 335.113,160.00 L 400.00,95.113 L 464.887,160.00 L 496.00,128.887 L 431.113,64.00 L 496.00-0.887 Z"  />
-<glyph unicode="&#xe01c;" d="M0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00z"  />
-<glyph unicode="&#xe01b;" d="M0.00,448.00l0.00-448.00 l 512.00,0.00 L 512.00,448.00 L0.00,448.00 z M 192.00,160.00l0.00,96.00 l 128.00,0.00 l0.00-96.00 L 192.00,160.00 z M 320.00,128.00l0.00-96.00 L 192.00,32.00 l0.00,96.00 L 320.00,128.00 z M 320.00,384.00l0.00-96.00 L 192.00,288.00 L 192.00,384.00 L 320.00,384.00 z M 160.00,384.00l0.00-96.00 L 32.00,288.00 L 32.00,384.00 L 160.00,384.00 z
-	 M 32.00,256.00l 128.00,0.00 l0.00-96.00 L 32.00,160.00 L 32.00,256.00 z M 352.00,256.00l 128.00,0.00 l0.00-96.00 L 352.00,160.00 L 352.00,256.00 z M 352.00,288.00L 352.00,384.00 l 128.00,0.00 l0.00-96.00 L 352.00,288.00 z M 32.00,128.00l 128.00,0.00 l0.00-96.00 L 32.00,32.00 L 32.00,128.00 z M 352.00,32.00l0.00,96.00 l 128.00,0.00 l0.00-96.00 L 352.00,32.00 z"  />
-<glyph unicode="&#xe01a;" d="M 161.009,64.00l 28.80,96.00l 132.382,0.00 l 28.80-96.00l 56.816,0.00 L 311.809,384.00L 200.191,384.00 l-96.00-320.00L 161.009,64.00 z M 237.809,320.00l 36.382,0.00 l 28.80-96.00l-93.982,0.00 
-	L 237.809,320.00z"  />
-<glyph unicode="&#xe019;" d="M 256.00,320.00C 151.316,320.00, 58.378,269.722,0.00,192.00c 58.378-77.723, 151.316-128.00, 256.00-128.00c 104.684,0.00, 197.622,50.277, 256.00,128.00
-	C 453.622,269.722, 360.684,320.00, 256.00,320.00z M 224.00,256.00c 17.673,0.00, 32.00-14.327, 32.00-32.00s-14.327-32.00-32.00-32.00s-32.00,14.327-32.00,32.00S 206.327,256.00, 224.00,256.00z
-	 M 386.808,127.352c-19.824-10.129-40.826-17.931-62.423-23.188C 302.141,98.746, 279.134,96.00, 256.00,96.00
-	c-23.133,0.00-46.141,2.746-68.384,8.162c-21.597,5.259-42.599,13.061-62.423,23.188c-31.51,16.101-60.111,38.205-83.82,64.649
-	c 23.709,26.444, 52.31,48.55, 83.82,64.649c 16.168,8.261, 33.121,14.973, 50.541,20.02C 165.79,261.547, 160.00,243.451, 160.00,224.00
-	c0.00-53.02, 42.981-96.00, 96.00-96.00c 53.019,0.00, 96.00,42.98, 96.00,96.00c0.00,19.451-5.791,37.547-15.733,52.67c 17.419-5.048, 34.372-11.76, 50.541-20.021
-	c 31.511-16.099, 60.109-38.204, 83.819-64.649C 446.917,165.557, 418.318,143.45, 386.808,127.352z M 430.459,358.139
-	C 376.099,385.916, 317.403,400.00, 256.00,400.00c-61.403,0.00-120.099-14.084-174.459-41.861C 52.155,343.123, 24.675,324.187,0.00,302.101l0.00-54.603 
-	c 27.669,29.283, 60.347,53.877, 96.097,72.145C 145.907,345.095, 199.706,358.00, 256.00,358.00s 110.093-12.905, 159.902-38.358
-	c 35.751-18.268, 68.429-42.862, 96.098-72.145L 512.00,302.10 C 487.325,324.187, 459.846,343.123, 430.459,358.139z"  />
-<glyph unicode="&#xe018;" d="M 256.00,384.00C 149.962,384.00, 64.00,298.039, 64.00,192.00s 85.961-192.00, 192.00-192.00c 106.037,0.00, 192.00,85.961, 192.00,192.00S 362.037,384.00, 256.00,384.00z
-		 M 357.822,90.177C 330.626,62.979, 294.464,48.00, 256.00,48.00s-74.625,14.979-101.823,42.177C 126.979,117.374, 112.00,153.536, 112.00,192.00
-		s 14.979,74.625, 42.177,101.823C 181.375,321.021, 217.536,336.00, 256.00,336.00s 74.626-14.979, 101.821-42.177
-		C 385.022,266.625, 400.00,230.464, 400.00,192.00S 385.021,117.374, 357.822,90.177zM 162.965,378.069l-21.47,42.939C 92.058,396.24, 51.76,355.942, 26.992,306.504l 42.938-21.47
-		C 90.054,325.202, 122.796,357.945, 162.965,378.069zM 442.067,285.035l 42.939,21.469C 460.24,355.942, 419.943,396.24, 370.504,421.008l-21.472-42.939
-		C 389.201,357.945, 421.944,325.203, 442.067,285.035zM 256.00,288.00l-32.00,0.00 l0.00-96.00 c0.00-5.055, 2.35-9.555, 6.011-12.486l-0.006-0.008l 80.00-64.00l 19.988,24.988L 256.00,199.689L 256.00,288.00 z"  />
-<glyph unicode="&#xe017;" d="M 160.00,352.00L 32.00,224.00L 160.00,96.00L 224.00,96.00L 96.00,224.00L 224.00,352.00 	zM 352.00,352.00L 288.00,352.00L 416.00,224.00L 288.00,96.00L 352.00,96.00L 480.00,224.00 	z"  />
-<glyph unicode="&#xe016;" d="M 224.00,128.00L 288.00,128.00L 288.00,64.00L 224.00,64.00zM 352.00,352.00 C 369.673,352.00 384.00,337.673 384.00,320.00 L 384.00,224.00 L 288.00,160.00 L 224.00,160.00 L 224.00,192.00 L 320.00,256.00 L 320.00,288.00 L 160.00,288.00 L 160.00,352.00 L 352.00,352.00 ZM 256.00,432.00 C 200.441,432.00 148.208,410.364 108.922,371.078 C 69.636,331.792 48.00,279.559 48.00,224.00 C 48.00,168.441 69.636,116.208 108.922,76.922 C 148.208,37.636 200.441,16.00 256.00,16.00 C 311.559,16.00 363.792,37.636 403.078,76.922 C 442.364,116.208 464.00,168.441 464.00,224.00 C 464.00,279.559 442.364,331.792 403.078,371.078 C 363.792,410.364 311.559,432.00 256.00,432.00 Z M 256.00,480.00 L 256.00,480.00 C 397.385,480.00 512.00,365.385 512.00,224.00 C 512.00,82.615 397.385-32.00 256.00-32.00 C 114.615-32.00 0.00,82.615 0.00,224.00 C 0.00,365.385 114.615,480.00 256.00,480.00 Z"  />
-<glyph unicode="&#xe015;" d="M0.00,416.00l0.00-384.00 l 512.00,0.00 L 512.00,416.00 L0.00,416.00 z M 96.00,64.00L 32.00,64.00 l0.00,64.00 l 64.00,0.00 L 96.00,64.00 z M 96.00,192.00L 32.00,192.00 l0.00,64.00 l 64.00,0.00 L 96.00,192.00 z M 96.00,320.00L 32.00,320.00 L 32.00,384.00 l 64.00,0.00 L 96.00,320.00 z M 384.00,64.00L 128.00,64.00 L 128.00,384.00 l 256.00,0.00 L 384.00,64.00 z
-		 M 480.00,64.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 480.00,64.00 z M 480.00,192.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 480.00,192.00 z M 480.00,320.00l-64.00,0.00 L 416.00,384.00 l 64.00,0.00 L 480.00,320.00 zM 192.00,320.00L 192.00,128.00L 320.00,224.00 	z"  />
-<glyph unicode="&#xe014;" d="M0.00,416.00l0.00-416.00 l 512.00,0.00 L 512.00,416.00 L0.00,416.00 z M 480.00,32.00L 32.00,32.00 L 32.00,384.00 l 448.00,0.00 L 480.00,32.00 zM 352.00,304.00A48.00,48.00 1620.00 1,0 448.00,304A48.00,48.00 1620.00 1,0 352.00,304zM 448.00,64.00 L 64.00,64.00 L 160.00,320.00 L 288.00,160.00 L 352.00,208.00 Z"  />
-<glyph unicode="&#xe013;" d="M 96.00,480.00l0.00-512.00 l 160.00,160.00l 160.00-160.00L 416.00,480.00 L 96.00,480.00 z M 384.00,45.255l-128.00,128.00l-128.00-128.00L 128.00,448.00 l 256.00,0.00 L 384.00,45.255 z"  />
-<glyph unicode="&#xe012;" d="M 238.444,142.443c 2.28-4.524, 3.495-9.579, 3.495-14.848c0.00-8.808-3.372-17.029-9.496-23.154l-81.69-81.69
-		c-6.124-6.124-14.348-9.496-23.154-9.496s-17.03,3.372-23.154,9.496l-49.69,49.69c-6.124,6.125-9.496,14.348-9.496,23.154
-		s 3.372,17.03, 9.496,23.154l 81.69,81.691c 6.124,6.123, 14.348,9.496, 23.154,9.496c 5.269,0.00, 10.322-1.215, 14.848-3.494l 32.669,32.668
-		c-13.935,10.705-30.72,16.08-47.517,16.08c-19.993,0.00-39.986-7.583-55.154-22.751l-81.69-81.691
-		c-30.335-30.335-30.335-79.975,0.00-110.309l 49.69-49.691c 15.167-15.166, 35.16-22.75, 55.153-22.75
-		c 19.994,0.00, 39.987,7.584, 55.154,22.751l 81.69,81.69c 27.91,27.91, 30.119,72.149, 6.672,102.673L 238.444,142.443zM 489.248,407.558l-49.69,49.691C 424.391,472.417, 404.398,480.00, 384.404,480.00c-19.993,0.00-39.985-7.583-55.153-22.751l-81.691-81.691
-		c-27.91-27.91-30.119-72.149-6.671-102.671l 32.669,32.67c-2.279,4.525-3.494,9.58-3.494,14.847c0.00,8.808, 3.372,17.03, 9.496,23.154
-		l 81.691,81.691c 6.123,6.124, 14.347,9.497, 23.153,9.497c 8.808,0.00, 17.03-3.373, 23.154-9.497l 49.69-49.691
-		c 6.124-6.124, 9.496-14.347, 9.496-23.154c0.00-8.807-3.372-17.03-9.496-23.154l-81.69-81.691c-6.124-6.124-14.347-9.496-23.154-9.496
-		c-5.268,0.00-10.322,1.215-14.848,3.495l-32.669-32.669c 13.936-10.705, 30.72-16.08, 47.517-16.08c 19.994,0.00, 39.987,7.584, 55.154,22.752
-		l 81.69,81.69C 519.584,327.584, 519.584,377.223, 489.248,407.558zM 116.684,340.688L 20.687,436.685L 43.315,459.313L 139.312,363.316zM 192.00,480.00L 224.00,480.00L 224.00,384.00L 192.00,384.00zM0.00,288.00L 96.00,288.00L 96.00,256.00L0.00,256.00zM 395.316,107.312L 491.314,11.314L 468.686-11.314L 372.688,84.684zM 288.00,64.00L 320.00,64.00L 320.00-32.00L 288.00-32.00zM 416.00,192.00L 512.00,192.00L 512.00,160.00L 416.00,160.00z"  />
-<glyph unicode="&#xe011;" d="M 160.00,128.00c 8.80-8.80, 23.637-8.363, 32.971,0.971L 351.03,287.029C 360.364,296.363, 360.80,311.20, 352.00,320.00
-		s-23.637,8.363-32.971-0.971L 160.971,160.971C 151.637,151.637, 151.20,136.80, 160.00,128.00zM 238.444,142.444c 2.28-4.525, 3.495-9.58, 3.495-14.848c0.00-8.808-3.372-17.03-9.496-23.154l-81.691-81.691
-		c-6.124-6.124-14.347-9.496-23.154-9.496s-17.03,3.372-23.154,9.496l-49.691,49.691c-6.124,6.124-9.496,14.347-9.496,23.154
-		s 3.372,17.03, 9.496,23.154l 81.691,81.691c 6.124,6.124, 14.347,9.497, 23.154,9.497c 5.268,0.00, 10.322-1.215, 14.848-3.495l 32.669,32.669
-		c-13.935,10.705-30.72,16.08-47.517,16.08c-19.993,0.00-39.986-7.583-55.154-22.751l-81.691-81.691
-		c-30.335-30.335-30.335-79.974,0.00-110.309l 49.691-49.691C 87.611-24.416, 107.604-32.00, 127.597-32.00
-		c 19.994,0.00, 39.987,7.584, 55.154,22.751l 81.691,81.691c 27.91,27.91, 30.119,72.149, 6.672,102.672L 238.444,142.444zM 489.249,407.558l-49.691,49.691C 424.391,472.417, 404.398,480.00, 384.404,480.00c-19.993,0.00-39.986-7.583-55.154-22.751l-81.691-81.691
-		c-27.91-27.91-30.119-72.149-6.671-102.671l 32.669,32.67c-2.279,4.525-3.494,9.58-3.494,14.847c0.00,8.808, 3.372,17.03, 9.496,23.154
-		l 81.691,81.691c 6.124,6.124, 14.347,9.497, 23.154,9.497s 17.03-3.373, 23.154-9.497l 49.691-49.691
-		c 6.124-6.124, 9.496-14.347, 9.496-23.154s-3.372-17.03-9.496-23.154l-81.691-81.691c-6.124-6.124-14.347-9.496-23.154-9.496
-		c-5.268,0.00-10.322,1.215-14.848,3.495l-32.669-32.669c 13.936-10.705, 30.72-16.08, 47.517-16.08c 19.994,0.00, 39.987,7.584, 55.154,22.751
-		l 81.691,81.691C 519.584,327.584, 519.584,377.223, 489.249,407.558z"  />
-<glyph unicode="&#xe010;" d="M 288.00,355.814L 288.00,480.00 l 192.00-192.00L 288.00,96.00L 288.00,222.912 C 64.625,228.153, 74.206,71.016, 131.07-32.00
-	C-9.286,119.707, 20.52,362.785, 288.00,355.814z"  />
-<glyph unicode="&#xe00f;" d="M 380.931-32.00C 437.794,71.016, 447.375,228.153, 224.00,222.912L 224.00,96.00 L 32.00,288.00L 224.00,480.00l0.00-124.186 
-	C 491.481,362.785, 521.285,119.707, 380.931-32.00z"  />
-<glyph unicode="&#xe00e;" d="M 112.50,256.00 C 174.356,256.00 224.50,205.855 224.50,144.00 C 224.50,82.144 174.356,32.00 112.50,32.00 C 50.644,32.00 0.50,82.144 0.50,144.00 L 0.00,160.00 C 0.00,283.712 100.288,384.00 224.00,384.00 L 224.00,320.00 C 181.263,320.00 141.083,303.357 110.863,273.137 C 105.046,267.319 99.737,261.129 94.948,254.627 C 100.667,255.527 106.528,256.00 112.50,256.00 ZM 400.50,256.00 C 462.355,256.00 512.50,205.855 512.50,144.00 C 512.50,82.144 462.355,32.00 400.50,32.00 C 338.645,32.00 288.50,82.144 288.50,144.00 L 288.00,160.00 C 288.00,283.712 388.288,384.00 512.00,384.00 L 512.00,320.00 C 469.263,320.00 429.083,303.357 398.863,273.137 C 393.045,267.319 387.736,261.129 382.947,254.627 C 388.667,255.527 394.527,256.00 400.50,256.00 Z"  />
-<glyph unicode="&#xe00d;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM 192.00,352.00L 512.00,352.00L 512.00,288.00L 192.00,288.00zM 192.00,256.00L 512.00,256.00L 512.00,192.00L 192.00,192.00zM 192.00,160.00L 512.00,160.00L 512.00,96.00L 192.00,96.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00zM 128.00,320.00 L 128.00,128.00 L 0.00,224.00 Z"  />
-<glyph unicode="&#xe00c;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM 192.00,352.00L 512.00,352.00L 512.00,288.00L 192.00,288.00zM 192.00,256.00L 512.00,256.00L 512.00,192.00L 192.00,192.00zM 192.00,160.00L 512.00,160.00L 512.00,96.00L 192.00,96.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00zM 0.00,128.00 L 0.00,320.00 L 128.00,224.00 Z"  />
-<glyph unicode="&#xe00b;" d="M 192.00,64.00L 512.00,64.00L 512.00,0.00L 192.00,0.00zM 192.00,256.00L 512.00,256.00L 512.00,192.00L 192.00,192.00zM 192.00,448.00L 512.00,448.00L 512.00,384.00L 192.00,384.00zM 96.00,480.00 L 96.00,352.00 L 64.00,352.00 L 64.00,448.00 L 32.00,448.00 L 32.00,480.00 ZM 64.00,217.00 L 64.00,192.00 L 128.00,192.00 L 128.00,160.00 L 32.00,160.00 L 32.00,233.00 L 96.00,263.00 L 96.00,288.00 L 32.00,288.00 L 32.00,320.00 L 128.00,320.00 L 128.00,247.00 ZM 128.00,128.00 L 128.00-32.00 L 32.00-32.00 L 32.00,0.00 L 96.00,0.00 L 96.00,32.00 L 32.00,32.00 L 32.00,64.00 L 96.00,64.00 L 96.00,96.00 L 32.00,96.00 L 32.00,128.00 Z"  />
-<glyph unicode="&#xe00a;" d="M 192.00,448.00l 320.00,0.00 l0.00-64.00 L 192.00,384.00 L 192.00,448.00 z M 192.00,256.00l 320.00,0.00 l0.00-64.00 L 192.00,192.00 L 192.00,256.00 z M 192.00,64.00l 320.00,0.00 l0.00-64.00 L 192.00,0.00 L 192.00,64.00 zM0.00,416.00A64.00,64.00 1620.00 1,0 128.00,416A64.00,64.00 1620.00 1,0 0.00,416zM0.00,224.00A64.00,64.00 1620.00 1,0 128.00,224A64.00,64.00 1620.00 1,0 0.00,224zM0.00,32.00A64.00,64.00 1620.00 1,0 128.00,32A64.00,64.00 1620.00 1,0 0.00,32z"  />
-<glyph unicode="&#xe009;" d="M 32.00,480.00L 224.00,480.00L 224.00,448.00L 32.00,448.00zM 288.00,480.00L 480.00,480.00L 480.00,448.00L 288.00,448.00zM 476.00,320.00l-28.00,0.00 L 448.00,448.00 L 320.00,448.00 l0.00-128.00 L 192.00,320.00 L 192.00,448.00 L 64.00,448.00 l0.00-128.00 L 36.00,320.00 c-19.80,0.00-36.00-16.20-36.00-36.00l0.00-280.00 c0.00-19.80, 16.20-36.00, 36.00-36.00l 152.00,0.00 c 19.80,0.00, 36.00,16.20, 36.00,36.00L 224.00,192.00 l 64.00,0.00 
-	l0.00-188.00 c0.00-19.80, 16.20-36.00, 36.00-36.00l 152.00,0.00 c 19.80,0.00, 36.00,16.20, 36.00,36.00L 512.00,284.00 C 512.00,303.80, 495.80,320.00, 476.00,320.00z M 174.00,0.00L 50.00,0.00 c-9.90,0.00-18.00,7.20-18.00,16.00
-	s 8.10,16.00, 18.00,16.00l 124.00,0.00 c 9.90,0.00, 18.00-7.20, 18.00-16.00S 183.90,0.00, 174.00,0.00z M 272.00,224.00l-32.00,0.00 c-8.80,0.00-16.00,7.20-16.00,16.00s 7.20,16.00, 16.00,16.00l 32.00,0.00 c 8.80,0.00, 16.00-7.20, 16.00-16.00
-	S 280.80,224.00, 272.00,224.00z M 462.00,0.00L 338.00,0.00 c-9.90,0.00-18.00,7.20-18.00,16.00s 8.10,16.00, 18.00,16.00l 124.00,0.00 c 9.90,0.00, 18.00-7.20, 18.00-16.00S 471.90,0.00, 462.00,0.00z"  />
-<glyph unicode="&#xe008;" d="M 416.00,320.00L 416.00,400.00 c0.00,8.80-7.20,16.00-16.00,16.00L 288.00,416.00 L 288.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00l-64.00,0.00 c-17.602,0.00-32.00-14.40-32.00-32.00l0.00-32.00 L 48.00,416.00 c-8.801,0.00-16.00-7.20-16.00-16.00l0.00-320.00 
-	c0.00-8.80, 7.199-16.00, 16.00-16.00l 144.00,0.00 l0.00-96.00 l 224.00,0.00 l 96.00,96.00L 512.00,320.00 L 416.00,320.00 z M 192.00,447.943c 0.017,0.019, 0.036,0.039, 0.057,0.057l 63.884,0.00 
-	c 0.021-0.018, 0.041-0.038, 0.059-0.057L 256.00,416.00 l-64.00,0.00 L 192.00,447.943 z M 96.00,352.00L 96.00,384.00 l 256.00,0.00 l0.00-32.00 L 96.00,352.00 z M 416.00,13.255L 416.00,64.00 l 50.745,0.00 L 416.00,13.255z M 480.00,96.00l-96.00,0.00 l0.00-96.00 
-	L 224.00,0.00 L 224.00,288.00 l 256.00,0.00 L 480.00,96.00 z"  />
-<glyph unicode="&#xe007;" d="M 445.387,125.423c-22.827,22.778-51.864,34.536-78.973,34.536l-14.556,0.00 l-31.952,32.004l 127.81,128.019
-	c 31.952,32.005, 31.952,96.014,0.00,128.019L 256.001,255.973L 64.285,448.00c-31.952-32.004-31.952-96.014,0.00-128.019l 127.811-128.017
-	l-31.953-32.004l-14.557,0.00 c-27.11,0.00-56.146-11.759-78.974-34.538c-40.811-40.721-46.325-101.242-12.315-135.175
-	C 69.282-24.704, 89.441-32.00, 110.795-32.00c 27.108,0.00, 56.145,11.757, 78.973,34.536c 26.792,26.732, 38.371,62.00, 33.542,92.674l 32.692,32.744
-	l 32.688-32.744c-4.828-30.674, 6.753-65.941, 33.542-92.674C 345.063-20.243, 374.098-32.00, 401.206-32.00
-	c 21.354,0.00, 41.512,7.296, 56.497,22.248C 491.713,24.181, 486.197,84.702, 445.387,125.423z M 176.512,57.231
-	c-3.849-8.941-9.505-17.173-16.813-24.463c-7.318-7.302-15.586-12.959-24.574-16.812c-8.066-3.458-16.48-5.284-24.331-5.284
-	c-7.573,0.00-18.306,1.701-26.431,9.806c-8.068,8.052-9.76,18.659-9.76,26.144c0.00,7.771, 1.821,16.105, 5.263,24.106
-	c 3.85,8.942, 9.507,17.173, 16.813,24.463c 7.317,7.303, 15.586,12.957, 24.575,16.812c 8.067,3.457, 16.48,5.284, 24.332,5.284
-	c 7.573,0.00, 18.306-1.70, 26.429-9.807c 8.067-8.049, 9.761-18.658, 9.761-26.142C 181.777,73.567, 179.957,65.23, 176.512,57.231z
-	 M 256.002,146.702c-24.957,0.00-45.188,20.266-45.188,45.263c0.00,24.996, 20.231,45.26, 45.188,45.26s 45.186-20.264, 45.186-45.26
-	C 301.188,166.966, 280.958,146.702, 256.002,146.702z M 427.636,20.479c-8.124-8.104-18.856-9.806-26.43-9.806
-	c-7.852,0.00-16.265,1.826-24.333,5.284c-8.986,3.853-17.254,9.51-24.571,16.812c-7.307,7.29-12.963,15.521-16.813,24.463
-	c-3.443,7.999-5.263,16.336-5.263,24.106c0.00,7.483, 1.692,18.094, 9.76,26.143c 8.123,8.104, 18.856,9.807, 26.43,9.807
-	c 7.85,0.00, 16.265-1.827, 24.33-5.284c 8.989-3.854, 17.258-9.509, 24.575-16.812c 7.305-7.29, 12.962-15.521, 16.813-24.463
-	c 3.442-7.999, 5.263-16.335, 5.263-24.106C 437.396,39.138, 435.702,28.53, 427.636,20.479z"  />
-<glyph unicode="&#xe006;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM0.00,352.00L 512.00,352.00L 512.00,288.00L0.00,288.00zM0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00zM0.00,160.00L 512.00,160.00L 512.00,96.00L0.00,96.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00z"  />
-<glyph unicode="&#xe005;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM 192.00,352.00L 512.00,352.00L 512.00,288.00L 192.00,288.00zM 192.00,160.00L 512.00,160.00L 512.00,96.00L 192.00,96.00zM0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00z"  />
-<glyph unicode="&#xe004;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM 96.00,352.00L 416.00,352.00L 416.00,288.00L 96.00,288.00zM 96.00,160.00L 416.00,160.00L 416.00,96.00L 96.00,96.00zM0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00z"  />
-<glyph unicode="&#xe003;" d="M0.00,448.00L 512.00,448.00L 512.00,384.00L0.00,384.00zM0.00,352.00L 320.00,352.00L 320.00,288.00L0.00,288.00zM0.00,160.00L 320.00,160.00L 320.00,96.00L0.00,96.00zM0.00,256.00L 512.00,256.00L 512.00,192.00L0.00,192.00zM0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00z"  />
-<glyph unicode="&#xe002;" d="M 512.00,183.771l0.00,80.458 l-79.572,7.957c-4.093,15.021-10.044,29.274-17.605,42.49l 52.298,63.919L 410.595,435.12l-63.918-52.298
-	c-13.217,7.562-27.471,13.513-42.491,17.604L 296.229,480.00l-80.458,0.00 l-7.957-79.573c-15.021-4.093-29.274-10.043-42.49-17.604
-	L 101.405,435.12L 44.88,378.595l 52.298-63.918c-7.562-13.216-13.513-27.47-17.605-42.49L0.00,264.229l0.00-80.458 l 79.573-7.957
-	c 4.093-15.021, 10.043-29.274, 17.605-42.491L 44.88,69.405l 56.524-56.524l 63.919,52.298c 13.216-7.562, 27.47-13.514, 42.49-17.605
-	L 215.771-32.00l 80.458,0.00 l 7.957,79.572c 15.021,4.093, 29.274,10.044, 42.491,17.605l 63.918-52.298l 56.524,56.524l-52.298,63.918
-	c 7.562,13.217, 13.514,27.471, 17.605,42.49L 512.00,183.771z M 352.00,192.00l-64.00-64.00l-64.00,0.00 l-64.00,64.00l0.00,64.00 l 64.00,64.00l 64.00,0.00 l 64.00-64.00L 352.00,192.00 z"  />
-<glyph unicode="&#xe001;" d="M 451.716,380.285l-71.432,71.431C 364.728,467.272, 334.00,480.00, 312.00,480.00L 72.00,480.00 C 50.00,480.00, 32.00,462.00, 32.00,440.00l0.00-432.00 c0.00-22.00, 18.00-40.00, 40.00-40.00l 368.00,0.00 c 22.00,0.00, 40.00,18.00, 40.00,40.00
-	L 480.00,312.00 C 480.00,334.00, 467.272,364.729, 451.716,380.285z M 429.089,357.657c 1.565-1.565, 3.125-3.487, 4.64-5.657L 352.00,352.00 L 352.00,433.728 
-	c 2.17-1.515, 4.092-3.075, 5.657-4.64L 429.089,357.657z M 448.00,8.00c0.00-4.336-3.664-8.00-8.00-8.00L 72.00,0.00 c-4.336,0.00-8.00,3.664-8.00,8.00L 64.00,440.00 c0.00,4.336, 3.664,8.00, 8.00,8.00
-	l 240.00,0.00 c 2.416,0.00, 5.127-0.305, 8.00-0.852L 320.00,320.00 l 127.148,0.00 c 0.547-2.873, 0.852-5.583, 0.852-8.00L 448.00,8.00 z"  />
-<glyph unicode="&#xe000;" d="M 448.00,480.00L0.00,480.00 l0.00-512.00 l 512.00,0.00 L 512.00,416.00 L 448.00,480.00z M 256.00,416.00l 64.00,0.00 l0.00-128.00 l-64.00,0.00 L 256.00,416.00 z M 448.00,32.00L 64.00,32.00 L 64.00,416.00 l 32.00,0.00 l0.00-160.00 l 288.00,0.00 L 384.00,416.00 l 37.489,0.00 L 448.00,389.491L 448.00,32.00 z"  />
-<glyph unicode="&#xe033;" d="M 64.00,208.00L 208.00,64.00L 448.00,304.00L 384.00,368.00L 208.00,192.00L 128.00,272.00 z" />
-<glyph unicode="&#x20;" horiz-adv-x="256" />
-<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.ttf b/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.ttf
deleted file mode 100644
index 4529badb..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.ttf
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.woff b/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.woff
deleted file mode 100644
index 33eea8ea..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/icomoon.woff
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/readme.md b/extlib/tinymce/js/tinymce/skins/lightgray/fonts/readme.md
deleted file mode 100644
index fa5d6394..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/fonts/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Icons are generated and provided by the http://icomoon.io service.
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/img/anchor.gif b/extlib/tinymce/js/tinymce/skins/lightgray/img/anchor.gif
deleted file mode 100644
index 606348c7..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/img/anchor.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/img/loader.gif b/extlib/tinymce/js/tinymce/skins/lightgray/img/loader.gif
deleted file mode 100644
index c69e9372..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/img/loader.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/img/object.gif b/extlib/tinymce/js/tinymce/skins/lightgray/img/object.gif
deleted file mode 100644
index cccd7f02..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/img/object.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/img/trans.gif b/extlib/tinymce/js/tinymce/skins/lightgray/img/trans.gif
deleted file mode 100644
index 38848651..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/img/trans.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/img/wline.gif b/extlib/tinymce/js/tinymce/skins/lightgray/img/wline.gif
deleted file mode 100644
index 7d0a4dbc..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/img/wline.gif
+++ /dev/null
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/skin.ie7.min.css b/extlib/tinymce/js/tinymce/skins/lightgray/skin.ie7.min.css
deleted file mode 100644
index 1d13b877..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/skin.ie7.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#000;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;border-radius:2px}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #c5c5c5;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td div{border:1px solid #808080;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid td div:hover{border-color:black}.mce-grid td div:focus{border-color:#59a5e1;outline:1px solid rgba(82,168,236,0.8);border-color:rgba(82,168,236,0.8)}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#c5c5c5}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#e8e8e8;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#c4daff;background:#deeafa}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:#ccc 5px 5px 5px;-moz-box-shadow:#ccc 5px 5px 5px;box-shadow:#ccc 5px 5px 5px}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{top:0;left:0;background:#fff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #EEE;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#CCC;text-shadow:0 1px 0 white;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#AAA}.mce-window-head .mce-title{display:inline-block;*display:inline;*zoom:1;line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:whiteSmoke;border-top:1px solid #DDD;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #c5c5c5;position:relative;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:hover,.mce-btn:focus{text-decoration:none;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn.mce-disabled,.mce-btn.mce-disabled:hover{cursor:default;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{min-width:50px;color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1;border-color:#04c #04c #002b80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary:hover,.mce-primary:focus{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1;border-color:#003cb3 #003cb3 #026;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary button{color:#fff}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:3px 5px;font-size:12px;line-height:15px}.mce-btn-small i{margin-top:0}.mce-btn .mce-caret{margin-top:8px;*margin-top:6px;margin-left:0}.mce-btn-small .mce-caret{margin-top:6px;*margin-top:4px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #444;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#999}.mce-caret.mce-up{border-bottom:4px solid #444;border-top:0}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-btn:hover,.mce-btn-group .mce-btn:focus{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-disabled,.mce-btn-group .mce-btn.mce-disabled:hover{-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-active,.mce-btn-group .mce-btn.mce-active:hover,.mce-btn-group .mce-btn:active{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn-group .mce-btn.mce-disabled button{opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn-group .mce-first{border-left:1px solid #c5c5c5;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #c5c5c5;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0}.mce-checked i.mce-i-checkbox{color:#000;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox{border:1px solid #59a5e1;border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-colorbutton .mce-ico{position:relative}.mce-colorpicker{background:#FFF}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:4px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-14px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-17px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;border-left:1px solid transparent;border-right:1px solid transparent}.mce-colorbutton:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;width:100px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-combobox input{border-color:1px solid #c5c5c5;border-right-color:rgba(0,0,0,0.15);height:28px}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox *:focus{border-color:#59a5e1;border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#000}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:gray;color:white}.mce-path .mce-divider{display:inline}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-iframe{border:0 solid #c5c5c5;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0 solid #c5c5c5;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label-disabled .mce-text{color:#999}.mce-label.mce-multiline{white-space:pre-wrap}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #ddd}.mce-menubar .mce-menubtn button{color:#000}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:transparent;background:#ddd;filter:none}.mce-menubtn.mce-disabled span{color:#999}.mce-menubtn span{margin-right:2px;line-height:20px;*line-height:16px}.mce-menubtn.mce-btn-small span{font-size:12px;line-height:15px;*line-height:16px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item.mce-disabled .mce-text{color:#999}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-item.mce-disabled:hover{background:#CCC}.mce-menu-shortcut{display:inline-block;color:#999}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #666}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret{border-left-color:#FFF}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item-sep,.mce-menu-item-sep:hover{padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#e5e5e5;border-bottom:1px solid white;cursor:default;filter:none}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item.mce-active{background-color:#c8def4;outline:1px solid #c5c5c5}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa;background-color:transparent;outline:0}.mce-menu-item-checkbox.mce-active{background-color:#FFF;outline:0}.mce-menu{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#FFF;border:1px solid #CCC;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline;*zoom:1}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}i.mce-radio{padding:1px;margin:0 3px 0 0;background-color:#fafafa;border:1px solid #cacece;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}i.mce-radio:after{font-family:Arial;font-size:12px;color:#000;content:'\25cf'}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#000}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #ccc}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #ccc;border-width:1px 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-textbox{background:#FFF;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#000}.mce-textbox:focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'icomoon';src:url('fonts/icomoon.eot');src:url('fonts/icomoon.eot?#iefix') format('embedded-opentype'),url('fonts/icomoon.svg#icomoon') format('svg'),url('fonts/icomoon.woff') format('woff'),url('fonts/icomoon.ttf') format('truetype');font-weight:normal;font-style:normal}@font-face{font-family:'icomoon-small';src:url('fonts/icomoon-small.eot');src:url('fonts/icomoon-small.eot?#iefix') format('embedded-opentype'),url('fonts/icomoon-small.svg#icomoon') format('svg'),url('fonts/icomoon-small.woff') format('woff'),url('fonts/icomoon-small.ttf') format('truetype');font-weight:normal;font-style:normal}.mce-ico{font-family:'icomoon';font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333;-ie7-icon:' '}.mce-btn-small .mce-ico{font-family:'icomoon-small'}.mce-ico,i.mce-i-checkbox{zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = this.currentStyle['-ie7-icon'].substr(1,1)+'&nbsp;')}.mce-i-save{-ie7-icon:"\e000"}.mce-i-newdocument{-ie7-icon:"\e001"}.mce-i-fullpage{-ie7-icon:"\e002"}.mce-i-alignleft{-ie7-icon:"\e003"}.mce-i-aligncenter{-ie7-icon:"\e004"}.mce-i-alignright{-ie7-icon:"\e005"}.mce-i-alignjustify{-ie7-icon:"\e006"}.mce-i-cut{-ie7-icon:"\e007"}.mce-i-paste{-ie7-icon:"\e008"}.mce-i-searchreplace{-ie7-icon:"\e009"}.mce-i-bullist{-ie7-icon:"\e00a"}.mce-i-numlist{-ie7-icon:"\e00b"}.mce-i-indent{-ie7-icon:"\e00c"}.mce-i-outdent{-ie7-icon:"\e00d"}.mce-i-blockquote{-ie7-icon:"\e00e"}.mce-i-undo{-ie7-icon:"\e00f"}.mce-i-redo{-ie7-icon:"\e010"}.mce-i-link{-ie7-icon:"\e011"}.mce-i-unlink{-ie7-icon:"\e012"}.mce-i-anchor{-ie7-icon:"\e013"}.mce-i-image{-ie7-icon:"\e014"}.mce-i-media{-ie7-icon:"\e015"}.mce-i-help{-ie7-icon:"\e016"}.mce-i-code{-ie7-icon:"\e017"}.mce-i-inserttime{-ie7-icon:"\e018"}.mce-i-preview{-ie7-icon:"\e019"}.mce-i-forecolor{-ie7-icon:"\e01a"}.mce-i-backcolor{-ie7-icon:"\e01a"}.mce-i-table{-ie7-icon:"\e01b"}.mce-i-hr{-ie7-icon:"\e01c"}.mce-i-removeformat{-ie7-icon:"\e01d"}.mce-i-subscript{-ie7-icon:"\e01e"}.mce-i-superscript{-ie7-icon:"\e01f"}.mce-i-charmap{-ie7-icon:"\e020"}.mce-i-emoticons{-ie7-icon:"\e021"}.mce-i-print{-ie7-icon:"\e022"}.mce-i-fullscreen{-ie7-icon:"\e023"}.mce-i-spellchecker{-ie7-icon:"\e024"}.mce-i-nonbreaking{-ie7-icon:"\e025"}.mce-i-template{-ie7-icon:"\e026"}.mce-i-pagebreak{-ie7-icon:"\e027"}.mce-i-restoredraft{-ie7-icon:"\e028"}.mce-i-untitled{-ie7-icon:"\e029"}.mce-i-bold{-ie7-icon:"\e02a"}.mce-i-italic{-ie7-icon:"\e02b"}.mce-i-underline{-ie7-icon:"\e02c"}.mce-i-strikethrough{-ie7-icon:"\e02d"}.mce-i-visualchars{-ie7-icon:"\e02e"}.mce-i-ltr{-ie7-icon:"\e02f"}.mce-i-rtl{-ie7-icon:"\e030"}.mce-i-copy{-ie7-icon:"\e031"}.mce-i-resize{-ie7-icon:"\e032"}.mce-i-browse{-ie7-icon:"\e034"}.mce-i-checkbox,.mce-i-selected{-ie7-icon:"\e033"}.mce-i-selected{visibility:hidden}.mce-i-backcolor{background:#BBB}
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/skins/lightgray/skin.min.css b/extlib/tinymce/js/tinymce/skins/lightgray/skin.min.css
deleted file mode 100644
index 74b56bed..00000000
--- a/extlib/tinymce/js/tinymce/skins/lightgray/skin.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#000;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;border-radius:2px}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #c5c5c5;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td div{border:1px solid #808080;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid td div:hover{border-color:black}.mce-grid td div:focus{border-color:#59a5e1;outline:1px solid rgba(82,168,236,0.8);border-color:rgba(82,168,236,0.8)}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#c5c5c5}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#e8e8e8;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#c4daff;background:#deeafa}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:#ccc 5px 5px 5px;-moz-box-shadow:#ccc 5px 5px 5px;box-shadow:#ccc 5px 5px 5px}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{top:0;left:0;background:#fff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#FFF;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #EEE;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#CCC;text-shadow:0 1px 0 white;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#AAA}.mce-window-head .mce-title{display:inline-block;*display:inline;*zoom:1;line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:whiteSmoke;border-top:1px solid #DDD;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #c5c5c5;position:relative;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:hover,.mce-btn:focus{text-decoration:none;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn.mce-disabled,.mce-btn.mce-disabled:hover{cursor:default;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{min-width:50px;color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1;border-color:#04c #04c #002b80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary:hover,.mce-primary:focus{color:#fff;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1;border-color:#003cb3 #003cb3 #026;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-primary button{color:#fff}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:3px 5px;font-size:12px;line-height:15px}.mce-btn-small i{margin-top:0}.mce-btn .mce-caret{margin-top:8px;*margin-top:6px;margin-left:0}.mce-btn-small .mce-caret{margin-top:6px;*margin-top:4px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #444;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#999}.mce-caret.mce-up{border-bottom:4px solid #444;border-top:0}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-btn:hover,.mce-btn-group .mce-btn:focus{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1;border-color:#ccc #ccc #a6a6a6;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-disabled,.mce-btn-group .mce-btn.mce-disabled:hover{-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;border-color:#d9d9d9 #d9d9d9 #b3b3b3;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.mce-btn-group .mce-btn.mce-active,.mce-btn-group .mce-btn.mce-active:hover,.mce-btn-group .mce-btn:active{color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#bfbfbf));background-image:-webkit-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:-o-linear-gradient(top,#e6e6e6,#bfbfbf);background-image:linear-gradient(to bottom,#e6e6e6,#bfbfbf);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffbfbfbf',GradientType=0);zoom:1;border-color:#bfbfbf #bfbfbf #999;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn-group .mce-btn.mce-disabled button{opacity:.65;filter:alpha(opacity=65);zoom:1}.mce-btn-group .mce-first{border-left:1px solid #c5c5c5;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #c5c5c5;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0}.mce-checked i.mce-i-checkbox{color:#000;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox{border:1px solid #59a5e1;border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-colorbutton .mce-ico{position:relative}.mce-colorpicker{background:#FFF}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:4px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-14px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-17px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;border-left:1px solid transparent;border-right:1px solid transparent}.mce-colorbutton:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;width:100px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.mce-combobox input{border-color:1px solid #c5c5c5;border-right-color:rgba(0,0,0,0.15);height:28px}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox *:focus{border-color:#59a5e1;border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#000}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:gray;color:white}.mce-path .mce-divider{display:inline}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-iframe{border:0 solid #c5c5c5;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0 solid #c5c5c5;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label-disabled .mce-text{color:#999}.mce-label.mce-multiline{white-space:pre-wrap}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #ddd}.mce-menubar .mce-menubtn button{color:#000}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:transparent;background:#ddd;filter:none}.mce-menubtn.mce-disabled span{color:#999}.mce-menubtn span{margin-right:2px;line-height:20px;*line-height:16px}.mce-menubtn.mce-btn-small span{font-size:12px;line-height:15px;*line-height:16px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item.mce-disabled .mce-text{color:#999}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-item.mce-disabled:hover{background:#CCC}.mce-menu-shortcut{display:inline-block;color:#999}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #666}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret{border-left-color:#FFF}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item-sep,.mce-menu-item-sep:hover{padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#e5e5e5;border-bottom:1px solid white;cursor:default;filter:none}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item.mce-active{background-color:#c8def4;outline:1px solid #c5c5c5}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa;background-color:transparent;outline:0}.mce-menu-item-checkbox.mce-active{background-color:#FFF;outline:0}.mce-menu{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#FFF;border:1px solid #CCC;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline;*zoom:1}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}i.mce-radio{padding:1px;margin:0 3px 0 0;background-color:#fafafa;border:1px solid #cacece;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}i.mce-radio:after{font-family:Arial;font-size:12px;color:#000;content:'\25cf'}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#000}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#c5c5c5;border-right-color:#c5c5c5}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #ccc}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #ccc;border-width:1px 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-textbox{background:#FFF;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#000}.mce-textbox:focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'tinymce';src:url('fonts/icomoon.eot');src:url('fonts/icomoon.eot?#iefix') format('embedded-opentype'),url('fonts/icomoon.svg#icomoon') format('svg'),url('fonts/icomoon.woff') format('woff'),url('fonts/icomoon.ttf') format('truetype');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/icomoon-small.eot');src:url('fonts/icomoon-small.eot?#iefix') format('embedded-opentype'),url('fonts/icomoon-small.svg#icomoon') format('svg'),url('fonts/icomoon-small.woff') format('woff'),url('fonts/icomoon-small.ttf') format('truetype');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333}.mce-btn-small .mce-ico{font-family:'tinymce-small',Arial}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-inserttime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-untitled:before{content:"\e029"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e02e"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#BBB}
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/themes/modern/theme.min.js b/extlib/tinymce/js/tinymce/themes/modern/theme.min.js
deleted file mode 100644
index 55e8942e..00000000
--- a/extlib/tinymce/js/tinymce/themes/modern/theme.min.js
+++ /dev/null
@@ -1 +0,0 @@
-tinymce.ThemeManager.add("modern",function(e){function t(){function t(t){var i,r=[];if(t)return m(t.split(/[ ,]/),function(t){function n(){var n=e.selection;"bullist"==a&&n.selectorChanged("ul > li",function(e,n){for(var i,r=n.parents.length;r--&&(i=n.parents[r].nodeName,"OL"!=i&&"UL"!=i););t.active("UL"==i)}),"numlist"==a&&n.selectorChanged("ol > li",function(e,n){for(var i,r=n.parents.length;r--&&(i=n.parents[r].nodeName,"OL"!=i&&"UL"!=i););t.active("OL"==i)}),t.settings.stateSelector&&n.selectorChanged(t.settings.stateSelector,function(e){t.active(e)},!0),t.settings.disabledStateSelector&&n.selectorChanged(t.settings.disabledStateSelector,function(e){t.disabled(e)})}var a;"|"==t?i=null:u.has(t)?(t={type:t},c.toolbar_items_size&&(t.size=c.toolbar_items_size),r.push(t),i=null):(i||(i={type:"buttongroup",items:[]},r.push(i)),e.buttons[t]&&(a=t,t=e.buttons[a],t.type=t.type||"button",c.toolbar_items_size&&(t.size=c.toolbar_items_size),t=u.create(t),i.items.push(t),e.initialized?n():e.on("init",n)))}),n.push({type:"toolbar",layout:"flow",items:r}),!0}for(var n=[],i=1;10>i&&t(c["toolbar"+i]);i++);return n.length||t(c.toolbar||h),n}function n(){function t(t){var n;return"|"==t?{text:"|"}:n=e.menuItems[t]}function n(n){var i,r,a,o,s;if(s=tinymce.makeMap((c.removed_menuitems||"").split(/[ ,]/)),c.menu?(r=c.menu[n],o=!0):r=f[n],r){i={text:r.title},a=[],m((r.items||"").split(/[ ,]/),function(e){var n=t(e);n&&!s[e]&&a.push(t(e))}),o||m(e.menuItems,function(e){e.context==n&&("before"==e.separator&&a.push({text:"|"}),e.prependToContext?a.unshift(e):a.push(e),"after"==e.separator&&a.push({text:"|"}))});for(var l=0;l<a.length;l++)"|"==a[l].text&&(0===l||l==a.length-1)&&a.splice(l,1);if(i.menu=a,!i.menu.length)return null}return i}var i,r=[],a=[];if(c.menu)for(i in c.menu)a.push(i);else for(i in f)a.push(i);for(var o=c.menubar?c.menubar.split(/[ ,]/):a,s=0;s<o.length;s++){var l=o[s];l=n(l),l&&r.push(l)}return r}function i(t){function n(e){var n=t.find(e)[0];n&&n.focus()}e.shortcuts.add("Alt+F9","",function(){n("menubar")}),e.shortcuts.add("Alt+F10","",function(){n("toolbar")}),e.shortcuts.add("Alt+F11","",function(){n("elementpath")}),t.on("cancel",function(){e.focus()})}function r(t,n){function i(e){return{width:e.clientWidth,height:e.clientHeight}}var r,a,o,s;r=e.getContainer(),a=e.getContentAreaContainer().firstChild,o=i(r),s=i(a),t=Math.max(c.min_width||100,t),n=Math.max(c.min_height||100,n),t=Math.min(c.max_width||65535,t),n=Math.min(c.max_height||65535,n),d.css(r,"width",t+(o.width-s.width)),d.css(a,"width",t),d.css(a,"height",n),e.fire("ResizeEditor")}function a(t,n){var i=e.getContentAreaContainer();l.resizeTo(i.clientWidth+t,i.clientHeight+n)}function o(){function r(){m&&m.moveRel&&m.visible()&&!m._fixed&&m.moveRel(e.getBody(),["tl-bl","bl-tl"])}function a(){m&&(m.show(),r(),d.addClass(e.getBody(),"mce-edit-focus"))}function o(){m&&(m.hide(),d.removeClass(e.getBody(),"mce-edit-focus"))}function s(){return m?(m.visible()||a(),void 0):(m=l.panel=u.create({type:f?"panel":"floatpanel",classes:"tinymce tinymce-inline",layout:"flex",direction:"column",autohide:!1,autofix:!0,fixed:!!f,border:1,items:[c.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:n()},c.toolbar===!1?null:{type:"panel",name:"toolbar",layout:"stack",items:t()}]}),m.renderTo(f||document.body).reflow(),i(m),a(),e.on("nodeChange",r),e.on("activate",a),e.on("deactivate",o),void 0)}var m,f;return c.fixed_toolbar_container&&(f=d.select(c.fixed_toolbar_container)[0]),c.content_editable=!0,e.on("focus",s),e.on("blur",o),e.on("remove",function(){m&&(m.remove(),m=null)}),{}}function s(a){var o,s,m;return o=l.panel=u.create({type:"panel",classes:"tinymce",style:"visibility: hidden",layout:"stack",border:1,items:[c.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:n()},c.toolbar===!1?null:{type:"panel",layout:"stack",items:t()},{type:"panel",name:"iframe",layout:"stack",classes:"edit-area",html:"",border:"1 0 0 0"}]}),c.resize!==!1&&(s={type:"resizehandle",direction:c.resize,onResizeStart:function(){var t=e.getContentAreaContainer().firstChild;m={width:t.clientWidth,height:t.clientHeight}},onResize:function(e){r(m.width+e.deltaX,m.height+e.deltaY)}}),c.statusbar!==!1&&o.add({type:"panel",name:"statusbar",classes:"statusbar",layout:"flow",border:"1 0 0 0",items:[{type:"elementpath"},s]}),o.renderBefore(a.targetNode).reflow(),c.width&&tinymce.DOM.setStyle(o.getEl(),"width",c.width),e.on("remove",function(){o.remove(),o=null}),i(o),{iframeContainer:o.find("#iframe")[0].getEl(),editorContainer:o.getEl()}}var l=this,c=e.settings,u=tinymce.ui.Factory,m=tinymce.each,d=tinymce.DOM,f={file:{title:"File",items:"newdocument"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall"},insert:{title:"Insert",items:"|"},view:{title:"View",items:"visualaid |"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript | formats | removeformat"},table:{title:"Table"},tools:{title:"Tools"}},h="undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image";l.renderUI=function(t){var n=c.skin!==!1?c.skin||"lightgray":!1;return n&&(tinymce.Env.documentMode<=7?tinymce.DOM.loadCSS(tinymce.baseURL+"/skins/"+n+"/skin.ie7.min.css"):tinymce.DOM.loadCSS(tinymce.baseURL+"/skins/"+n+"/skin.min.css"),e.contentCSS.push(tinymce.baseURL+"/skins/"+n+"/content"+(e.inline?".inline":"")+".min.css")),e.on("ProgressState",function(e){l.throbber=l.throbber||new tinymce.ui.Throbber(l.panel.getEl("body")),e.state?l.throbber.show(e.time):l.throbber.hide()}),c.inline?o(t):s(t)},l.resizeTo=r,l.resizeBy=a});
\ No newline at end of file
diff --git a/extlib/tinymce/js/tinymce/tinymce.min.js b/extlib/tinymce/js/tinymce/tinymce.min.js
deleted file mode 100644
index 156c7b69..00000000
--- a/extlib/tinymce/js/tinymce/tinymce.min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// 4.0.2 (2013-07-18)
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/dom/EventUtils",c="tinymce/dom/Sizzle",u="tinymce/dom/DomQuery",d="tinymce/html/Styles",f="tinymce/dom/TreeWalker",p="tinymce/util/Tools",h="tinymce/dom/Range",m="tinymce/html/Entities",g="tinymce/Env",v="tinymce/dom/DOMUtils",y="tinymce/dom/ScriptLoader",b="tinymce/AddOnManager",C="tinymce/html/Node",x="tinymce/html/Schema",w="tinymce/html/SaxParser",_="tinymce/html/DomParser",N="tinymce/html/Writer",E="tinymce/html/Serializer",S="tinymce/dom/Serializer",k="tinymce/dom/TridentSelection",T="tinymce/util/VK",R="tinymce/dom/ControlSelection",A="tinymce/dom/Selection",B="tinymce/dom/RangeUtils",L="tinymce/Formatter",M="tinymce/UndoManager",D="tinymce/EnterKey",H="tinymce/ForceBlocks",P="tinymce/EditorCommands",O="tinymce/util/URI",I="tinymce/util/Class",F="tinymce/ui/Selector",W="tinymce/ui/Collection",z="tinymce/ui/DomUtils",V="tinymce/ui/Control",U="tinymce/ui/Factory",q="tinymce/ui/Container",$="tinymce/ui/DragHelper",j="tinymce/ui/Scrollable",K="tinymce/ui/Panel",G="tinymce/ui/Movable",Y="tinymce/ui/Resizable",X="tinymce/ui/FloatPanel",J="tinymce/ui/KeyboardNavigation",Q="tinymce/ui/Window",Z="tinymce/ui/MessageBox",et="tinymce/WindowManager",tt="tinymce/util/Quirks",nt="tinymce/util/Observable",rt="tinymce/Shortcuts",it="tinymce/Editor",ot="tinymce/util/I18n",at="tinymce/FocusManager",st="tinymce/EditorManager",lt="tinymce/LegacyInput",ct="tinymce/util/XHR",ut="tinymce/util/JSON",dt="tinymce/util/JSONRequest",ft="tinymce/util/JSONP",pt="tinymce/util/LocalStorage",ht="tinymce/Compat",mt="tinymce/ui/Layout",gt="tinymce/ui/AbsoluteLayout",vt="tinymce/ui/Tooltip",yt="tinymce/ui/Widget",bt="tinymce/ui/Button",Ct="tinymce/ui/ButtonGroup",xt="tinymce/ui/Checkbox",wt="tinymce/ui/PanelButton",_t="tinymce/ui/ColorButton",Nt="tinymce/ui/ComboBox",Et="tinymce/ui/Path",St="tinymce/ui/ElementPath",kt="tinymce/ui/FormItem",Tt="tinymce/ui/Form",Rt="tinymce/ui/FieldSet",At="tinymce/ui/FilePicker",Bt="tinymce/ui/FitLayout",Lt="tinymce/ui/FlexLayout",Mt="tinymce/ui/FlowLayout",Dt="tinymce/ui/FormatControls",Ht="tinymce/ui/GridLayout",Pt="tinymce/ui/Iframe",Ot="tinymce/ui/Label",It="tinymce/ui/Toolbar",Ft="tinymce/ui/MenuBar",Wt="tinymce/ui/MenuButton",zt="tinymce/ui/ListBox",Vt="tinymce/ui/MenuItem",Ut="tinymce/ui/Menu",qt="tinymce/ui/Radio",$t="tinymce/ui/ResizeHandle",jt="tinymce/ui/Spacer",Kt="tinymce/ui/SplitButton",Gt="tinymce/ui/StackLayout",Yt="tinymce/ui/TabPanel",Xt="tinymce/ui/TextBox",Jt="tinymce/ui/Throbber";r(l,[],function(){function e(e,t,n,r){e.addEventListener?e.addEventListener(t,n,r||!1):e.attachEvent&&e.attachEvent("on"+t,n)}function t(e,t,n,r){e.removeEventListener?e.removeEventListener(t,n,r||!1):e.detachEvent&&e.detachEvent("on"+t,n)}function n(e,t){function n(){return!1}function r(){return!0}var i,o=t||{},s;for(i in e)"layerX"!==i&&"layerY"!==i&&(o[i]=e[i]);if(o.target||(o.target=o.srcElement||document),e&&a.test(e.type)&&e.pageX===s&&e.clientX!==s){var l=o.target.ownerDocument||document,c=l.documentElement,u=l.body;o.pageX=e.clientX+(c&&c.scrollLeft||u&&u.scrollLeft||0)-(c&&c.clientLeft||u&&u.clientLeft||0),o.pageY=e.clientY+(c&&c.scrollTop||u&&u.scrollTop||0)-(c&&c.clientTop||u&&u.clientTop||0)}return o.preventDefault=function(){o.isDefaultPrevented=r,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},o.stopPropagation=function(){o.isPropagationStopped=r,e&&(e.stopPropagation?e.stopPropagation():e.cancelBubble=!0)},o.stopImmediatePropagation=function(){o.isImmediatePropagationStopped=r,o.stopPropagation()},o.isDefaultPrevented||(o.isDefaultPrevented=n,o.isPropagationStopped=n,o.isImmediatePropagationStopped=n),o}function r(n,r,i){function o(){i.domLoaded||(i.domLoaded=!0,r(c))}function a(){"complete"===l.readyState&&(t(l,"readystatechange",a),o())}function s(){try{l.documentElement.doScroll("left")}catch(e){return setTimeout(s,0),void 0}o()}var l=n.document,c={type:"ready"};return i.domLoaded?(r(c),void 0):(l.addEventListener?e(n,"DOMContentLoaded",o):(e(l,"readystatechange",a),l.documentElement.doScroll&&n===n.top&&s()),e(n,"load",o),void 0)}function i(){function i(e,t){var n,r,i,o;if(n=s[t][e.type])for(r=0,i=n.length;i>r;r++)if(o=n[r],o&&o.func.call(o.scope,e)===!1&&e.preventDefault(),e.isImmediatePropagationStopped())return}var a=this,s={},l,c,u,d,f;c=o+(+new Date).toString(32),d="onmouseenter"in document.documentElement,u="onfocusin"in document.documentElement,f={mouseenter:"mouseover",mouseleave:"mouseout"},l=1,a.domLoaded=!1,a.events=s,a.bind=function(t,o,p,h){function m(e){i(n(e||_.event),g)}var g,v,y,b,C,x,w,_=window;if(t&&3!==t.nodeType&&8!==t.nodeType){for(t[c]?g=t[c]:(g=l++,t[c]=g,s[g]={}),h=h||t,o=o.split(" "),y=o.length;y--;)b=o[y],x=m,C=w=!1,"DOMContentLoaded"===b&&(b="ready"),a.domLoaded&&"ready"===b&&"complete"==t.readyState?p.call(h,n({type:b})):(d||(C=f[b],C&&(x=function(e){var t,r;if(t=e.currentTarget,r=e.relatedTarget,r&&t.contains)r=t.contains(r);else for(;r&&r!==t;)r=r.parentNode;r||(e=n(e||_.event),e.type="mouseout"===e.type?"mouseleave":"mouseenter",e.target=t,i(e,g))})),u||"focusin"!==b&&"focusout"!==b||(w=!0,C="focusin"===b?"focus":"blur",x=function(e){e=n(e||_.event),e.type="focus"===e.type?"focusin":"focusout",i(e,g)}),v=s[g][b],v?"ready"===b&&a.domLoaded?p({type:b}):v.push({func:p,scope:h}):(s[g][b]=v=[{func:p,scope:h}],v.fakeName=C,v.capture=w,v.nativeHandler=x,"ready"===b?r(t,x,a):e(t,C||b,x,w)));return t=v=0,p}},a.unbind=function(e,n,r){var i,o,l,u,d,f;if(!e||3===e.nodeType||8===e.nodeType)return a;if(i=e[c]){if(f=s[i],n){for(n=n.split(" "),l=n.length;l--;)if(d=n[l],o=f[d]){if(r)for(u=o.length;u--;)o[u].func===r&&o.splice(u,1);r&&0!==o.length||(delete f[d],t(e,o.fakeName||d,o.nativeHandler,o.capture))}}else{for(d in f)o=f[d],t(e,o.fakeName||d,o.nativeHandler,o.capture);f={}}for(d in f)return a;delete s[i];try{delete e[c]}catch(p){e[c]=null}}return a},a.fire=function(e,t,r){var o;if(!e||3===e.nodeType||8===e.nodeType)return a;r=n(null,r),r.type=t,r.target=e;do o=e[c],o&&i(r,o),e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow;while(e&&!r.isPropagationStopped());return a},a.clean=function(e){var t,n,r=a.unbind;if(!e||3===e.nodeType||8===e.nodeType)return a;if(e[c]&&r(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName)for(r(e),n=e.getElementsByTagName("*"),t=n.length;t--;)e=n[t],e[c]&&r(e);return a},a.destroy=function(){s={}},a.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}}var o="mce-data-",a=/^(?:mouse|contextmenu)|click/;return i.Event=new i,i.Event.bind(window,"ready",function(){}),i}),r(c,[],function(){function e(e){return gt.test(e+"")}function n(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>N.cacheLength&&delete e[t.shift()],e[n]=r,r}}function i(e){return e[F]=!0,e}function o(e){var t=L.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t=null}}function a(e,t,n,r){var i,o,a,s,l,c,u,p,h,m;if((t?t.ownerDocument||t:W)!==L&&B(t),t=t||L,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(D&&!r){if(i=vt.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&I(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return et.apply(n,t.getElementsByTagName(e)),n;if((a=i[3])&&z.getElementsByClassName&&t.getElementsByClassName)return et.apply(n,t.getElementsByClassName(a)),n}if(z.qsa&&!H.test(e)){if(u=!0,p=F,h=t,m=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(c=d(e),(u=t.getAttribute("id"))?p=u.replace(Ct,"\\$&"):t.setAttribute("id",p),p="[id='"+p+"'] ",l=c.length;l--;)c[l]=p+f(c[l]);h=mt.test(e)&&t.parentNode||t,m=c.join(",")}if(m)try{return et.apply(n,h.querySelectorAll(m)),n}catch(g){}finally{u||t.removeAttribute("id")}}}return C(e.replace(ct,"$1"),t,n,r)}function s(e,t){var n=t&&e,r=n&&(~t.sourceIndex||X)-(~e.sourceIndex||X);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function l(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function c(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function u(e){return i(function(t){return t=+t,i(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function d(e,t){var n,r,i,o,s,l,c,u=$[e+" "];if(u)return t?0:u.slice(0);for(s=e,l=[],c=N.preFilter;s;){(!n||(r=ut.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=dt.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(ct," ")}),s=s.slice(n.length));for(o in N.filter)!(r=ht[o].exec(s))||c[o]&&!(r=c[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?a.error(e):$(e,l).slice(0)}function f(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=U++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,l,c,u=V+" "+o;if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i)if(c=t[F]||(t[F]={}),(l=c[r])&&l[0]===u){if((s=l[1])===!0||s===_)return s===!0}else if(l=c[r]=[u],l[1]=e(t,n,a)||_,l[1]===!0)return!0}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function m(e,t,n,r,i){for(var o,a=[],s=0,l=e.length,c=null!=t;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),c&&t.push(s));return a}function g(e,t,n,r,o,a){return r&&!r[F]&&(r=g(r)),o&&!o[F]&&(o=g(o,a)),i(function(i,a,s,l){var c,u,d,f=[],p=[],h=a.length,g=i||b(t||"*",s.nodeType?[s]:s,[]),v=!e||!i&&t?g:m(g,f,e,s,l),y=n?o||(i?e:h||r)?[]:a:v;if(n&&n(v,y,s,l),r)for(c=m(y,p),r(c,[],s,l),u=c.length;u--;)(d=c[u])&&(y[p[u]]=!(v[p[u]]=d));if(i){if(o||e){if(o){for(c=[],u=y.length;u--;)(d=y[u])&&c.push(v[u]=d);o(null,y=[],c,l)}for(u=y.length;u--;)(d=y[u])&&(c=o?nt.call(i,d):f[u])>-1&&(i[c]=!(a[c]=d))}}else y=m(y===a?y.splice(h,y.length):y),o?o(null,a,y,l):et.apply(a,y)})}function v(e){for(var t,n,r,i=e.length,o=N.relative[e[0].type],a=o||N.relative[" "],s=o?1:0,l=p(function(e){return e===t},a,!0),c=p(function(e){return nt.call(t,e)>-1},a,!0),u=[function(e,n,r){return!o&&(r||n!==T)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];i>s;s++)if(n=N.relative[e[s].type])u=[p(h(u),n)];else{if(n=N.filter[e[s].type].apply(null,e[s].matches),n[F]){for(r=++s;i>r&&!N.relative[e[r].type];r++);return g(s>1&&h(u),s>1&&f(e.slice(0,s-1)).replace(ct,"$1"),n,r>s&&v(e.slice(s,r)),i>r&&v(e=e.slice(r)),i>r&&f(e))}u.push(n)}return h(u)}function y(e,t){var n=0,r=t.length>0,o=e.length>0,s=function(i,s,l,c,u){var d,f,p,h=[],g=0,v="0",y=i&&[],b=null!=u,C=T,x=i||o&&N.find.TAG("*",u&&s.parentNode||s),w=V+=null==C?1:Math.random()||.1;for(b&&(T=s!==L&&s,_=n);null!=(d=x[v]);v++){if(o&&d){for(f=0;p=e[f++];)if(p(d,s,l)){c.push(d);break}b&&(V=w,_=++n)}r&&((d=!p&&d)&&g--,i&&y.push(d))}if(g+=v,r&&v!==g){for(f=0;p=t[f++];)p(y,h,s,l);if(i){if(g>0)for(;v--;)y[v]||h[v]||(h[v]=Q.call(c));h=m(h)}et.apply(c,h),b&&!i&&h.length>0&&g+t.length>1&&a.uniqueSort(c)}return b&&(V=w,T=C),y};return r?i(s):s}function b(e,t,n){for(var r=0,i=t.length;i>r;r++)a(e,t[r],n);return n}function C(e,t,n,r){var i,o,a,s,l,c=d(e);if(!r&&1===c.length){if(o=c[0]=c[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&9===t.nodeType&&D&&N.relative[o[1].type]){if(t=(N.find.ID(a.matches[0].replace(wt,_t),t)||[])[0],!t)return n;e=e.slice(o.shift().value.length)}for(i=ht.needsContext.test(e)?0:o.length;i--&&(a=o[i],!N.relative[s=a.type]);)if((l=N.find[s])&&(r=l(a.matches[0].replace(wt,_t),mt.test(o[0].type)&&t.parentNode||t))){if(o.splice(i,1),e=r.length&&f(o),!e)return et.apply(n,r),n;break}}return k(e,c)(r,t,!D,n,mt.test(e)),n}function x(){}var w,_,N,E,S,k,T,R,A,B,L,M,D,H,P,O,I,F="sizzle"+-new Date,W=window.document,z={},V=0,U=0,q=n(),$=n(),j=n(),K=!1,G=function(){return 0},Y=typeof t,X=1<<31,J=[],Q=J.pop,Z=J.push,et=J.push,tt=J.slice,nt=J.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},rt="[\\x20\\t\\r\\n\\f]",it="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ot=it.replace("w","w#"),at="([*^$|!~]?=)",st="\\["+rt+"*("+it+")"+rt+"*(?:"+at+rt+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+ot+")|)|)"+rt+"*\\]",lt=":("+it+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+st.replace(3,8)+")*)|.*)\\)|)",ct=new RegExp("^"+rt+"+|((?:^|[^\\\\])(?:\\\\.)*)"+rt+"+$","g"),ut=new RegExp("^"+rt+"*,"+rt+"*"),dt=new RegExp("^"+rt+"*([\\x20\\t\\r\\n\\f>+~])"+rt+"*"),ft=new RegExp(lt),pt=new RegExp("^"+ot+"$"),ht={ID:new RegExp("^#("+it+")"),CLASS:new RegExp("^\\.("+it+")"),NAME:new RegExp("^\\[name=['\"]?("+it+")['\"]?\\]"),TAG:new RegExp("^("+it.replace("w","w*")+")"),ATTR:new RegExp("^"+st),PSEUDO:new RegExp("^"+lt),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+rt+"*(even|odd|(([+-]|)(\\d*)n|)"+rt+"*(?:([+-]|)"+rt+"*(\\d+)|))"+rt+"*\\)|)","i"),needsContext:new RegExp("^"+rt+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+rt+"*((?:-\\d)?\\d*)"+rt+"*\\)|)(?=[^-]|$)","i")},mt=/[\x20\t\r\n\f]*[+~]/,gt=/^[^{]+\{\s*\[native code/,vt=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,yt=/^(?:input|select|textarea|button)$/i,bt=/^h\d$/i,Ct=/'|\\/g,xt=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,wt=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,_t=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{et.apply(J=tt.call(W.childNodes),W.childNodes),J[W.childNodes.length].nodeType}catch(Nt){et={apply:J.length?function(e,t){Z.apply(e,tt.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}S=a.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},B=a.setDocument=function(n){var r=n?n.ownerDocument||n:W;return r!==L&&9===r.nodeType&&r.documentElement?(L=r,M=r.documentElement,D=!S(r),z.getElementsByTagName=o(function(e){return e.appendChild(r.createComment("")),!e.getElementsByTagName("*").length}),z.attributes=o(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),z.getElementsByClassName=o(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),z.getByName=o(function(e){e.id=F+0,e.appendChild(L.createElement("a")).setAttribute("name",F),e.appendChild(L.createElement("i")).setAttribute("name",F),M.appendChild(e);var t=r.getElementsByName&&r.getElementsByName(F).length===2+r.getElementsByName(F+0).length;return M.removeChild(e),t}),z.sortDetached=o(function(e){return e.compareDocumentPosition&&1&e.compareDocumentPosition(L.createElement("div"))}),N.attrHandle=o(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==Y&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},z.getByName?(N.find.ID=function(e,t){if(typeof t.getElementById!==Y&&D){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},N.filter.ID=function(e){var t=e.replace(wt,_t);return function(e){return e.getAttribute("id")===t}}):(N.find.ID=function(e,n){if(typeof n.getElementById!==Y&&D){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==Y&&r.getAttributeNode("id").value===e?[r]:t:[]}},N.filter.ID=function(e){var t=e.replace(wt,_t);return function(e){var n=typeof e.getAttributeNode!==Y&&e.getAttributeNode("id");return n&&n.value===t}}),N.find.TAG=z.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==Y?t.getElementsByTagName(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},N.find.NAME=z.getByName&&function(e,t){return typeof t.getElementsByName!==Y?t.getElementsByName(name):void 0},N.find.CLASS=z.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==Y&&D?t.getElementsByClassName(e):void 0},P=[],H=[":focus"],(z.qsa=e(r.querySelectorAll))&&(o(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||H.push("\\["+rt+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||H.push(":checked")}),o(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&H.push("[*^$]="+rt+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||H.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),H.push(",.*:")})),(z.matchesSelector=e(O=M.matchesSelector||M.mozMatchesSelector||M.webkitMatchesSelector||M.oMatchesSelector||M.msMatchesSelector))&&o(function(e){z.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),P.push("!=",lt)}),H=new RegExp(H.join("|")),P=P.length&&new RegExp(P.join("|")),I=e(M.contains)||M.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},G=M.compareDocumentPosition?function(e,t){if(e===t)return K=!0,0;var n=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return n?1&n||R&&t.compareDocumentPosition(e)===n?e===r||I(W,e)?-1:t===r||I(W,t)?1:A?nt.call(A,e)-nt.call(A,t):0:4&n?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var n,i=0,o=e.parentNode,a=t.parentNode,l=[e],c=[t];if(e===t)return K=!0,0;if(!o||!a)return e===r?-1:t===r?1:o?-1:a?1:0;if(o===a)return s(e,t);for(n=e;n=n.parentNode;)l.unshift(n);for(n=t;n=n.parentNode;)c.unshift(n);for(;l[i]===c[i];)i++;return i?s(l[i],c[i]):l[i]===W?-1:c[i]===W?1:0},L):L},a.matches=function(e,t){return a(e,null,null,t)},a.matchesSelector=function(e,t){if((e.ownerDocument||e)!==L&&B(e),t=t.replace(xt,"='$1']"),z.matchesSelector&&D&&(!P||!P.test(t))&&!H.test(t))try{var n=O.call(e,t);if(n||z.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return a(t,L,null,[e]).length>0},a.contains=function(e,t){return(e.ownerDocument||e)!==L&&B(e),I(e,t)},a.attr=function(e,t){var n;return(e.ownerDocument||e)!==L&&B(e),D&&(t=t.toLowerCase()),(n=N.attrHandle[t])?n(e):!D||z.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},a.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},a.uniqueSort=function(e){var t,n=[],r=0,i=0;if(K=!z.detectDuplicates,R=!z.sortDetached,A=!z.sortStable&&e.slice(0),e.sort(G),K){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return e},E=a.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=E(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=E(t);return n},N=a.selectors={cacheLength:50,createPseudo:i,match:ht,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(wt,_t),e[3]=(e[4]||e[5]||"").replace(wt,_t),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||a.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&a.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return ht.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&ft.test(n)&&(t=d(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(wt,_t).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=q[e+" "];return t||(t=new RegExp("(^|"+rt+")"+e+"("+rt+"|$)"))&&q(e,function(e){return t.test(e.className||typeof e.getAttribute!==Y&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=a.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var c,u,d,f,p,h,m=o!==a?"nextSibling":"previousSibling",g=t.parentNode,v=s&&t.nodeName.toLowerCase(),y=!l&&!s;if(g){if(o){for(;m;){for(d=t;d=d[m];)if(s?d.nodeName.toLowerCase()===v:1===d.nodeType)return!1;h=m="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?g.firstChild:g.lastChild],a&&y){for(u=g[F]||(g[F]={}),c=u[e]||[],p=c[0]===V&&c[1],f=c[0]===V&&c[2],d=p&&g.childNodes[p];d=++p&&d&&d[m]||(f=p=0)||h.pop();)if(1===d.nodeType&&++f&&d===t){u[e]=[V,p,f];break}}else if(y&&(c=(t[F]||(t[F]={}))[e])&&c[0]===V)f=c[1];else for(;(d=++p&&d&&d[m]||(f=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==v:1!==d.nodeType)||!++f||(y&&((d[F]||(d[F]={}))[e]=[V,f]),d!==t)););return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=N.pseudos[e]||N.setFilters[e.toLowerCase()]||a.error("unsupported pseudo: "+e);return r[F]?r(t):r.length>1?(n=[e,e,"",t],N.setFilters.hasOwnProperty(e.toLowerCase())?i(function(e,n){for(var i,o=r(e,t),a=o.length;a--;)i=nt.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:i(function(e){var t=[],n=[],r=k(e.replace(ct,"$1"));return r[F]?i(function(e,t,n,i){for(var o,a=r(e,null,i,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:i(function(e){return function(t){return a(e,t).length>0}}),contains:i(function(e){return function(t){return(t.textContent||t.innerText||E(t)).indexOf(e)>-1}}),lang:i(function(e){return pt.test(e||"")||a.error("unsupported lang: "+e),e=e.replace(wt,_t).toLowerCase(),function(t){var n;do if(n=D?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(e){var t=window.location&&window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===M},focus:function(e){return e===L.activeElement&&(!L.hasFocus||L.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!N.pseudos.empty(e)},header:function(e){return bt.test(e.nodeName)},input:function(e){return yt.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:u(function(){return[0]}),last:u(function(e,t){return[t-1]}),eq:u(function(e,t,n){return[0>n?n+t:n]}),even:u(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:u(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:u(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:u(function(e,t,n){for(var r=0>n?n+t:n;++r<t;)e.push(r);return e})}};for(w in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})N.pseudos[w]=l(w);for(w in{submit:!0,reset:!0})N.pseudos[w]=c(w);return k=a.compile=function(e,t){var n,r=[],i=[],o=j[e+" "];if(!o){for(t||(t=d(e)),n=t.length;n--;)o=v(t[n]),o[F]?r.push(o):i.push(o);o=j(e,y(i,r))}return o},N.pseudos.nth=N.pseudos.eq,x.prototype=N.filters=N.pseudos,N.setFilters=new x,z.sortStable=F.split("").sort(G).join("")===F,B(),[0,0].sort(G),z.detectDuplicates=K,"function"==typeof r&&r.amd?r(function(){return a}):window.Sizzle=a,a}),r(u,[l,c],function(e,n){function r(e){return"undefined"!=typeof e}function i(e){return"string"==typeof e}function o(e){var t,n,r;for(r=g.createElement("div"),t=g.createDocumentFragment(),r.innerHTML=e;n=r.firstChild;)t.appendChild(n);return t}function a(e,t,n){var r;if("string"==typeof t)t=o(t);else if(t.length){for(r=0;r<t.length;r++)a(e,t[r],n);return e}for(r=e.length;r--;)n.call(e[r],t.parentNode?t:t);return e}function s(e,t){return e&&t&&-1!==(" "+e.className+" ").indexOf(" "+t+" ")}function l(e,t){var n;for(e=e||[],"string"==typeof e&&(e=e.split(" ")),t=t||{},n=e.length;n--;)t[e[n]]={};return t}function c(e,t){return new c.fn.init(e,t)}function u(e){var t=arguments,n,r,i;for(r=1;r<t.length;r++){n=t[r];for(i in n)e[i]=n[i]}return e}function d(e){var t=[],n,r;for(n=0,r=e.length;r>n;n++)t[n]=e[n];return t}function f(e,t){var n;if(t.indexOf)return t.indexOf(e);for(n=t.length;n--;)if(t[n]===e)return n;return-1}function p(e,t){var n,r,i,o,a;if(e)if(n=e.length,n===o){for(r in e)if(e.hasOwnProperty(r)&&(a=e[r],t.call(a,a,r)===!1))break}else for(i=0;n>i&&(a=e[i],t.call(a,a,r)!==!1);i++);return e}function h(e,n,r){for(var i=[],o=e[n];o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!c(o).is(r));)1===o.nodeType&&i.push(o),o=o[n];return i}function m(e,t,n,r){for(var i=[];e;e=e[n])r&&e.nodeType!==r||e===t||i.push(e);return i}var g=document,v=Array.prototype.push,y=Array.prototype.slice,b=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,C=e.Event,x=l("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"),w=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},_=/^\s*|\s*$/g,N=function(e){return null===e||e===t?"":(""+e).replace(_,"")};return c.fn=c.prototype={constructor:c,selector:"",length:0,init:function(e,t){var n=this,r,a;if(!e)return n;if(e.nodeType)return n.context=n[0]=e,n.length=1,n;if(i(e)){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:b.exec(e),!r)return c(t||document).find(e);if(r[1])for(a=o(e).firstChild;a;)this.add(a),a=a.nextSibling;else{if(a=g.getElementById(r[2]),a.id!==r[2])return n.find(e);n.length=1,n[0]=a}}else this.add(e);return n},toArray:function(){return d(this)},add:function(e){var t=this;return w(e)?v.apply(t,e):e instanceof c?t.add(e.toArray()):v.call(t,e),t},attr:function(e,n){var i=this;if("object"==typeof e)p(e,function(e,t){i.attr(t,e)});else{if(!r(n))return i[0]&&1===i[0].nodeType?i[0].getAttribute(e):t;this.each(function(){1===this.nodeType&&this.setAttribute(e,n)})}return i},css:function(e,n){var i=this;if("object"==typeof e)p(e,function(e,t){i.css(t,e)});else{if(e=e.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),!r(n))return i[0]?i[0].style[e]:t;"number"!=typeof n||x[e]||(n+="px"),i.each(function(){var t=this.style;"opacity"===e&&this.runtimeStyle&&"undefined"==typeof this.runtimeStyle.opacity&&(t.filter=""===n?"":"alpha(opacity="+100*n+")");try{t[e]=n}catch(r){}})}return i},remove:function(){for(var e=this,t,n=this.length;n--;)t=e[n],C.clean(t),t.parentNode&&t.parentNode.removeChild(t);return this},empty:function(){for(var e=this,t,n=this.length;n--;)for(t=e[n];t.firstChild;)t.removeChild(t.firstChild);return this},html:function(e){var t=this,n;if(r(e)){for(n=t.length;n--;)t[n].innerHTML=e;return t}return t[0]?t[0].innerHTML:""},text:function(e){var t=this,n;if(r(e)){for(n=t.length;n--;)t[n].innerText=t[0].textContent=e;return t}return t[0]?t[0].innerText||t[0].textContent:""},append:function(){return a(this,arguments,function(e){1===this.nodeType&&this.appendChild(e)})},prepend:function(){return a(this,arguments,function(e){1===this.nodeType&&this.insertBefore(e,this.firstChild)})},before:function(){var e=this;return e[0]&&e[0].parentNode?a(e,arguments,function(e){this.parentNode.insertBefore(e,this.nextSibling)}):e},after:function(){var e=this;return e[0]&&e[0].parentNode?a(e,arguments,function(e){this.parentNode.insertBefore(e,this)}):e},appendTo:function(e){return c(e).append(this),this},addClass:function(e){return this.toggleClass(e,!0)},removeClass:function(e){return this.toggleClass(e,!1)},toggleClass:function(e,t){var n=this;return-1!==e.indexOf(" ")?p(e.split(" "),function(){n.toggleClass(this,t)}):n.each(function(){var n=this,r;s(n,e)!==t&&(r=n.className,t?n.className+=r?" "+e:e:n.className=N((" "+r+" ").replace(" "+e+" "," ")))}),n},hasClass:function(e){return s(this[0],e)},each:function(e){return p(this,e)},on:function(e,t){return this.each(function(){C.bind(this,e,t)})},off:function(e,t){return this.each(function(){C.unbind(this,e,t)})},show:function(){return this.css("display","")},hide:function(){return this.css("display","none")},slice:function(){return new c(y.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},replaceWith:function(e){var t=this;return t[0]&&t[0].parentNode.replaceChild(c(e)[0],t[0]),t},wrap:function(e){return e=c(e)[0],this.each(function(){var t=this,n=e.cloneNode(!1);t.parentNode.insertBefore(n,t),n.appendChild(t)})},unwrap:function(){return this.each(function(){for(var e=this,t=e.firstChild,n;t;)n=t,t=t.nextSibling,e.parentNode.insertBefore(n,e)})},clone:function(){var e=[];return this.each(function(){e.push(this.cloneNode(!0))}),c(e)},find:function(e){var t,n,r=[];for(t=0,n=this.length;n>t;t++)c.find(e,this[t],r);return c(r)},push:v,sort:[].sort,splice:[].splice},u(c,{extend:u,toArray:d,inArray:f,isArray:w,each:p,trim:N,makeMap:l,find:n,expr:n.selectors,unique:n.uniqueSort,text:n.getText,isXMLDoc:n.isXML,contains:n.contains,filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?c.find.matchesSelector(t[0],e)?[t[0]]:[]:c.find.matches(e,t)}}),p({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t){return h(e,"parentNode",t)},next:function(e){return m(e,"nextSibling",1)},prev:function(e){return m(e,"previousSibling",1)},nextNodes:function(e){return m(e,"nextSibling")},prevNodes:function(e){return m(e,"previousSibling")},children:function(e){return m(e.firstChild,"nextSibling",1)},contents:function(e){return d(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(e,t){c.fn[e]=function(n){var r=this,i;if(r.length>1)throw new Error("DomQuery only supports traverse functions on a single node.");return r[0]&&(i=t(r[0],n)),i=c(i),n&&"parentsUntil"!==e?i.filter(n):i}}),c.fn.filter=function(e){return c.filter(e)},c.fn.is=function(e){return!!e&&this.filter(e).length>0},c.fn.init.prototype=c.fn,c}),r(d,[],function(){return function(e,t){function n(e,t,n,r){function i(e){return e=parseInt(e,10).toString(16),e.length>1?e:"0"+e}return"#"+i(t)+i(n)+i(r)}var r=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,i=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,a=/\s+$/,s,l,c={},u,d="\ufeff";
-for(e=e||{},u=("\\\" \\' \\; \\: ; : "+d).split(" "),l=0;l<u.length;l++)c[u[l]]=d+l,c[d+l]=u[l];return{toHex:function(e){return e.replace(r,n)},parse:function(t){function s(e,t){var n,r,i,o;n=h[e+"-top"+t],n&&(r=h[e+"-right"+t],n==r&&(i=h[e+"-bottom"+t],r==i&&(o=h[e+"-left"+t],i==o&&(h[e+t]=o,delete h[e+"-top"+t],delete h[e+"-right"+t],delete h[e+"-bottom"+t],delete h[e+"-left"+t]))))}function l(e){var t=h[e],n;if(t&&!(t.indexOf(" ")<0)){for(t=t.split(" "),n=t.length;n--;)if(t[n]!==t[0])return!1;return h[e]=t[0],!0}}function u(e,t,n,r){l(t)&&l(n)&&l(r)&&(h[e]=h[t]+" "+h[n]+" "+h[r],delete h[t],delete h[n],delete h[r])}function d(e){return y=!0,c[e]}function f(e,t){return y&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return c[e]})),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e}function p(e,t,n,r,i,o){return(i=i||o)?(i=f(i),"'"+i.replace(/\'/g,"\\'")+"'"):(t=f(t||n||r),b&&(t=b.call(C,t,"style")),"url('"+t.replace(/\'/g,"\\'")+"')")}var h={},m,g,v,y,b=e.url_converter,C=e.url_converter_scope||this;if(t){for(t=t.replace(/\\[\"\';:\uFEFF]/g,d).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,d)});m=o.exec(t);)g=m[1].replace(a,"").toLowerCase(),v=m[2].replace(a,""),g&&v.length>0&&("font-weight"===g&&"700"===v?v="bold":("color"===g||"background-color"===g)&&(v=v.toLowerCase()),v=v.replace(r,n),v=v.replace(i,p),h[g]=y?f(v,!0):v),o.lastIndex=m.index+m[0].length;s("border",""),s("border","-width"),s("border","-color"),s("border","-style"),s("padding",""),s("margin",""),u("border","border-width","border-style","border-color"),"medium none"===h.border&&delete h.border}return h},serialize:function(e,n){function r(n){var r,o,a,l;if(r=t.styles[n])for(o=0,a=r.length;a>o;o++)n=r[o],l=e[n],l!==s&&l.length>0&&(i+=(i.length>0?" ":"")+n+": "+l+";")}var i="",o,a;if(n&&t&&t.styles)r("*"),r(n);else for(o in e)a=e[o],a!==s&&a.length>0&&(i+=(i.length>0?" ":"")+o+": "+a+";");return i}}}}),r(f,[],function(){return function(e,t){function n(e,n,r,i){var o,a;if(e){if(!i&&e[n])return e[n];if(e!=t){if(o=e[r])return o;for(a=e.parentNode;a&&a!=t;a=a.parentNode)if(o=a[r])return o}}}var r=e;this.current=function(){return r},this.next=function(e){return r=n(r,"firstChild","nextSibling",e)},this.prev=function(e){return r=n(r,"lastChild","previousSibling",e)}}}),r(p,[],function(){function e(e,n){return n?"array"==n&&g(e)?!0:typeof e==n:e!==t}function n(e){var t=[],n,r;for(n=0,r=e.length;r>n;n++)t[n]=e[n];return t}function r(e,t,n){var r;for(e=e||[],t=t||",","string"==typeof e&&(e=e.split(t)),n=n||{},r=e.length;r--;)n[e[r]]={};return n}function i(e,n,r){var i,o;if(!e)return 0;if(r=r||e,e.length!==t){for(i=0,o=e.length;o>i;i++)if(n.call(r,e[i],i,e)===!1)return 0}else for(i in e)if(e.hasOwnProperty(i)&&n.call(r,e[i],i,e)===!1)return 0;return 1}function o(e,t){var n=[];return i(e,function(e){n.push(t(e))}),n}function a(e,t){var n=[];return i(e,function(e){(!t||t(e))&&n.push(e)}),n}function s(e,t,n){var r=this,i,o,a,s,l,c=0;if(e=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(e),a=e[3].match(/(^|\.)(\w+)$/i)[2],o=r.createNS(e[3].replace(/\.\w+$/,""),n),!o[a]){if("static"==e[2])return o[a]=t,this.onCreate&&this.onCreate(e[2],e[3],o[a]),void 0;t[a]||(t[a]=function(){},c=1),o[a]=t[a],r.extend(o[a].prototype,t),e[5]&&(i=r.resolve(e[5]).prototype,s=e[5].match(/\.(\w+)$/i)[1],l=o[a],o[a]=c?function(){return i[s].apply(this,arguments)}:function(){return this.parent=i[s],l.apply(this,arguments)},o[a].prototype[a]=o[a],r.each(i,function(e,t){o[a].prototype[t]=i[t]}),r.each(t,function(e,t){i[t]?o[a].prototype[t]=function(){return this.parent=i[t],e.apply(this,arguments)}:t!=a&&(o[a].prototype[t]=e)})),r.each(t["static"],function(e,t){o[a][t]=e})}}function l(e,t){var n,r;if(e)for(n=0,r=e.length;r>n;n++)if(e[n]===t)return n;return-1}function c(e,n){var r,i,o,a=arguments,s;for(r=1,i=a.length;i>r;r++){n=a[r];for(o in n)n.hasOwnProperty(o)&&(s=n[o],s!==t&&(e[o]=s))}return e}function u(e,t,n,r){r=r||this,e&&(n&&(e=e[n]),i(e,function(e,i){return t.call(r,e,i,n)===!1?!1:(u(e,t,n,r),void 0)}))}function d(e,t){var n,r;for(t=t||window,e=e.split("."),n=0;n<e.length;n++)r=e[n],t[r]||(t[r]={}),t=t[r];return t}function f(e,t){var n,r;for(t=t||window,e=e.split("."),n=0,r=e.length;r>n&&(t=t[e[n]],t);n++);return t}function p(t,n){return!t||e(t,"array")?t:o(t.split(n||","),m)}var h=/^\s*|\s*$/g,m=function(e){return null===e||e===t?"":(""+e).replace(h,"")},g=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)};return{trim:m,isArray:g,is:e,toArray:n,makeMap:r,each:i,map:o,grep:a,inArray:l,extend:c,create:s,walk:u,createNS:d,resolve:f,explode:p}}),r(h,[p],function(e){function t(n){function r(){return H.createDocumentFragment()}function i(e,t){_(F,e,t)}function o(e,t){_(W,e,t)}function a(e){i(e.parentNode,j(e))}function s(e){i(e.parentNode,j(e)+1)}function l(e){o(e.parentNode,j(e))}function c(e){o(e.parentNode,j(e)+1)}function u(e){e?(D[U]=D[V],D[q]=D[z]):(D[V]=D[U],D[z]=D[q]),D.collapsed=F}function d(e){a(e),c(e)}function f(e){i(e,0),o(e,1===e.nodeType?e.childNodes.length:e.nodeValue.length)}function p(e,t){var n=D[V],r=D[z],i=D[U],o=D[q],a=t.startContainer,s=t.startOffset,l=t.endContainer,c=t.endOffset;return 0===e?w(n,r,a,s):1===e?w(i,o,a,s):2===e?w(i,o,l,c):3===e?w(n,r,l,c):void 0}function h(){N(I)}function m(){return N(P)}function g(){return N(O)}function v(e){var t=this[V],r=this[z],i,o;3!==t.nodeType&&4!==t.nodeType||!t.nodeValue?(t.childNodes.length>0&&(o=t.childNodes[r]),o?t.insertBefore(e,o):t.appendChild(e)):r?r>=t.nodeValue.length?n.insertAfter(e,t):(i=t.splitText(r),t.parentNode.insertBefore(e,i)):t.parentNode.insertBefore(e,t)}function y(e){var t=D.extractContents();D.insertNode(e),e.appendChild(t),D.selectNode(e)}function b(){return $(new t(n),{startContainer:D[V],startOffset:D[z],endContainer:D[U],endOffset:D[q],collapsed:D.collapsed,commonAncestorContainer:D.commonAncestorContainer})}function C(e,t){var n;if(3==e.nodeType)return e;if(0>t)return e;for(n=e.firstChild;n&&t>0;)--t,n=n.nextSibling;return n?n:e}function x(){return D[V]==D[U]&&D[z]==D[q]}function w(e,t,r,i){var o,a,s,l,c,u;if(e==r)return t==i?0:i>t?-1:1;for(o=r;o&&o.parentNode!=e;)o=o.parentNode;if(o){for(a=0,s=e.firstChild;s!=o&&t>a;)a++,s=s.nextSibling;return a>=t?-1:1}for(o=e;o&&o.parentNode!=r;)o=o.parentNode;if(o){for(a=0,s=r.firstChild;s!=o&&i>a;)a++,s=s.nextSibling;return i>a?-1:1}for(l=n.findCommonAncestor(e,r),c=e;c&&c.parentNode!=l;)c=c.parentNode;for(c||(c=l),u=r;u&&u.parentNode!=l;)u=u.parentNode;if(u||(u=l),c==u)return 0;for(s=l.firstChild;s;){if(s==c)return-1;if(s==u)return 1;s=s.nextSibling}}function _(e,t,r){var i,o;for(e?(D[V]=t,D[z]=r):(D[U]=t,D[q]=r),i=D[U];i.parentNode;)i=i.parentNode;for(o=D[V];o.parentNode;)o=o.parentNode;o==i?w(D[V],D[z],D[U],D[q])>0&&D.collapse(e):D.collapse(e),D.collapsed=x(),D.commonAncestorContainer=n.findCommonAncestor(D[V],D[U])}function N(e){var t,n=0,r=0,i,o,a,s,l,c;if(D[V]==D[U])return E(e);for(t=D[U],i=t.parentNode;i;t=i,i=i.parentNode){if(i==D[V])return S(t,e);++n}for(t=D[V],i=t.parentNode;i;t=i,i=i.parentNode){if(i==D[U])return k(t,e);++r}for(o=r-n,a=D[V];o>0;)a=a.parentNode,o--;for(s=D[U];0>o;)s=s.parentNode,o++;for(l=a.parentNode,c=s.parentNode;l!=c;l=l.parentNode,c=c.parentNode)a=l,s=c;return T(a,s,e)}function E(e){var t,n,i,o,a,s,l,c,u;if(e!=I&&(t=r()),D[z]==D[q])return t;if(3==D[V].nodeType){if(n=D[V].nodeValue,i=n.substring(D[z],D[q]),e!=O&&(o=D[V],c=D[z],u=D[q]-D[z],0===c&&u>=o.nodeValue.length-1?o.parentNode.removeChild(o):o.deleteData(c,u),D.collapse(F)),e==I)return;return i.length>0&&t.appendChild(H.createTextNode(i)),t}for(o=C(D[V],D[z]),a=D[q]-D[z];o&&a>0;)s=o.nextSibling,l=L(o,e),t&&t.appendChild(l),--a,o=s;return e!=O&&D.collapse(F),t}function S(e,t){var n,i,o,a,s,l;if(t!=I&&(n=r()),i=R(e,t),n&&n.appendChild(i),o=j(e),a=o-D[z],0>=a)return t!=O&&(D.setEndBefore(e),D.collapse(W)),n;for(i=e.previousSibling;a>0;)s=i.previousSibling,l=L(i,t),n&&n.insertBefore(l,n.firstChild),--a,i=s;return t!=O&&(D.setEndBefore(e),D.collapse(W)),n}function k(e,t){var n,i,o,a,s,l;for(t!=I&&(n=r()),o=A(e,t),n&&n.appendChild(o),i=j(e),++i,a=D[q]-i,o=e.nextSibling;o&&a>0;)s=o.nextSibling,l=L(o,t),n&&n.appendChild(l),--a,o=s;return t!=O&&(D.setStartAfter(e),D.collapse(F)),n}function T(e,t,n){var i,o,a,s,l,c,u,d;for(n!=I&&(o=r()),i=A(e,n),o&&o.appendChild(i),a=e.parentNode,s=j(e),l=j(t),++s,c=l-s,u=e.nextSibling;c>0;)d=u.nextSibling,i=L(u,n),o&&o.appendChild(i),u=d,--c;return i=R(t,n),o&&o.appendChild(i),n!=O&&(D.setStartAfter(e),D.collapse(F)),o}function R(e,t){var n=C(D[U],D[q]-1),r,i,o,a,s,l=n!=D[U];if(n==e)return B(n,l,W,t);for(r=n.parentNode,i=B(r,W,W,t);r;){for(;n;)o=n.previousSibling,a=B(n,l,W,t),t!=I&&i.insertBefore(a,i.firstChild),l=F,n=o;if(r==e)return i;n=r.previousSibling,r=r.parentNode,s=B(r,W,W,t),t!=I&&s.appendChild(i),i=s}}function A(e,t){var n=C(D[V],D[z]),r=n!=D[V],i,o,a,s,l;if(n==e)return B(n,r,F,t);for(i=n.parentNode,o=B(i,W,F,t);i;){for(;n;)a=n.nextSibling,s=B(n,r,F,t),t!=I&&o.appendChild(s),r=F,n=a;if(i==e)return o;n=i.nextSibling,i=i.parentNode,l=B(i,W,F,t),t!=I&&l.appendChild(o),o=l}}function B(e,t,r,i){var o,a,s,l,c;if(t)return L(e,i);if(3==e.nodeType){if(o=e.nodeValue,r?(l=D[z],a=o.substring(l),s=o.substring(0,l)):(l=D[q],a=o.substring(0,l),s=o.substring(l)),i!=O&&(e.nodeValue=s),i==I)return;return c=n.clone(e,W),c.nodeValue=a,c}if(i!=I)return n.clone(e,W)}function L(e,t){return t!=I?t==O?n.clone(e,F):e:(e.parentNode.removeChild(e),void 0)}function M(){return n.create("body",null,g()).outerText}var D=this,H=n.doc,P=0,O=1,I=2,F=!0,W=!1,z="startOffset",V="startContainer",U="endContainer",q="endOffset",$=e.extend,j=n.nodeIndex;return $(D,{startContainer:H,startOffset:0,endContainer:H,endOffset:0,collapsed:F,commonAncestorContainer:H,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:i,setEnd:o,setStartBefore:a,setStartAfter:s,setEndBefore:l,setEndAfter:c,collapse:u,selectNode:d,selectNodeContents:f,compareBoundaryPoints:p,deleteContents:h,extractContents:m,cloneContents:g,insertNode:v,surroundContents:y,cloneRange:b,toStringIE:M}),D}return t.prototype.toString=function(){return this.toStringIE()},t}),r(m,[p],function(e){function t(e){var t;return t=document.createElement("div"),t.innerHTML=e,t.textContent||t.innerText||e}function n(e,t){var n,r,i,a={};if(e){for(e=e.split(","),t=t||10,n=0;n<e.length;n+=2)r=String.fromCharCode(parseInt(e[n],t)),o[r]||(i="&"+e[n+1]+";",a[r]=i,a[i]=r);return a}}var r=e.makeMap,i,o,a,s=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,l=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,c=/[<>&\"\']/g,u=/&(#x|#)?([\w]+);/g,d={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"};o={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"},a={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},i=n("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);var f={encodeRaw:function(e,t){return e.replace(t?s:l,function(e){return o[e]||e})},encodeAllRaw:function(e){return(""+e).replace(c,function(e){return o[e]||e})},encodeNumeric:function(e,t){return e.replace(t?s:l,function(e){return e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":o[e]||"&#"+e.charCodeAt(0)+";"})},encodeNamed:function(e,t,n){return n=n||i,e.replace(t?s:l,function(e){return o[e]||n[e]||e})},getEncodeFunc:function(e,t){function a(e,n){return e.replace(n?s:l,function(e){return o[e]||t[e]||"&#"+e.charCodeAt(0)+";"||e})}function c(e,n){return f.encodeNamed(e,n,t)}return t=n(t)||i,e=r(e.replace(/\+/g,",")),e.named&&e.numeric?a:e.named?t?c:f.encodeNamed:e.numeric?f.encodeNumeric:f.encodeRaw},decode:function(e){return e.replace(u,function(e,n,r){return n?(r=parseInt(r,2===n.length?16:10),r>65535?(r-=65536,String.fromCharCode(55296+(r>>10),56320+(1023&r))):d[r]||String.fromCharCode(r)):a[e]||i[e]||t(e)})}};return f}),r(g,[],function(){var e=navigator,t=e.userAgent,n,r,i,o,a,s;n=window.opera&&window.opera.buildNumber,r=/WebKit/.test(t),i=!r&&!n&&/MSIE/gi.test(t)&&/Explorer/gi.test(e.appName),i=i&&/MSIE (\w+)\./.exec(t)[1],o=!r&&/Gecko/.test(t),a=-1!=t.indexOf("Mac"),s=/(iPad|iPhone)/.test(t);var l=!s||t.match(/AppleWebKit\/(\d*)/)[1]>=534;return{opera:n,webkit:r,ie:i,gecko:o,mac:a,iOS:s,contentEditable:l,transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:8!=i,range:window.getSelection&&"Range"in window,documentMode:i?document.documentMode||7:10}}),r(v,[c,d,l,f,h,m,g,p],function(e,n,r,i,o,a,s,l){function c(e,t){var i=this,o;i.doc=e,i.win=window,i.files={},i.counter=0,i.stdMode=!g||e.documentMode>=8,i.boxModel=!g||"CSS1Compat"==e.compatMode||i.stdMode,i.hasOuterHTML="outerHTML"in e.createElement("a"),i.settings=t=h({keep_values:!1,hex_colors:1},t),i.schema=t.schema,i.styles=new n({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope},t.schema),i.fixDoc(e),i.events=t.ownEvents?new r(t.proxy):r.Event,o=t.schema?t.schema.getBlockElements():{},i.isBlock=function(e){if(!e)return!1;var t=e.nodeType;return t?!(1!==t||!o[e.nodeName]):!!o[e]}}var u=l.each,d=l.is,f=l.grep,p=l.trim,h=l.extend,m=s.webkit,g=s.ie,v=/^([a-z0-9],?)+$/i,y=/^[ \t\r\n]*$/,b=l.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," ");return c.prototype={root:null,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},fixDoc:function(e){var t=this.settings,n;if(g&&t.schema){"abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video".replace(/\w+/g,function(t){e.createElement(t)});for(n in t.schema.getCustomElements())e.createElement(n)}},clone:function(e,t){var n=this,r,i;return!g||1!==e.nodeType||t?e.cloneNode(t):(i=n.doc,t?r.firstChild:(r=i.createElement(e.nodeName),u(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),r))},getRoot:function(){var e=this;return e.get(e.settings.root_element)||e.doc.body},getViewPort:function(e){var t,n;return e=e?e:this.win,t=e.document,n=this.boxModel?t.documentElement:t.body,{x:e.pageXOffset||n.scrollLeft,y:e.pageYOffset||n.scrollTop,w:e.innerWidth||n.clientWidth,h:e.innerHeight||n.clientHeight}},getRect:function(e){var t=this,n,r;return e=t.get(e),n=t.getPos(e),r=t.getSize(e),{x:n.x,y:n.y,w:r.w,h:r.h}},getSize:function(e){var t=this,n,r;return e=t.get(e),n=t.getStyle(e,"width"),r=t.getStyle(e,"height"),-1===n.indexOf("px")&&(n=0),-1===r.indexOf("px")&&(r=0),{w:parseInt(n,10)||e.offsetWidth||e.clientWidth,h:parseInt(r,10)||e.offsetHeight||e.clientHeight}},getParent:function(e,t,n){return this.getParents(e,t,n,!1)},getParents:function(e,n,r,i){var o=this,a,s=[];for(e=o.get(e),i=i===t,r=r||("BODY"!=o.getRoot().nodeName?o.getRoot().parentNode:null),d(n,"string")&&(a=n,n="*"===n?function(e){return 1==e.nodeType}:function(e){return o.is(e,a)});e&&e!=r&&e.nodeType&&9!==e.nodeType;){if(!n||n(e)){if(!i)return e;s.push(e)}e=e.parentNode}return i?s:null},get:function(e){var t;return e&&this.doc&&"string"==typeof e&&(t=e,e=this.doc.getElementById(e),e&&e.id!==t)?this.doc.getElementsByName(t)[1]:e},getNext:function(e,t){return this._findSib(e,t,"nextSibling")},getPrev:function(e,t){return this._findSib(e,t,"previousSibling")},select:function(t,n){var r=this;return e(t,r.get(n)||r.get(r.settings.root_element)||r.doc,[])},is:function(n,r){var i;if(n.length===t){if("*"===r)return 1==n.nodeType;if(v.test(r)){for(r=r.toLowerCase().split(/,/),n=n.nodeName.toLowerCase(),i=r.length-1;i>=0;i--)if(r[i]==n)return!0;return!1}}return n.nodeType&&1!=n.nodeType?!1:e.matches(r,n.nodeType?[n]:n).length>0},add:function(e,t,n,r,i){var o=this;return this.run(e,function(e){var a;return a=d(t,"string")?o.doc.createElement(t):t,o.setAttribs(a,n),r&&(r.nodeType?a.appendChild(r):o.setHTML(a,r)),i?a:e.appendChild(a)})},create:function(e,t,n){return this.add(this.doc.createElement(e),e,t,n,1)},createHTML:function(e,t,n){var r="",i;r+="<"+e;for(i in t)t.hasOwnProperty(i)&&null!==t[i]&&(r+=" "+i+'="'+this.encode(t[i])+'"');return"undefined"!=typeof n?r+">"+n+"</"+e+">":r+" />"},createFragment:function(e){var t,n,r=this.doc,i;for(i=r.createElement("div"),t=r.createDocumentFragment(),e&&(i.innerHTML=e);n=i.firstChild;)t.appendChild(n);return t},remove:function(e,t){return this.run(e,function(e){var n,r=e.parentNode;if(!r)return null;if(t)for(;n=e.firstChild;)!g||3!==n.nodeType||n.nodeValue?r.insertBefore(n,e):e.removeChild(n);return r.removeChild(e)})},setStyle:function(e,t,n){return this.run(e,function(e){var r=this,i,o;if(t)if("string"==typeof t){i=e.style,t=t.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),"number"!=typeof n||b[t]||(n+="px"),"opacity"===t&&e.runtimeStyle&&"undefined"==typeof e.runtimeStyle.opacity&&(i.filter=""===n?"":"alpha(opacity="+100*n+")"),"float"==t&&(t="cssFloat"in e.style?"cssFloat":"styleFloat");try{i[t]=n}catch(a){}r.settings.update_styles&&e.removeAttribute("data-mce-style")}else for(o in t)r.setStyle(e,o,t[o])})},getStyle:function(e,n,r){if(e=this.get(e)){if(this.doc.defaultView&&r){n=n.replace(/[A-Z]/g,function(e){return"-"+e});try{return this.doc.defaultView.getComputedStyle(e,null).getPropertyValue(n)}catch(i){return null}}return n=n.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),"float"==n&&(n=g?"styleFloat":"cssFloat"),n.currentStyle&&r?e.currentStyle[n]:e.style?e.style[n]:t}},setStyles:function(e,t){this.setStyle(e,t)},css:function(e,t,n){this.setStyle(e,t,n)},removeAllAttribs:function(e){return this.run(e,function(e){var t,n=e.attributes;for(t=n.length-1;t>=0;t--)e.removeAttributeNode(n.item(t))})},setAttrib:function(e,t,n){var r=this;if(e&&t)return this.run(e,function(e){var i=r.settings,o=e.getAttribute(t);if(null!==n)switch(t){case"style":if(!d(n,"string"))return u(n,function(t,n){r.setStyle(e,n,t)}),void 0;i.keep_values&&(n?e.setAttribute("data-mce-style",n,2):e.removeAttribute("data-mce-style",2)),e.style.cssText=n;break;case"class":e.className=n||"";break;case"src":case"href":i.keep_values&&(i.url_converter&&(n=i.url_converter.call(i.url_converter_scope||r,n,t,e)),r.setAttrib(e,"data-mce-"+t,n,2));break;case"shape":e.setAttribute("data-mce-style",n)}d(n)&&null!==n&&0!==n.length?e.setAttribute(t,""+n,2):e.removeAttribute(t,2),o!=n&&i.onSetAttrib&&i.onSetAttrib({attrElm:e,attrName:t,attrValue:n})})},setAttribs:function(e,t){var n=this;return this.run(e,function(e){u(t,function(t,r){n.setAttrib(e,r,t)})})},getAttrib:function(e,t,n){var r,i=this,o;if(e=i.get(e),!e||1!==e.nodeType)return n===o?!1:n;if(d(n)||(n=""),/^(src|href|style|coords|shape)$/.test(t)&&(r=e.getAttribute("data-mce-"+t)))return r;if(g&&i.props[t]&&(r=e[i.props[t]],r=r&&r.nodeValue?r.nodeValue:r),r||(r=e.getAttribute(t,2)),/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(t))return e[i.props[t]]===!0&&""===r?t:r?t:"";if("FORM"===e.nodeName&&e.getAttributeNode(t))return e.getAttributeNode(t).nodeValue;if("style"===t&&(r=r||e.style.cssText,r&&(r=i.serializeStyle(i.parseStyle(r),e.nodeName),i.settings.keep_values&&e.setAttribute("data-mce-style",r))),m&&"class"===t&&r&&(r=r.replace(/(apple|webkit)\-[a-z\-]+/gi,"")),g)switch(t){case"rowspan":case"colspan":1===r&&(r="");break;case"size":("+0"===r||20===r||0===r)&&(r="");break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":0===r&&(r="");break;case"hspace":-1===r&&(r="");break;case"maxlength":case"tabindex":(32768===r||2147483647===r||"32768"===r)&&(r="");break;case"multiple":case"compact":case"noshade":case"nowrap":return 65535===r?t:n;case"shape":r=r.toLowerCase();break;default:0===t.indexOf("on")&&r&&(r=(""+r).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1"))}return r!==o&&null!==r&&""!==r?""+r:n},getPos:function(e,t){var n=this,r=0,i=0,o,a=n.doc,s;if(e=n.get(e),t=t||a.body,e){if(t===a.body&&e.getBoundingClientRect)return s=e.getBoundingClientRect(),t=n.boxModel?a.documentElement:a.body,r=s.left+(a.documentElement.scrollLeft||a.body.scrollLeft)-t.clientTop,i=s.top+(a.documentElement.scrollTop||a.body.scrollTop)-t.clientLeft,{x:r,y:i};for(o=e;o&&o!=t&&o.nodeType;)r+=o.offsetLeft||0,i+=o.offsetTop||0,o=o.offsetParent;for(o=e.parentNode;o&&o!=t&&o.nodeType;)r-=o.scrollLeft||0,i-=o.scrollTop||0,o=o.parentNode}return{x:r,y:i}},parseStyle:function(e){return this.styles.parse(e)},serializeStyle:function(e,t){return this.styles.serialize(e,t)},addStyle:function(e){var t=this,n=t.doc,r,i;if(t!==c.DOM&&n===document){var o=c.DOM.addedStyles;if(o=o||[],o[e])return;o[e]=!0,c.DOM.addedStyles=o}i=n.getElementById("mceDefaultStyles"),i||(i=n.createElement("style"),i.id="mceDefaultStyles",i.type="text/css",r=n.getElementsByTagName("head")[0],r.firstChild?r.insertBefore(i,r.firstChild):r.appendChild(i)),i.styleSheet?i.styleSheet.cssText+=e:i.appendChild(n.createTextNode(e))},loadCSS:function(e){var t=this,n=t.doc,r;return t!==c.DOM&&n===document?(c.DOM.loadCSS(e),void 0):(e||(e=""),r=n.getElementsByTagName("head")[0],u(e.split(","),function(e){var i;t.files[e]||(t.files[e]=!0,i=t.create("link",{rel:"stylesheet",href:e}),g&&n.documentMode&&n.recalc&&(i.onload=function(){n.recalc&&n.recalc(),i.onload=null}),r.appendChild(i))}),void 0)},addClass:function(e,t){return this.run(e,function(e){var n;return t?this.hasClass(e,t)?e.className:(n=this.removeClass(e,t),e.className=n=(""!==n?n+" ":"")+t,n):0})},removeClass:function(e,t){var n=this,r;return n.run(e,function(e){var i;return n.hasClass(e,t)?(r||(r=new RegExp("(^|\\s+)"+t+"(\\s+|$)","g")),i=e.className.replace(r," "),i=p(" "!=i?i:""),e.className=i,i||(e.removeAttribute("class"),e.removeAttribute("className")),i):e.className})},hasClass:function(e,t){return e=this.get(e),e&&t?-1!==(" "+e.className+" ").indexOf(" "+t+" "):!1},toggleClass:function(e,n,r){r=r===t?!this.hasClass(e,n):r,this.hasClass(e,n)!==r&&(r?this.addClass(e,n):this.removeClass(e,n))},show:function(e){return this.setStyle(e,"display","block")},hide:function(e){return this.setStyle(e,"display","none")},isHidden:function(e){return e=this.get(e),!e||"none"==e.style.display||"none"==this.getStyle(e,"display")},uniqueId:function(e){return(e?e:"mce_")+this.counter++},setHTML:function(e,t){var n=this;return n.run(e,function(e){if(g){for(;e.firstChild;)e.removeChild(e.firstChild);try{e.innerHTML="<br />"+t,e.removeChild(e.firstChild)}catch(r){var i=n.create("div");i.innerHTML="<br />"+t,u(f(i.childNodes),function(t,n){n&&e.canHaveHTML&&e.appendChild(t)})}}else e.innerHTML=t;return t})},getOuterHTML:function(e){var t,n=this;return(e=n.get(e))?1===e.nodeType&&n.hasOuterHTML?e.outerHTML:(t=(e.ownerDocument||n.doc).createElement("body"),t.appendChild(e.cloneNode(!0)),t.innerHTML):null},setOuterHTML:function(e,t,n){var r=this;return r.run(e,function(e){function i(){var i,o;for(o=n.createElement("body"),o.innerHTML=t,i=o.lastChild;i;)r.insertAfter(i.cloneNode(!0),e),i=i.previousSibling;r.remove(e)}if(1==e.nodeType)if(n=n||e.ownerDocument||r.doc,g)try{1==e.nodeType&&r.hasOuterHTML?e.outerHTML=t:i()}catch(o){i()}else i()})},decode:a.decode,encode:a.encodeAllRaw,insertAfter:function(e,t){return t=this.get(t),this.run(e,function(e){var n,r;return n=t.parentNode,r=t.nextSibling,r?n.insertBefore(e,r):n.appendChild(e),e})},replace:function(e,t,n){var r=this;return r.run(t,function(t){return d(t,"array")&&(e=e.cloneNode(!0)),n&&u(f(t.childNodes),function(t){e.appendChild(t)}),t.parentNode.replaceChild(e,t)})},rename:function(e,t){var n=this,r;return e.nodeName!=t.toUpperCase()&&(r=n.create(t),u(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),n.replace(r,e,1)),r||e},findCommonAncestor:function(e,t){for(var n=e,r;n;){for(r=t;r&&n!=r;)r=r.parentNode;if(n==r)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},toHex:function(e){return this.styles.toHex(l.trim(e))},getClasses:function(){function e(t){u(t.imports,function(t){e(t)}),u(t.cssRules||t.rules,function(t){switch(t.type||1){case 1:t.selectorText&&u(t.selectorText.split(","),function(e){e=e.replace(/^\s*|\s*$|^\s\./g,""),!/\.mce/.test(e)&&/\.[\w\-]+$/.test(e)&&(o=e,e=e.replace(/.*\.([a-z0-9_\-]+).*/i,"$1"),(!i||(e=i(e,o)))&&(r[e]||(n.push({"class":e}),r[e]=1)))});break;case 3:e(t.styleSheet)}})}var t=this,n=[],r={},i=t.settings.class_filter,o;if(t.classes)return t.classes;try{u(t.doc.styleSheets,e)}catch(a){}return n.length>0&&(t.classes=n),n},run:function(e,t,n){var r=this,i;return"string"==typeof e&&(e=r.get(e)),e?(n=n||this,e.nodeType||!e.length&&0!==e.length?t.call(n,e):(i=[],u(e,function(e,o){e&&("string"==typeof e&&(e=r.get(e)),i.push(t.call(n,e,o)))}),i)):!1},getAttribs:function(e){var t;if(e=this.get(e),!e)return[];if(g){if(t=[],"OBJECT"==e.nodeName)return e.attributes;"OPTION"===e.nodeName&&this.getAttrib(e,"selected")&&t.push({specified:1,nodeName:"selected"});var n=/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi;return e.cloneNode(!1).outerHTML.replace(n,"").replace(/[\w:\-]+/gi,function(e){t.push({specified:1,nodeName:e})}),t}return e.attributes},isEmpty:function(e,t){var n=this,r,o,a,s,l,c=0;if(e=e.firstChild){s=new i(e,e.parentNode),t=t||n.schema?n.schema.getNonEmptyElements():null;do{if(a=e.nodeType,1===a){if(e.getAttribute("data-mce-bogus"))continue;if(l=e.nodeName.toLowerCase(),t&&t[l]){if("br"===l){c++;continue}return!1}for(o=n.getAttribs(e),r=e.attributes.length;r--;)if(l=e.attributes[r].nodeName,"name"===l||"data-mce-bookmark"===l)return!1}if(8==a)return!1;if(3===a&&!y.test(e.nodeValue))return!1}while(e=s.next())}return 1>=c},createRng:function(){var e=this.doc;return e.createRange?e.createRange():new o(this)},nodeIndex:function(e,t){var n=0,r,i,o;if(e)for(r=e.nodeType,e=e.previousSibling,i=e;e;e=e.previousSibling)o=e.nodeType,(!t||3!=o||o!=r&&e.nodeValue.length)&&(n++,r=o);return n},split:function(e,t,n){function r(e){function t(e){var t=e.previousSibling&&"SPAN"==e.previousSibling.nodeName,n=e.nextSibling&&"SPAN"==e.nextSibling.nodeName;return t&&n}var n,o=e.childNodes,a=e.nodeType;if(1!=a||"bookmark"!=e.getAttribute("data-mce-type")){for(n=o.length-1;n>=0;n--)r(o[n]);if(9!=a){if(3==a&&e.nodeValue.length>0){var s=p(e.nodeValue).length;if(!i.isBlock(e.parentNode)||s>0||0===s&&t(e))return}else if(1==a&&(o=e.childNodes,1==o.length&&o[0]&&1==o[0].nodeType&&"bookmark"==o[0].getAttribute("data-mce-type")&&e.parentNode.insertBefore(o[0],e),o.length||/^(br|hr|input|img)$/i.test(e.nodeName)))return;i.remove(e)}return e}}var i=this,o=i.createRng(),a,s,l;return e&&t?(o.setStart(e.parentNode,i.nodeIndex(e)),o.setEnd(t.parentNode,i.nodeIndex(t)),a=o.extractContents(),o=i.createRng(),o.setStart(t.parentNode,i.nodeIndex(t)+1),o.setEnd(e.parentNode,i.nodeIndex(e)+1),s=o.extractContents(),l=e.parentNode,l.insertBefore(r(a),e),n?l.replaceChild(n,t):l.insertBefore(t,e),l.insertBefore(r(s),e),i.remove(e),n||t):void 0},bind:function(e,t,n,r){return this.events.bind(e,t,n,r||this)},unbind:function(e,t,n){return this.events.unbind(e,t,n)},fire:function(e,t,n){return this.events.fire(e,t,n)},getContentEditable:function(e){var t;return 1!=e.nodeType?null:(t=e.getAttribute("data-mce-contenteditable"),t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null)},destroy:function(){var e=this;e.win=e.doc=e.root=e.events=e.frag=null},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},_findSib:function(e,t,n){var r=this,i=t;if(e)for("string"==typeof i&&(i=function(e){return r.is(e,t)}),e=e[n];e;e=e[n])if(i(e))return e;return null}},c.DOM=new c(document),c}),r(y,[v,p],function(e,t){function n(){function e(e,t){function n(){o.remove(s),a&&(a.onreadystatechange=a.onload=a=null),t()}function i(){"undefined"!=typeof console&&console.log&&console.log("Failed to load: "+e)}var o=r,a,s;s=o.uniqueId(),a=document.createElement("script"),a.id=s,a.type="text/javascript",a.src=e,"onreadystatechange"in a?a.onreadystatechange=function(){/loaded|complete/.test(a.readyState)&&n()}:a.onload=n,a.onerror=i,(document.getElementsByTagName("head")[0]||document.body).appendChild(a)}var t=0,n=1,a=2,s={},l=[],c={},u=[],d=0,f;this.isDone=function(e){return s[e]==a},this.markDone=function(e){s[e]=a},this.add=this.load=function(e,n,r){var i=s[e];i==f&&(l.push(e),s[e]=t),n&&(c[e]||(c[e]=[]),c[e].push({func:n,scope:r||this}))},this.loadQueue=function(e,t){this.loadScripts(l,e,t)},this.loadScripts=function(t,r,l){function p(e){i(c[e],function(e){e.func.call(e.scope)}),c[e]=f}var h;u.push({func:r,scope:l||this}),h=function(){var r=o(t);t.length=0,i(r,function(t){return s[t]==a?(p(t),void 0):(s[t]!=n&&(s[t]=n,d++,e(t,function(){s[t]=a,d--,p(t),h()})),void 0)}),d||(i(u,function(e){e.func.call(e.scope)}),u.length=0)},h()}}var r=e.DOM,i=t.each,o=t.grep;return n.ScriptLoader=new n,n}),r(b,[y,p],function(e,n){function r(){var e=this;e.items=[],e.urls={},e.lookup={}}var i=n.each;return r.prototype={get:function(e){return this.lookup[e]?this.lookup[e].instance:t},dependencies:function(e){var t;return this.lookup[e]&&(t=this.lookup[e].dependencies),t||[]},requireLangPack:function(t){var n=r.settings;n&&n.language&&n.language_load!==!1&&e.ScriptLoader.add(this.urls[t]+"/langs/"+n.language+".js")},add:function(e,t,n){return this.items.push(t),this.lookup[e]={instance:t,dependencies:n},t},createUrl:function(e,t){return"object"==typeof t?t:{prefix:e.prefix,resource:t,suffix:e.suffix}},addComponents:function(t,n){var r=this.urls[t];
-i(n,function(t){e.ScriptLoader.add(r+"/"+t)})},load:function(n,o,a,s){function l(){var r=c.dependencies(n);i(r,function(e){var n=c.createUrl(o,e);c.load(n.resource,n,t,t)}),a&&(s?a.call(s):a.call(e))}var c=this,u=o;c.urls[n]||("object"==typeof o&&(u=o.prefix+o.resource+o.suffix),0!==u.indexOf("/")&&-1==u.indexOf("://")&&(u=r.baseURL+"/"+u),c.urls[n]=u.substring(0,u.lastIndexOf("/")),c.lookup[n]?l():e.ScriptLoader.add(u,l,s))}},r.PluginManager=new r,r.ThemeManager=new r,r}),r(C,[],function(){function e(e,t,n){var r,i,o=n?"lastChild":"firstChild",a=n?"prev":"next";if(e[o])return e[o];if(e!==t){if(r=e[a])return r;for(i=e.parent;i&&i!==t;i=i.parent)if(r=i[a])return r}}function t(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}var n=/^[ \t\r\n]*$/,r={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};return t.prototype={replace:function(e){var t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t},attr:function(e,t){var n=this,r,i,o;if("string"!=typeof e){for(i in e)n.attr(i,e[i]);return n}if(r=n.attributes){if(t!==o){if(null===t){if(e in r.map)for(delete r.map[e],i=r.length;i--;)if(r[i].name===e)return r=r.splice(i,1),n;return n}if(e in r.map){for(i=r.length;i--;)if(r[i].name===e){r[i].value=t;break}}else r.push({name:e,value:t});return r.map[e]=t,n}return r.map[e]}},clone:function(){var e=this,n=new t(e.name,e.type),r,i,o,a,s;if(o=e.attributes){for(s=[],s.map={},r=0,i=o.length;i>r;r++)a=o[r],"id"!==a.name&&(s[s.length]={name:a.name,value:a.value},s.map[a.name]=a.value);n.attributes=s}return n.value=e.value,n.shortEnded=e.shortEnded,n},wrap:function(e){var t=this;return t.parent.insert(e,t),e.append(t),t},unwrap:function(){var e=this,t,n;for(t=e.firstChild;t;)n=t.next,e.insert(t,e,!0),t=n;e.remove()},remove:function(){var e=this,t=e.parent,n=e.next,r=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):r.next=n,t.lastChild===e?(t.lastChild=r,r&&(r.next=null)):n.prev=r,e.parent=e.next=e.prev=null),e},append:function(e){var t=this,n;return e.parent&&e.remove(),n=t.lastChild,n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e},insert:function(e,t,n){var r;return e.parent&&e.remove(),r=t.parent||this,n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,e.next=t,t.prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,e.prev=t,t.next=e),e.parent=r,e},getAll:function(t){var n=this,r,i=[];for(r=n.firstChild;r;r=e(r,n))r.name===t&&i.push(r);return i},empty:function(){var t=this,n,r,i;if(t.firstChild){for(n=[],i=t.firstChild;i;i=e(i,t))n.push(i);for(r=n.length;r--;)i=n[r],i.parent=i.firstChild=i.lastChild=i.next=i.prev=null}return t.firstChild=t.lastChild=null,t},isEmpty:function(t){var r=this,i=r.firstChild,o,a;if(i)do{if(1===i.type){if(i.attributes.map["data-mce-bogus"])continue;if(t[i.name])return!1;for(o=i.attributes.length;o--;)if(a=i.attributes[o].name,"name"===a||0===a.indexOf("data-mce-"))return!1}if(8===i.type)return!1;if(3===i.type&&!n.test(i.value))return!1}while(i=e(i,r));return!0},walk:function(t){return e(this,null,t)}},t.create=function(e,n){var i,o;if(i=new t(e,r[e]||1),n)for(o in n)i.attr(o,n[o]);return i},t}),r(x,[p],function(e){function t(e,t){return e?e.split(t||" "):[]}function n(e){function n(e,n,r){function i(e){var t={},n,r;for(n=0,r=e.length;r>n;n++)t[e[n]]={};return t}var o,l,c,u=arguments;for(r=r||[],n=n||"","string"==typeof r&&(r=t(r)),l=3;l<u.length;l++)"string"==typeof u[l]&&(u[l]=t(u[l])),r.push.apply(r,u[l]);for(e=t(e),o=e.length;o--;)c=[].concat(s,t(n)),a[e[o]]={attributes:i(c),attributesOrder:c,children:i(r)}}function i(e,n){var r,i,o,s;for(e=t(e),r=e.length,n=t(n);r--;)for(i=a[e[r]],o=0,s=n.length;s>o;o++)i.attributes[n[o]]={},i.attributesOrder.push(n[o])}var a={},s,l,c,u,d,f,p;return r[e]?r[e]:(s=t("id accesskey class dir lang style tabindex title"),l=t("onabort onblur oncancel oncanplay oncanplaythrough onchange onclick onclose oncontextmenu oncuechange ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop ondurationchange onemptied onended onerror onfocus oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup onmousewheel onpause onplay onplaying onprogress onratechange onreset onscroll onseeked onseeking onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate onvolumechange onwaiting"),c=t("address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul"),u=t("a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment"),"html4"!=e&&(s.push.apply(s,t("contenteditable contextmenu draggable dropzone hidden spellcheck translate")),c.push.apply(c,t("article aside details dialog figure header footer hgroup section nav")),u.push.apply(u,t("audio canvas command datalist mark meter output progress time wbr video ruby bdi keygen"))),"html5-strict"!=e&&(s.push("xml:lang"),p=t("acronym applet basefont big font strike tt"),u.push.apply(u,p),o(p,function(e){n(e,"",u)}),f=t("center dir isindex noframes"),c.push.apply(c,f),d=[].concat(c,u),o(f,function(e){n(e,"",d)})),d=d||[].concat(c,u),n("html","manifest","head body"),n("head","","base command link meta noscript script style title"),n("title hr noscript br"),n("base","href target"),n("link","href rel media hreflang type sizes hreflang"),n("meta","name http-equiv content charset"),n("style","media type scoped"),n("script","src async defer type charset"),n("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",d),n("address dt dd div caption","",d),n("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",u),n("blockquote","cite",d),n("ol","reversed start type","li"),n("ul","","li"),n("li","value",d),n("dl","","dt dd"),n("a","href target rel media hreflang type",u),n("q","cite",u),n("ins del","cite datetime",d),n("img","src alt usemap ismap width height"),n("iframe","src name width height",d),n("embed","src type width height"),n("object","data type typemustmatch name usemap form width height",d,"param"),n("param","name value"),n("map","name",d,"area"),n("area","alt coords shape href target rel media hreflang type"),n("table","border","caption colgroup thead tfoot tbody tr"+("html4"==e?" col":"")),n("colgroup","span","col"),n("col","span"),n("tbody thead tfoot","","tr"),n("tr","","td th"),n("td","colspan rowspan headers",d),n("th","colspan rowspan headers scope abbr",d),n("form","accept-charset action autocomplete enctype method name novalidate target",d),n("fieldset","disabled form name",d,"legend"),n("label","form for",u),n("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),n("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"==e?d:u),n("select","disabled form multiple name required size","option optgroup"),n("optgroup","disabled label","option"),n("option","disabled label selected value"),n("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),n("menu","type label",d,"li"),n("noscript","",d),"html4"!=e&&(n("wbr"),n("ruby","",u,"rt rp"),n("figcaption","",d),n("mark rt rp summary bdi","",u),n("canvas","width height",d),n("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height",d,"track source"),n("audio","src crossorigin preload autoplay mediagroup loop muted controls",d,"track source"),n("source","src type media"),n("track","kind src srclang label default"),n("datalist","",u,"option"),n("article section nav aside header footer","",d),n("hgroup","","h1 h2 h3 h4 h5 h6"),n("figure","",d,"figcaption"),n("time","datetime",u),n("dialog","open",d),n("command","type label icon disabled checked radiogroup command"),n("output","for form name",u),n("progress","value max",u),n("meter","value min max low high optimum",u),n("details","open",d,"summary"),n("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!=e&&(i("script","language xml:space"),i("style","xml:space"),i("object","declare classid codebase codetype archive standby align border hspace vspace"),i("param","valuetype type"),i("a","charset name rev shape coords"),i("br","clear"),i("applet","codebase archive code object alt name width height align hspace vspace"),i("img","name longdesc align border hspace vspace"),i("iframe","longdesc frameborder marginwidth marginheight scrolling align"),i("font basefont","size color face"),i("input","usemap align"),i("select","onchange"),i("textarea"),i("h1 h2 h3 h4 h5 h6 div p legend caption","align"),i("ul","type compact"),i("li","type"),i("ol dl menu dir","compact"),i("pre","width xml:space"),i("hr","align noshade size width"),i("isindex","prompt"),i("table","summary width frame rules cellspacing cellpadding align bgcolor"),i("col","width align char charoff valign"),i("colgroup","width align char charoff valign"),i("thead","align char charoff valign"),i("tr","align char charoff valign bgcolor"),i("th","axis align char charoff valign nowrap bgcolor width height"),i("form","accept"),i("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),i("tfoot","align char charoff valign"),i("tbody","align char charoff valign"),i("area","nohref"),i("body","background bgcolor text link vlink alink")),"html4"!=e&&(i("input button select textarea","autofocus"),i("input textarea","placeholder"),i("a","download"),i("link script img","crossorigin"),i("iframe","srcdoc sandbox seamless allowfullscreen")),o(t("a form meter progress dfn"),function(e){a[e]&&delete a[e].children[e]}),delete a.caption.children.table,r[e]=a,a)}var r={},i=e.makeMap,o=e.each,a=e.extend,s=e.explode,l=e.inArray;return function(e){function c(t,n,o){var s=e[t];return s?s=i(s,",",i(s.toUpperCase()," ")):(s=r[t],s||(s=i(n," ",i(n.toUpperCase()," ")),s=a(s,o),r[t]=s)),s}function u(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")}function d(e){var n,r,o,a,s,c,d,f,p,h,m,g,y,C,x,w,_,N,E,S=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)\])?$/,k=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,T=/[*?+]/;if(e)for(e=t(e,","),v["@"]&&(w=v["@"].attributes,_=v["@"].attributesOrder),n=0,r=e.length;r>n;n++)if(s=S.exec(e[n])){if(C=s[1],p=s[2],x=s[3],f=s[5],g={},y=[],c={attributes:g,attributesOrder:y},"#"===C&&(c.paddEmpty=!0),"-"===C&&(c.removeEmpty=!0),"!"===s[4]&&(c.removeEmptyAttrs=!0),w){for(N in w)g[N]=w[N];y.push.apply(y,_)}if(f)for(f=t(f,"|"),o=0,a=f.length;a>o;o++)if(s=k.exec(f[o])){if(d={},m=s[1],h=s[2].replace(/::/g,":"),C=s[3],E=s[4],"!"===m&&(c.attributesRequired=c.attributesRequired||[],c.attributesRequired.push(h),d.required=!0),"-"===m){delete g[h],y.splice(l(y,h),1);continue}C&&("="===C&&(c.attributesDefault=c.attributesDefault||[],c.attributesDefault.push({name:h,value:E}),d.defaultValue=E),":"===C&&(c.attributesForced=c.attributesForced||[],c.attributesForced.push({name:h,value:E}),d.forcedValue=E),"<"===C&&(d.validValues=i(E,"?"))),T.test(h)?(c.attributePatterns=c.attributePatterns||[],d.pattern=u(h),c.attributePatterns.push(d)):(g[h]||y.push(h),g[h]=d)}w||"@"!=p||(w=g,_=y),x&&(c.outputName=p,v[x]=c),T.test(p)?(c.pattern=u(p),b.push(c)):v[p]=c}}function f(e){v={},b=[],d(e),o(x,function(e,t){y[t]=e.children})}function p(e){var n=/^(~)?(.+)$/;e&&o(t(e,","),function(e){var t=n.exec(e),r="~"===t[1],i=r?"span":"div",a=t[2];y[a]=y[i],R[a]=i,r||(S[a.toUpperCase()]={},S[a]={}),v[a]||(v[a]=v[i]),o(y,function(e){e[i]&&(e[a]=e[i])})})}function h(e){var n=/^([+\-]?)(\w+)\[([^\]]+)\]$/;e&&o(t(e,","),function(e){var r=n.exec(e),i,a;r&&(a=r[1],i=a?y[r[2]]:y[r[2]]={"#comment":{}},i=y[r[2]],o(t(r[3],"|"),function(e){"-"===a?delete i[e]:i[e]={}}))})}function m(e){var t=v[e],n;if(t)return t;for(n=b.length;n--;)if(t=b[n],t.pattern.test(e))return t}var g=this,v={},y={},b=[],C,x,w,_,N,E,S,k,T,R={},A={};e=e||{},x=n(e.schema),e.verify_html===!1&&(e.valid_elements="*[*]"),e.valid_styles&&(C={},o(e.valid_styles,function(e,t){C[t]=s(e)})),w=c("whitespace_elements","pre script noscript style textarea video audio iframe object"),_=c("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),N=c("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),E=c("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),k=c("non_empty_elements","td th iframe video audio object",N),T=c("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside nav figure"),S=c("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex samp option datalist select optgroup",T),o((e.special||"script noscript style textarea").split(" "),function(e){A[e]=new RegExp("</"+e+"[^>]*>","gi")}),e.valid_elements?f(e.valid_elements):(o(x,function(e,t){v[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},y[t]=e.children}),"html5"!=e.schema&&o(t("strong/b em/i"),function(e){e=t(e,"/"),v[e[1]].outputName=e[0]}),v.img.attributesDefault=[{name:"alt",value:""}],o(t("ol ul sub sup blockquote span font a table tbody tr strong em b i"),function(e){v[e]&&(v[e].removeEmpty=!0)}),o(t("p h1 h2 h3 h4 h5 h6 th td pre div address caption"),function(e){v[e].paddEmpty=!0}),o(t("span"),function(e){v[e].removeEmptyAttrs=!0})),p(e.custom_elements),h(e.valid_children),d(e.extended_valid_elements),h("+ol[ul|ol],+ul[ul|ol]"),e.invalid_elements&&o(s(e.invalid_elements),function(e){v[e]&&delete v[e]}),m("span")||d("span[!data-mce-type|*]"),g.children=y,g.styles=C,g.getBoolAttrs=function(){return E},g.getBlockElements=function(){return S},g.getTextBlockElements=function(){return T},g.getShortEndedElements=function(){return N},g.getSelfClosingElements=function(){return _},g.getNonEmptyElements=function(){return k},g.getWhiteSpaceElements=function(){return w},g.getSpecialElements=function(){return A},g.isValidChild=function(e,t){var n=y[e];return!(!n||!n[t])},g.isValid=function(e,t){var n,r,i=m(e);if(i){if(!t)return!0;if(i.attributes[t])return!0;if(n=i.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},g.getElementRule=m,g.getCustomElements=function(){return R},g.addValidElements=d,g.setValidElements=f,g.addCustomElements=p,g.addValidChildren=h,g.elements=v}}),r(w,[x,m,p],function(e,t,n){var r=n.each;return function(n,i){var o=this,a=function(){};n=n||{},o.schema=i=i||new e,n.fix_self_closing!==!1&&(n.fix_self_closing=!0),r("comment cdata text start end pi doctype".split(" "),function(e){e&&(o[e]=n[e]||a)}),o.parse=function(e){function r(e){var t,n;for(t=d.length;t--&&d[t].name!==e;);if(t>=0){for(n=d.length-1;n>=t;n--)e=d[n],e.valid&&a.end(e.name);d.length=t}}function o(e,t,n,r,i){var o,a;if(t=t.toLowerCase(),n=t in b?t:I(n||r||i||""),x&&!g&&0!==t.indexOf("data-")){if(o=S[t],!o&&k){for(a=k.length;a--&&(o=k[a],!o.pattern.test(t)););-1===a&&(o=null)}if(!o)return;if(o.validValues&&!(n in o.validValues))return}f.map[t]=n,f.push({name:t,value:n})}var a=this,s,l=0,c,u,d=[],f,p,h,m,g,v,y,b,C,x,w,_,N,E,S,k,T,R,A,B,L,M,D,H,P,O=0,I=t.decode,F;for(M=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([A-Za-z0-9\\-\\:\\.]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g"),D=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,y=i.getShortEndedElements(),L=n.self_closing_elements||i.getSelfClosingElements(),b=i.getBoolAttrs(),x=n.validate,v=n.remove_internals,F=n.fix_self_closing,H=i.getSpecialElements();s=M.exec(e);){if(l<s.index&&a.text(I(e.substr(l,s.index-l))),c=s[6])c=c.toLowerCase(),":"===c.charAt(0)&&(c=c.substr(1)),r(c);else if(c=s[7]){if(c=c.toLowerCase(),":"===c.charAt(0)&&(c=c.substr(1)),C=c in y,F&&L[c]&&d.length>0&&d[d.length-1].name===c&&r(c),!x||(w=i.getElementRule(c))){if(_=!0,x&&(S=w.attributes,k=w.attributePatterns),(E=s[8])?(g=-1!==E.indexOf("data-mce-type"),g&&v&&(_=!1),f=[],f.map={},E.replace(D,o)):(f=[],f.map={}),x&&!g){if(T=w.attributesRequired,R=w.attributesDefault,A=w.attributesForced,B=w.removeEmptyAttrs,B&&!f.length&&(_=!1),A)for(p=A.length;p--;)N=A[p],m=N.name,P=N.value,"{$uid}"===P&&(P="mce_"+O++),f.map[m]=P,f.push({name:m,value:P});if(R)for(p=R.length;p--;)N=R[p],m=N.name,m in f.map||(P=N.value,"{$uid}"===P&&(P="mce_"+O++),f.map[m]=P,f.push({name:m,value:P}));if(T){for(p=T.length;p--&&!(T[p]in f.map););-1===p&&(_=!1)}f.map["data-mce-bogus"]&&(_=!1)}_&&a.start(c,f,C)}else _=!1;if(u=H[c]){u.lastIndex=l=s.index+s[0].length,(s=u.exec(e))?(_&&(h=e.substr(l,s.index-l)),l=s.index+s[0].length):(h=e.substr(l),l=e.length),_&&(h.length>0&&a.text(h,!0),a.end(c)),M.lastIndex=l;continue}C||(E&&E.indexOf("/")==E.length-1?_&&a.end(c):d.push({name:c,valid:_}))}else(c=s[1])?a.comment(c):(c=s[2])?a.cdata(c):(c=s[3])?a.doctype(c):(c=s[4])&&a.pi(c,s[5]);l=s.index+s[0].length}for(l<e.length&&a.text(I(e.substr(l))),p=d.length-1;p>=0;p--)c=d[p],c.valid&&a.end(c.name)}}}),r(_,[C,x,w,p],function(e,t,n,r){var i=r.makeMap,o=r.each,a=r.explode,s=r.extend;return function(r,l){function c(t){var n,r,o,a,s,c,d,f,p,h,m,g,v,y;for(m=i("tr,td,th,tbody,thead,tfoot,table"),h=l.getNonEmptyElements(),g=l.getTextBlockElements(),n=0;n<t.length;n++)if(r=t[n],r.parent&&!r.fixed)if(g[r.name]&&"li"==r.parent.name){for(v=r.next;v&&g[v.name];)v.name="li",v.fixed=!0,r.parent.insert(v,r.parent),v=v.next;r.unwrap(r)}else{for(a=[r],o=r.parent;o&&!l.isValidChild(o.name,r.name)&&!m[o.name];o=o.parent)a.push(o);if(o&&a.length>1){for(a.reverse(),s=c=u.filterNode(a[0].clone()),p=0;p<a.length-1;p++){for(l.isValidChild(c.name,a[p].name)?(d=u.filterNode(a[p].clone()),c.append(d)):d=c,f=a[p].firstChild;f&&f!=a[p+1];)y=f.next,d.append(f),f=y;c=d}s.isEmpty(h)?o.insert(r,a[0],!0):(o.insert(s,a[0],!0),o.insert(r,s)),o=a[0],(o.isEmpty(h)||o.firstChild===o.lastChild&&"br"===o.firstChild.name)&&o.empty().remove()}else if(r.parent){if("li"===r.name){if(v=r.prev,v&&("ul"===v.name||"ul"===v.name)){v.append(r);continue}if(v=r.next,v&&("ul"===v.name||"ul"===v.name)){v.insert(r,v.firstChild,!0);continue}r.wrap(u.filterNode(new e("ul",1)));continue}l.isValidChild(r.parent.name,"div")&&l.isValidChild("div",r.name)?r.wrap(u.filterNode(new e("div",1))):"style"===r.name||"script"===r.name?r.empty().remove():r.unwrap()}}}var u=this,d={},f=[],p={},h={};r=r||{},r.validate="validate"in r?r.validate:!0,r.root_name=r.root_name||"body",u.schema=l=l||new t,u.filterNode=function(e){var t,n,r;n in d&&(r=p[n],r?r.push(e):p[n]=[e]),t=f.length;for(;t--;)n=f[t].name,n in e.attributes.map&&(r=h[n],r?r.push(e):h[n]=[e]);return e},u.addNodeFilter=function(e,t){o(a(e),function(e){var n=d[e];n||(d[e]=n=[]),n.push(t)})},u.addAttributeFilter=function(e,t){o(a(e),function(e){var n;for(n=0;n<f.length;n++)if(f[n].name===e)return f[n].callbacks.push(t),void 0;f.push({name:e,callbacks:[t]})})},u.parse=function(t,o){function a(){function e(e){e&&(t=e.firstChild,t&&3==t.type&&(t.value=t.value.replace(R,"")),t=e.lastChild,t&&3==t.type&&(t.value=t.value.replace(L,"")))}var t=y.firstChild,n,r;if(l.isValidChild(y.name,I.toLowerCase())){for(;t;)n=t.next,3==t.type||1==t.type&&"p"!==t.name&&!T[t.name]&&!t.attr("data-mce-type")?r?r.append(t):(r=u(I,1),y.insert(r,t),r.append(t)):(e(r),r=null),t=n;e(r)}}function u(t,n){var r=new e(t,n),i;return t in d&&(i=p[t],i?i.push(r):p[t]=[r]),r}function m(e){var t,n,r;for(t=e.prev;t&&3===t.type;)n=t.value.replace(L,""),n.length>0?(t.value=n,t=t.prev):(r=t.prev,t.remove(),t=r)}function g(e){var t,n={};for(t in e)"li"!==t&&"p"!=t&&(n[t]=e[t]);return n}var v,y,b,C,x,w,_,N,E,S,k,T,R,A=[],B,L,M,D,H,P,O,I;if(o=o||{},p={},h={},T=s(i("script,style,head,html,body,title,meta,param"),l.getBlockElements()),O=l.getNonEmptyElements(),P=l.children,k=r.validate,I="forced_root_block"in o?o.forced_root_block:r.forced_root_block,H=l.getWhiteSpaceElements(),R=/^[ \t\r\n]+/,L=/[ \t\r\n]+$/,M=/[ \t\r\n]+/g,D=/^[ \t\r\n]+$/,v=new n({validate:k,self_closing_elements:g(l.getSelfClosingElements()),cdata:function(e){b.append(u("#cdata",4)).value=e},text:function(e,t){var n;B||(e=e.replace(M," "),b.lastChild&&T[b.lastChild.name]&&(e=e.replace(R,""))),0!==e.length&&(n=u("#text",3),n.raw=!!t,b.append(n).value=e)},comment:function(e){b.append(u("#comment",8)).value=e},pi:function(e,t){b.append(u(e,7)).value=t,m(b)},doctype:function(e){var t;t=b.append(u("#doctype",10)),t.value=e,m(b)},start:function(e,t,n){var r,i,o,a,s;if(o=k?l.getElementRule(e):{}){for(r=u(o.outputName||e,1),r.attributes=t,r.shortEnded=n,b.append(r),s=P[b.name],s&&P[r.name]&&!s[r.name]&&A.push(r),i=f.length;i--;)a=f[i].name,a in t.map&&(E=h[a],E?E.push(r):h[a]=[r]);T[e]&&m(r),n||(b=r),!B&&H[e]&&(B=!0)}},end:function(t){var n,r,i,o,a;if(r=k?l.getElementRule(t):{}){if(T[t]&&!B){if(n=b.firstChild,n&&3===n.type)if(i=n.value.replace(R,""),i.length>0)n.value=i,n=n.next;else for(o=n.next,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.next,(0===i.length||D.test(i))&&(n.remove(),n=o),n=o;if(n=b.lastChild,n&&3===n.type)if(i=n.value.replace(L,""),i.length>0)n.value=i,n=n.prev;else for(o=n.prev,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.prev,(0===i.length||D.test(i))&&(n.remove(),n=o),n=o}if(B&&H[t]&&(B=!1),(r.removeEmpty||r.paddEmpty)&&b.isEmpty(O))if(r.paddEmpty)b.empty().append(new e("#text","3")).value="\xa0";else if(!b.attributes.map.name&&!b.attributes.map.id)return a=b.parent,b.empty().remove(),b=a,void 0;b=b.parent}}},l),y=b=new e(o.context||r.root_name,11),v.parse(t),k&&A.length&&(o.context?o.invalid=!0:c(A)),I&&("body"==y.name||o.isRootContent)&&a(),!o.invalid){for(S in p){for(E=d[S],C=p[S],_=C.length;_--;)C[_].parent||C.splice(_,1);for(x=0,w=E.length;w>x;x++)E[x](C,S,o)}for(x=0,w=f.length;w>x;x++)if(E=f[x],E.name in h){for(C=h[E.name],_=C.length;_--;)C[_].parent||C.splice(_,1);for(_=0,N=E.callbacks.length;N>_;_++)E.callbacks[_](C,E.name,o)}}return y},r.remove_trailing_brs&&u.addNodeFilter("br",function(t){var n,r=t.length,i,o=s({},l.getBlockElements()),a=l.getNonEmptyElements(),c,u,d,f,p,h;for(o.body=1,n=0;r>n;n++)if(i=t[n],c=i.parent,o[i.parent.name]&&i===c.lastChild){for(d=i.prev;d;){if(f=d.name,"span"!==f||"bookmark"!==d.attr("data-mce-type")){if("br"!==f)break;if("br"===f){i=null;break}}d=d.prev}i&&(i.remove(),c.isEmpty(a)&&(p=l.getElementRule(c.name),p&&(p.removeEmpty?c.remove():p.paddEmpty&&(c.empty().append(new e("#text",3)).value="\xa0"))))}else{for(u=i;c&&c.firstChild===u&&c.lastChild===u&&(u=c,!o[c.name]);)c=c.parent;u===c&&(h=new e("#text",3),h.value="\xa0",i.replace(h))}}),r.allow_html_in_named_anchor||u.addAttributeFilter("id,name",function(e){for(var t=e.length,n,r,i,o;t--;)if(o=e[t],"a"===o.name&&o.firstChild&&!o.attr("href")){i=o.parent,n=o.lastChild;do r=n.prev,i.insert(n,o),n=r;while(n)}})}}),r(N,[m,p],function(e,t){var n=t.makeMap;return function(t){var r=[],i,o,a,s,l;return t=t||{},i=t.indent,o=n(t.indent_before||""),a=n(t.indent_after||""),s=e.getEncodeFunc(t.entity_encoding||"raw",t.entities),l="html"==t.element_format,{start:function(e,t,n){var c,u,d,f;if(i&&o[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n")),r.push("<",e),t)for(c=0,u=t.length;u>c;c++)d=t[c],r.push(" ",d.name,'="',s(d.value,!0),'"');r[r.length]=!n||l?">":" />",n&&i&&a[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n"))},end:function(e){var t;r.push("</",e,">"),i&&a[e]&&r.length>0&&(t=r[r.length-1],t.length>0&&"\n"!==t&&r.push("\n"))},text:function(e,t){e.length>0&&(r[r.length]=t?e:s(e))},cdata:function(e){r.push("<![CDATA[",e,"]]>")},comment:function(e){r.push("<!--",e,"-->")},pi:function(e,t){t?r.push("<?",e," ",t,"?>"):r.push("<?",e,"?>"),i&&r.push("\n")},doctype:function(e){r.push("<!DOCTYPE",e,">",i?"\n":"")},reset:function(){r.length=0},getContent:function(){return r.join("").replace(/\n$/,"")}}}}),r(E,[N,x],function(e,t){return function(n,r){var i=this,o=new e(n);n=n||{},n.validate="validate"in n?n.validate:!0,i.schema=r=r||new t,i.writer=o,i.serialize=function(e){function t(e){var n=i[e.type],s,l,c,u,d,f,p,h,m;if(n)n(e);else{if(s=e.name,l=e.shortEnded,c=e.attributes,a&&c&&c.length>1){for(f=[],f.map={},m=r.getElementRule(e.name),p=0,h=m.attributesOrder.length;h>p;p++)u=m.attributesOrder[p],u in c.map&&(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));for(p=0,h=c.length;h>p;p++)u=c[p].name,u in f.map||(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));c=f}if(o.start(e.name,c,l),!l){if(e=e.firstChild)do t(e);while(e=e.next);o.end(s)}}}var i,a;return a=n.validate,i={3:function(e){o.text(e.value,e.raw)},8:function(e){o.comment(e.value)},7:function(e){o.pi(e.name,e.value)},10:function(e){o.doctype(e.value)},4:function(e){o.cdata(e.value)},11:function(e){if(e=e.firstChild)do t(e);while(e=e.next)}},o.reset(),1!=e.type||n.inner?i[11](e):t(e),o.getContent()}}}),r(S,[v,_,m,E,C,x,g,p],function(e,t,n,r,i,o,a,s){var l=s.each,c=s.trim,u=e.DOM;return function(e,i){var s,d,f;return i&&(s=i.dom,d=i.schema),s=s||u,d=d||new o(e),e.entity_encoding=e.entity_encoding||"named",e.remove_trailing_brs="remove_trailing_brs"in e?e.remove_trailing_brs:!0,f=new t(e,d),f.addAttributeFilter("src,href,style",function(t,n){for(var r=t.length,i,o,a="data-mce-"+n,l=e.url_converter,c=e.url_converter_scope,u;r--;)i=t[r],o=i.attributes.map[a],o!==u?(i.attr(n,o.length>0?o:null),i.attr(a,null)):(o=i.attributes.map[n],"style"===n?o=s.serializeStyle(s.parseStyle(o),i.name):l&&(o=l.call(c,o,n,i.name)),i.attr(n,o.length>0?o:null))}),f.addAttributeFilter("class",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",r.length>0?r:null)}),f.addAttributeFilter("data-mce-type",function(e,t,n){for(var r=e.length,i;r--;)i=e[r],"bookmark"!==i.attributes.map["data-mce-type"]||n.cleanup||i.remove()}),f.addAttributeFilter("data-mce-expando",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),f.addNodeFilter("noscript",function(e){for(var t=e.length,r;t--;)r=e[t].firstChild,r&&(r.value=n.decode(r.value))}),f.addNodeFilter("script,style",function(e,t){function n(e){return e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")}for(var r=e.length,i,o;r--;)i=e[r],o=i.firstChild?i.firstChild.value:"","script"===t?(i.attr("type",(i.attr("type")||"text/javascript").replace(/^mce\-/,"")),o.length>0&&(i.firstChild.value="// <![CDATA[\n"+n(o)+"\n// ]]>")):o.length>0&&(i.firstChild.value="<!--\n"+n(o)+"\n-->")}),f.addNodeFilter("#comment",function(e){for(var t=e.length,n;t--;)n=e[t],0===n.value.indexOf("[CDATA[")?(n.name="#cdata",n.type=4,n.value=n.value.replace(/^\[CDATA\[|\]\]$/g,"")):0===n.value.indexOf("mce:protected ")&&(n.name="#text",n.type=3,n.raw=!0,n.value=unescape(n.value).substr(14))}),f.addNodeFilter("xml:namespace,input",function(e,t){for(var n=e.length,r;n--;)r=e[n],7===r.type?r.remove():1===r.type&&("input"!==t||"type"in r.attributes.map||r.attr("type","text"))}),e.fix_list_elements&&f.addNodeFilter("ul,ol",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.parent,("ul"===r.name||"ol"===r.name)&&n.prev&&"li"===n.prev.name&&n.prev.append(n)}),f.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),{schema:d,addNodeFilter:f.addNodeFilter,addAttributeFilter:f.addAttributeFilter,serialize:function(t,n){var i=this,o,u,p,h,m;return a.ie&&s.select("script,style,select,map").length>0?(m=t.innerHTML,t=t.cloneNode(!1),s.setHTML(t,m)):t=t.cloneNode(!0),o=t.ownerDocument.implementation,o.createHTMLDocument&&(u=o.createHTMLDocument(""),l("BODY"==t.nodeName?t.childNodes:[t],function(e){u.body.appendChild(u.importNode(e,!0))}),t="BODY"!=t.nodeName?u.body.firstChild:u.body,p=s.doc,s.doc=u),n=n||{},n.format=n.format||"html",n.selection&&(n.forced_root_block=""),n.no_events||(n.node=t,i.onPreProcess(n)),h=new r(e,d),n.content=h.serialize(f.parse(c(n.getInner?t.innerHTML:s.getOuterHTML(t)),n)),n.cleanup||(n.content=n.content.replace(/\uFEFF/g,"")),n.no_events||i.onPostProcess(n),p&&(s.doc=p),n.node=null,n.content},addRules:function(e){d.addValidElements(e)},setRules:function(e){d.setValidElements(e)},onPreProcess:function(e){i&&i.fire("PreProcess",e)},onPostProcess:function(e){i&&i.fire("PostProcess",e)}}}}),r(k,[],function(){function e(e){function t(t,n){var r,i=0,o,a,s,l,c,u,d=-1,f;if(r=t.duplicate(),r.collapse(n),f=r.parentElement(),f.ownerDocument===e.dom.doc){for(;"false"===f.contentEditable;)f=f.parentNode;if(!f.hasChildNodes())return{node:f,inside:1};for(s=f.children,o=s.length-1;o>=i;)if(u=Math.floor((i+o)/2),l=s[u],r.moveToElementText(l),d=r.compareEndPoints(n?"StartToStart":"EndToEnd",t),d>0)o=u-1;else{if(!(0>d))return{node:l};i=u+1}if(0>d)for(l?r.collapse(!1):(r.moveToElementText(f),r.collapse(!0),l=f,a=!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",1)&&f==r.parentElement();)c++;else for(r.collapse(!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",-1)&&f==r.parentElement();)c++;return{node:l,position:d,offset:c,inside:a}}}function n(){function n(e){var n=t(o,e),r,i,s=0,l,c,u;if(r=n.node,i=n.offset,n.inside&&!r.hasChildNodes())return a[e?"setStart":"setEnd"](r,0),void 0;if(i===c)return a[e?"setStartBefore":"setEndAfter"](r),void 0;if(n.position<0){if(l=n.inside?r.firstChild:r.nextSibling,!l)return a[e?"setStartAfter":"setEndAfter"](r),void 0;if(!i)return 3==l.nodeType?a[e?"setStart":"setEnd"](l,0):a[e?"setStartBefore":"setEndBefore"](l),void 0;for(;l;){if(u=l.nodeValue,s+=u.length,s>=i){r=l,s-=i,s=u.length-s;break}l=l.nextSibling}}else{if(l=r.previousSibling,!l)return a[e?"setStartBefore":"setEndBefore"](r);if(!i)return 3==r.nodeType?a[e?"setStart":"setEnd"](l,r.nodeValue.length):a[e?"setStartAfter":"setEndAfter"](l),void 0;for(;l;){if(s+=l.nodeValue.length,s>=i){r=l,s-=i;break}l=l.previousSibling}}a[e?"setStart":"setEnd"](r,s)}var o=e.getRng(),a=i.createRng(),s,l,c,u,d;if(s=o.item?o.item(0):o.parentElement(),s.ownerDocument!=i.doc)return a;if(l=e.isCollapsed(),o.item)return a.setStart(s.parentNode,i.nodeIndex(s)),a.setEnd(a.startContainer,a.startOffset+1),a;try{n(!0),l||n()}catch(f){if(-2147024809!=f.number)throw f;d=r.getBookmark(2),c=o.duplicate(),c.collapse(!0),s=c.parentElement(),l||(c=o.duplicate(),c.collapse(!1),u=c.parentElement(),u.innerHTML=u.innerHTML),s.innerHTML=s.innerHTML,r.moveToBookmark(d),o=e.getRng(),n(!0),l||n()}return a}var r=this,i=e.dom,o=!1;this.getBookmark=function(n){function r(e){var t,n,r,o,a=[];for(t=e.parentNode,n=i.getRoot().parentNode;t!=n&&9!==t.nodeType;){for(r=t.children,o=r.length;o--;)if(e===r[o]){a.push(o);break}e=t,t=t.parentNode}return a}function o(e){var n;return n=t(a,e),n?{position:n.position,offset:n.offset,indexes:r(n.node),inside:n.inside}:void 0}var a=e.getRng(),s={};return 2===n&&(a.item?s.start={ctrl:!0,indexes:r(a.item(0))}:(s.start=o(!0),e.isCollapsed()||(s.end=o()))),s},this.moveToBookmark=function(e){function t(e){var t,n,r,o;for(t=i.getRoot(),n=e.length-1;n>=0;n--)o=t.children,r=e[n],r<=o.length-1&&(t=o[r]);return t}function n(n){var i=e[n?"start":"end"],a,s,l,c;i&&(a=i.position>0,s=o.createTextRange(),s.moveToElementText(t(i.indexes)),c=i.offset,c!==l?(s.collapse(i.inside||a),s.moveStart("character",a?-c:c)):s.collapse(n),r.setEndPoint(n?"StartToStart":"EndToStart",s),n&&r.collapse(!0))
-}var r,o=i.doc.body;e.start&&(e.start.ctrl?(r=o.createControlRange(),r.addElement(t(e.start.indexes)),r.select()):(r=o.createTextRange(),n(!0),n(),r.select()))},this.addRange=function(t){function n(e){var t,n,a,d,h;a=i.create("a"),t=e?s:c,n=e?l:u,d=r.duplicate(),(t==f||t==f.documentElement)&&(t=p,n=0),3==t.nodeType?(t.parentNode.insertBefore(a,t),d.moveToElementText(a),d.moveStart("character",n),i.remove(a),r.setEndPoint(e?"StartToStart":"EndToEnd",d)):(h=t.childNodes,h.length?(n>=h.length?i.insertAfter(a,h[h.length-1]):t.insertBefore(a,h[n]),d.moveToElementText(a)):t.canHaveHTML&&(t.innerHTML="<span>&#xFEFF;</span>",a=t.firstChild,d.moveToElementText(a),d.collapse(o)),r.setEndPoint(e?"StartToStart":"EndToEnd",d),i.remove(a))}var r,a,s,l,c,u,d,f=e.dom.doc,p=f.body,h,m;if(s=t.startContainer,l=t.startOffset,c=t.endContainer,u=t.endOffset,r=p.createTextRange(),s==c&&1==s.nodeType){if(l==u&&!s.hasChildNodes()){if(s.canHaveHTML)return d=s.previousSibling,d&&!d.hasChildNodes()&&i.isBlock(d)?d.innerHTML="&#xFEFF;":d=null,s.innerHTML="<span>&#xFEFF;</span><span>&#xFEFF;</span>",r.moveToElementText(s.lastChild),r.select(),i.doc.selection.clear(),s.innerHTML="",d&&(d.innerHTML=""),void 0;l=i.nodeIndex(s),s=s.parentNode}if(l==u-1)try{if(m=s.childNodes[l],a=p.createControlRange(),a.addElement(m),a.select(),h=e.getRng(),h.item&&m===h.item(0))return}catch(g){}}n(!0),n(),r.select()},this.getRangeAt=n}return e}),r(T,[g],function(e){return{BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey},metaKeyPressed:function(t){return(e.mac?t.ctrlKey||t.metaKey:t.ctrlKey)&&!t.altKey}}}),r(R,[T,p,g],function(e,t,n){return function(r,i){function o(e){return i.settings.object_resizing===!1?!1:/TABLE|IMG|DIV/.test(e.nodeName)?"false"===e.getAttribute("data-mce-resize")?!1:!0:!1}function a(t){var n,r;n=t.screenX-E,r=t.screenY-S,M=n*N[2]+R,D=r*N[3]+A,M=5>M?5:M,D=5>D?5:D,(e.modifierPressed(t)||"IMG"==x.nodeName&&0!==N[2]*N[3])&&(M=Math.round(D/B),D=Math.round(M*B)),b.setStyles(w,{width:M,height:D}),N[2]<0&&w.clientWidth<=M&&b.setStyle(w,"left",k+(R-M)),N[3]<0&&w.clientHeight<=D&&b.setStyle(w,"top",T+(A-D)),L||(i.fire("ObjectResizeStart",{target:x,width:R,height:A}),L=!0)}function s(){function e(e,t){t&&(x.style[e]||!i.schema.isValid(x.nodeName.toLowerCase(),e)?b.setStyle(x,e,t):b.setAttrib(x,e,t))}L=!1,e("width",M),e("height",D),b.unbind(H,"mousemove",a),b.unbind(H,"mouseup",s),P!=H&&(b.unbind(P,"mousemove",a),b.unbind(P,"mouseup",s)),b.remove(w),O&&"TABLE"!=x.nodeName||l(x),i.fire("ObjectResized",{target:x,width:M,height:D}),i.nodeChanged()}function l(e,t,n){var r,l,u,d,f;r=b.getPos(e,i.getBody()),k=r.x,T=r.y,f=e.getBoundingClientRect(),l=f.width||f.right-f.left,u=f.height||f.bottom-f.top,x!=e&&(m(),x=e,M=D=0),d=i.fire("ObjectSelected",{target:e}),o(e)&&!d.isDefaultPrevented()?C(_,function(e,r){function o(t){L=!0,E=t.screenX,S=t.screenY,R=x.clientWidth,A=x.clientHeight,B=A/R,N=e,w=x.cloneNode(!0),b.addClass(w,"mce-clonedresizable"),w.contentEditable=!1,w.unSelectabe=!0,b.setStyles(w,{left:k,top:T,margin:0}),w.removeAttribute("data-mce-selected"),i.getBody().appendChild(w),b.bind(H,"mousemove",a),b.bind(H,"mouseup",s),P!=H&&(b.bind(P,"mousemove",a),b.bind(P,"mouseup",s))}var c,d;return t?(r==t&&o(n),void 0):(c=b.get("mceResizeHandle"+r),c?b.show(c):(d=i.getBody(),c=b.add(d,"div",{id:"mceResizeHandle"+r,"data-mce-bogus":!0,"class":"mce-resizehandle",contentEditable:!1,unSelectabe:!0,style:"cursor:"+r+"-resize; margin:0; padding:0"}),b.bind(c,"mousedown",function(e){e.preventDefault(),o(e)})),b.setStyles(c,{left:l*e[0]+k-c.offsetWidth/2,top:u*e[1]+T-c.offsetHeight/2}),void 0)}):c(),x.setAttribute("data-mce-selected","1")}function c(){var e,t;x&&x.removeAttribute("data-mce-selected");for(e in _)t=b.get("mceResizeHandle"+e),t&&(b.unbind(t),b.remove(t))}function u(e){function t(e,t){do if(e===t)return!0;while(e=e.parentNode)}var n;return C(b.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute("data-mce-selected")}),n="mousedown"==e.type?e.target:r.getNode(),n=b.getParent(n,O?"table":"table,img,hr"),n&&(g(),t(r.getStart(),n)&&t(r.getEnd(),n)&&(!O||n!=r.getStart()&&"IMG"!==r.getStart().nodeName))?(l(n),void 0):(c(),void 0)}function d(e,t,n){e&&e.attachEvent&&e.attachEvent("on"+t,n)}function f(e,t,n){e&&e.detachEvent&&e.detachEvent("on"+t,n)}function p(e){var t=e.srcElement,n,r,o,a,s,c,u;n=t.getBoundingClientRect(),c=I.clientX-n.left,u=I.clientY-n.top;for(r in _)if(o=_[r],a=t.offsetWidth*o[0],s=t.offsetHeight*o[1],Math.abs(a-c)<8&&Math.abs(s-u)<8){N=o;break}L=!0,i.getDoc().selection.empty(),l(t,r,I)}function h(e){var t=e.srcElement;if(t!=x){if(m(),0===t.id.indexOf("mceResizeHandle"))return e.returnValue=!1,void 0;("IMG"==t.nodeName||"TABLE"==t.nodeName)&&(c(),x=t,d(t,"resizestart",p))}}function m(){f(x,"resizestart",p)}function g(){try{i.getDoc().execCommand("enableObjectResizing",!1,!1)}catch(e){}}function v(e){var t;if(O){t=H.body.createControlRange();try{return t.addElement(e),t.select(),!0}catch(n){}}}function y(){x=w=null,O&&(m(),f(i.getBody(),"controlselect",h))}var b=i.dom,C=t.each,x,w,_,N,E,S,k,T,R,A,B,L,M,D,H=i.getDoc(),P=document,O=n.ie,I;_={n:[.5,0,0,-1],e:[1,.5,1,0],s:[.5,1,0,1],w:[0,.5,-1,0],nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};var F=".mce-content-body";return i.contentStyles.push(F+" div.mce-resizehandle {"+"position: absolute;"+"border: 1px solid black;"+"background: #FFF;"+"width: 5px;"+"height: 5px;"+"z-index: 10000"+"}"+F+" .mce-resizehandle:hover {"+"background: #000"+"}"+F+" img[data-mce-selected], hr[data-mce-selected] {"+"outline: 1px solid black;"+"resize: none"+"}"+F+" .mce-clonedresizable {"+"position: absolute;"+(n.gecko?"":"outline: 1px dashed black;")+"opacity: .5;"+"filter: alpha(opacity=50);"+"z-index: 10000"+"}"),i.on("init",function(){O?(i.on("ObjectResized",function(e){"TABLE"!=e.target.nodeName&&(c(),v(e.target))}),d(i.getBody(),"controlselect",h),i.on("mousedown",function(e){I=e})):g(),i.on("nodechange mousedown ResizeEditor",u),i.on("keydown keyup",function(e){x&&"TABLE"==x.nodeName&&u(e)})}),{controlSelect:v,destroy:y}}}),r(A,[f,k,R,g,p],function(e,n,r,i,o){function a(e,t,i,o){var a=this;a.dom=e,a.win=t,a.serializer=i,a.editor=o,a.controlSelection=new r(a,o),a.win.getSelection||(a.tridentSel=new n(a))}var s=o.each,l=o.grep,c=o.trim,u=i.ie,d=i.opera;return a.prototype={setCursorLocation:function(e,t){var n=this,r=n.dom.createRng();r.setStart(e,t),r.setEnd(e,t),n.setRng(r),n.collapse(!1)},getContent:function(e){var n=this,r=n.getRng(),i=n.dom.create("body"),o=n.getSel(),a,s,l;return e=e||{},a=s="",e.get=!0,e.format=e.format||"html",e.selection=!0,n.editor.fire("BeforeGetContent",e),"text"==e.format?n.isCollapsed()?"":r.text||(o.toString?o.toString():""):(r.cloneContents?(l=r.cloneContents(),l&&i.appendChild(l)):r.item!==t||r.htmlText!==t?(i.innerHTML="<br>"+(r.item?r.item(0).outerHTML:r.htmlText),i.removeChild(i.firstChild)):i.innerHTML=r.toString(),/^\s/.test(i.innerHTML)&&(a=" "),/\s+$/.test(i.innerHTML)&&(s=" "),e.getInner=!0,e.content=n.isCollapsed()?"":a+n.serializer.serialize(i,e)+s,n.editor.fire("GetContent",e),e.content)},setContent:function(e,t){var n=this,r=n.getRng(),i,o=n.win.document,a,s;if(t=t||{format:"html"},t.set=!0,t.selection=!0,e=t.content=e,t.no_events||n.editor.fire("BeforeSetContent",t),e=t.content,r.insertNode){e+='<span id="__caret">_</span>',r.startContainer==o&&r.endContainer==o?o.body.innerHTML=e:(r.deleteContents(),0===o.body.childNodes.length?o.body.innerHTML=e:r.createContextualFragment?r.insertNode(r.createContextualFragment(e)):(a=o.createDocumentFragment(),s=o.createElement("div"),a.appendChild(s),s.outerHTML=e,r.insertNode(a))),i=n.dom.get("__caret"),r=o.createRange(),r.setStartBefore(i),r.setEndBefore(i),n.setRng(r),n.dom.remove("__caret");try{n.setRng(r)}catch(l){}}else r.item&&(o.execCommand("Delete",!1,null),r=n.getRng()),/^\s+/.test(e)?(r.pasteHTML('<span id="__mce_tmp">_</span>'+e),n.dom.remove("__mce_tmp")):r.pasteHTML(e);t.no_events||n.editor.fire("SetContent",t)},getStart:function(){var e=this,t=e.getRng(),n,r,i,o;if(t.duplicate||t.item){if(t.item)return t.item(0);for(i=t.duplicate(),i.collapse(1),n=i.parentElement(),n.ownerDocument!==e.dom.doc&&(n=e.dom.getRoot()),r=o=t.parentElement();o=o.parentNode;)if(o==n){n=r;break}return n}return n=t.startContainer,1==n.nodeType&&n.hasChildNodes()&&(n=n.childNodes[Math.min(n.childNodes.length-1,t.startOffset)]),n&&3==n.nodeType?n.parentNode:n},getEnd:function(){var e=this,t=e.getRng(),n,r;return t.duplicate||t.item?t.item?t.item(0):(t=t.duplicate(),t.collapse(0),n=t.parentElement(),n.ownerDocument!==e.dom.doc&&(n=e.dom.getRoot()),n&&"BODY"==n.nodeName?n.lastChild||n:n):(n=t.endContainer,r=t.endOffset,1==n.nodeType&&n.hasChildNodes()&&(n=n.childNodes[r>0?r-1:r]),n&&3==n.nodeType?n.parentNode:n)},getBookmark:function(e,t){function n(e,t){var n=0;return s(a.select(e),function(e,r){e==t&&(n=r)}),n}function r(e){function t(t){var n,r,i,o=t?"start":"end";n=e[o+"Container"],r=e[o+"Offset"],1==n.nodeType&&"TR"==n.nodeName&&(i=n.childNodes,n=i[Math.min(t?r:r-1,i.length-1)],n&&(r=t?0:n.childNodes.length,e["set"+(t?"Start":"End")](n,r)))}return t(!0),t(),e}function i(){function e(e,n){var i=e[n?"startContainer":"endContainer"],a=e[n?"startOffset":"endOffset"],s=[],l,c,u=0;if(3==i.nodeType){if(t)for(l=i.previousSibling;l&&3==l.nodeType;l=l.previousSibling)a+=l.nodeValue.length;s.push(a)}else c=i.childNodes,a>=c.length&&c.length&&(u=1,a=Math.max(0,c.length-1)),s.push(o.dom.nodeIndex(c[a],t)+u);for(;i&&i!=r;i=i.parentNode)s.push(o.dom.nodeIndex(i,t));return s}var n=o.getRng(!0),r=a.getRoot(),i={};return i.start=e(n,!0),o.isCollapsed()||(i.end=e(n)),i}var o=this,a=o.dom,l,c,u,d,f,p,h="&#xFEFF;",m;if(2==e)return p=o.getNode(),f=p.nodeName,"IMG"==f?{name:f,index:n(f,p)}:o.tridentSel?o.tridentSel.getBookmark(e):i();if(e)return{rng:o.getRng()};if(l=o.getRng(),u=a.uniqueId(),d=o.isCollapsed(),m="overflow:hidden;line-height:0px",l.duplicate||l.item){if(l.item)return p=l.item(0),f=p.nodeName,{name:f,index:n(f,p)};c=l.duplicate();try{l.collapse(),l.pasteHTML('<span data-mce-type="bookmark" id="'+u+'_start" style="'+m+'">'+h+"</span>"),d||(c.collapse(!1),l.moveToElementText(c.parentElement()),0===l.compareEndPoints("StartToEnd",c)&&c.move("character",-1),c.pasteHTML('<span data-mce-type="bookmark" id="'+u+'_end" style="'+m+'">'+h+"</span>"))}catch(g){return null}}else{if(p=o.getNode(),f=p.nodeName,"IMG"==f)return{name:f,index:n(f,p)};c=r(l.cloneRange()),d||(c.collapse(!1),c.insertNode(a.create("span",{"data-mce-type":"bookmark",id:u+"_end",style:m},h))),l=r(l),l.collapse(!0),l.insertNode(a.create("span",{"data-mce-type":"bookmark",id:u+"_start",style:m},h))}return o.moveToBookmark({id:u,keep:1}),{id:u}},moveToBookmark:function(e){function t(t){var n=e[t?"start":"end"],r,i,o,s;if(n){for(o=n[0],i=c,r=n.length-1;r>=1;r--){if(s=i.childNodes,n[r]>s.length-1)return;i=s[n[r]]}3===i.nodeType&&(o=Math.min(n[0],i.nodeValue.length)),1===i.nodeType&&(o=Math.min(n[0],i.childNodes.length)),t?a.setStart(i,o):a.setEnd(i,o)}return!0}function n(t){var n=o.get(e.id+"_"+t),r,i,a,c,u=e.keep;if(n&&(r=n.parentNode,"start"==t?(u?(r=n.firstChild,i=1):i=o.nodeIndex(n),f=p=r,h=m=i):(u?(r=n.firstChild,i=1):i=o.nodeIndex(n),p=r,m=i),!u)){for(c=n.previousSibling,a=n.nextSibling,s(l(n.childNodes),function(e){3==e.nodeType&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});n=o.get(e.id+"_"+t);)o.remove(n,1);c&&a&&c.nodeType==a.nodeType&&3==c.nodeType&&!d&&(i=c.nodeValue.length,c.appendData(a.nodeValue),o.remove(a),"start"==t?(f=p=c,h=m=i):(p=c,m=i))}}function r(e){return!o.isBlock(e)||e.innerHTML||u||(e.innerHTML='<br data-mce-bogus="1" />'),e}var i=this,o=i.dom,a,c,f,p,h,m;if(e)if(e.start){if(a=o.createRng(),c=o.getRoot(),i.tridentSel)return i.tridentSel.moveToBookmark(e);t(!0)&&t()&&i.setRng(a)}else e.id?(n("start"),n("end"),f&&(a=o.createRng(),a.setStart(r(f),h),a.setEnd(r(p),m),i.setRng(a))):e.name?i.select(o.select(e.name)[e.index]):e.rng&&i.setRng(e.rng)},select:function(t,n){function r(t,n){var r=new e(t,t);do{if(3==t.nodeType&&0!==c(t.nodeValue).length)return n?a.setStart(t,0):a.setEnd(t,t.nodeValue.length),void 0;if("BR"==t.nodeName)return n?a.setStartBefore(t):a.setEndBefore(t),void 0}while(t=n?r.next():r.prev())}var i=this,o=i.dom,a=o.createRng(),s;if(t){if(!n&&i.controlSelection.controlSelect(t))return;s=o.nodeIndex(t),a.setStart(t.parentNode,s),a.setEnd(t.parentNode,s+1),n&&(r(t,1),r(t)),i.setRng(a)}return t},isCollapsed:function(){var e=this,t=e.getRng(),n=e.getSel();return!t||t.item?!1:t.compareEndPoints?0===t.compareEndPoints("StartToEnd",t):!n||t.collapsed},collapse:function(e){var t=this,n=t.getRng(),r;n.item&&(r=n.item(0),n=t.win.document.body.createTextRange(),n.moveToElementText(r)),n.collapse(!!e),t.setRng(n)},getSel:function(){var e=this.win;return e.getSelection?e.getSelection():e.document.selection},getRng:function(e){var t=this,n,r,i,o=t.win.document,a;if(!e&&t.restoreRng)return t.restoreRng;if(e&&t.tridentSel)return t.tridentSel.getRangeAt(0);try{(n=t.getSel())&&(r=n.rangeCount>0?n.getRangeAt(0):n.createRange?n.createRange():o.createRange())}catch(s){}if(u&&r&&r.setStart){try{a=o.selection.createRange()}catch(s){}a&&a.item&&(i=a.item(0),r=o.createRange(),r.setStartBefore(i),r.setEndAfter(i))}return r||(r=o.createRange?o.createRange():o.body.createTextRange()),r.setStart&&9===r.startContainer.nodeType&&r.collapsed&&(i=t.dom.getRoot(),r.setStart(i,0),r.setEnd(i,0)),t.selectedRange&&t.explicitRange&&(0===r.compareBoundaryPoints(r.START_TO_START,t.selectedRange)&&0===r.compareBoundaryPoints(r.END_TO_END,t.selectedRange)?r=t.explicitRange:(t.selectedRange=null,t.explicitRange=null)),r},setRng:function(e,t){var n=this,r;if(e.select)try{e.select()}catch(i){}else if(n.tridentSel){if(e.cloneRange)try{return n.tridentSel.addRange(e),void 0}catch(i){}}else if(r=n.getSel()){n.explicitRange=e;try{r.removeAllRanges()}catch(i){}r.addRange(e),t===!1&&r.extend&&(r.collapse(e.endContainer,e.endOffset),r.extend(e.startContainer,e.startOffset)),n.selectedRange=r.rangeCount>0?r.getRangeAt(0):null}},setNode:function(e){var t=this;return t.setContent(t.dom.getOuterHTML(e)),e},getNode:function(){function e(e,t){for(var n=e;e&&3===e.nodeType&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n}var t=this,n=t.getRng(),r,i=n.startContainer,o=n.endContainer,a=n.startOffset,s=n.endOffset;return n?n.setStart?(r=n.commonAncestorContainer,!n.collapsed&&(i==o&&2>s-a&&i.hasChildNodes()&&(r=i.childNodes[a]),3===i.nodeType&&3===o.nodeType&&(i=i.length===a?e(i.nextSibling,!0):i.parentNode,o=0===s?e(o.previousSibling,!1):o.parentNode,i&&i===o))?i:r&&3==r.nodeType?r.parentNode:r):n.item?n.item(0):n.parentElement():t.dom.getRoot()},getSelectedBlocks:function(t,n){var r=this,i=r.dom,o,a,s=[];if(a=i.getRoot(),t=i.getParent(t||r.getStart(),i.isBlock),n=i.getParent(n||r.getEnd(),i.isBlock),t&&t!=a&&s.push(t),t&&n&&t!=n){o=t;for(var l=new e(t,a);(o=l.next())&&o!=n;)i.isBlock(o)&&s.push(o)}return n&&t!=n&&n!=a&&s.push(n),s},isForward:function(){var e=this.dom,t=this.getSel(),n,r;return t&&t.anchorNode&&t.focusNode?(n=e.createRng(),n.setStart(t.anchorNode,t.anchorOffset),n.collapse(!0),r=e.createRng(),r.setStart(t.focusNode,t.focusOffset),r.collapse(!0),n.compareBoundaryPoints(n.START_TO_START,r)<=0):!0},normalize:function(){function t(t){function a(t,n){for(var r=new e(t,f.getParent(t.parentNode,f.isBlock)||p);t=r[n?"prev":"next"]();)if("BR"===t.nodeName)return!0}function s(e,t){return e.previousSibling&&e.previousSibling.nodeName==t}function l(t,n){var r,a;for(n=n||c,r=new e(n,f.getParent(n.parentNode,f.isBlock)||p);h=r[t?"prev":"next"]();){if(3===h.nodeType&&h.nodeValue.length>0)return c=h,u=t?h.nodeValue.length:0,i=!0,void 0;if(f.isBlock(h)||m[h.nodeName.toLowerCase()])return;a=h}o&&a&&(c=a,i=!0,u=0)}var c,u,d,f=n.dom,p=f.getRoot(),h,m,g;if(c=r[(t?"start":"end")+"Container"],u=r[(t?"start":"end")+"Offset"],m=f.schema.getNonEmptyElements(),9===c.nodeType&&(c=f.getRoot(),u=0),c===p){if(t&&(h=c.childNodes[u>0?u-1:0],h&&(g=h.nodeName.toLowerCase(),m[h.nodeName]||"TABLE"==h.nodeName)))return;if(c.hasChildNodes()&&(u=Math.min(!t&&u>0?u-1:u,c.childNodes.length-1),c=c.childNodes[u],u=0,c.hasChildNodes()&&!/TABLE/.test(c.nodeName))){h=c,d=new e(c,p);do{if(3===h.nodeType&&h.nodeValue.length>0){u=t?0:h.nodeValue.length,c=h,i=!0;break}if(m[h.nodeName.toLowerCase()]){u=f.nodeIndex(h),c=h.parentNode,"IMG"!=h.nodeName||t||u++,i=!0;break}}while(h=t?d.next():d.prev())}}o&&(3===c.nodeType&&0===u&&l(!0),1===c.nodeType&&(h=c.childNodes[u],!h||"BR"!==h.nodeName||s(h,"A")||a(h)||a(h,!0)||l(!0,c.childNodes[u]))),t&&!o&&3===c.nodeType&&u===c.nodeValue.length&&l(!1),i&&r["set"+(t?"Start":"End")](c,u)}var n=this,r,i,o;u||(r=n.getRng(),o=r.collapsed,t(!0),o||t(),i&&(o&&r.collapse(!0),n.setRng(r,n.isForward())))},selectorChanged:function(e,t){var n=this,r;return n.selectorChangedData||(n.selectorChangedData={},r={},n.editor.on("NodeChange",function(e){var t=e.element,i=n.dom,o=i.getParents(t,null,i.getRoot()),a={};s(n.selectorChangedData,function(e,t){s(o,function(n){return i.is(n,t)?(r[t]||(s(e,function(e){e(!0,{node:n,selector:t,parents:o})}),r[t]=e),a[t]=e,!1):void 0})}),s(r,function(e,n){a[n]||(delete r[n],s(e,function(e){e(!1,{node:t,selector:n,parents:o})}))})})),n.selectorChangedData[e]||(n.selectorChangedData[e]=[]),n.selectorChangedData[e].push(t),n},scrollIntoView:function(e){var t,n,r=this,i=r.dom;n=i.getViewPort(r.editor.getWin()),t=i.getPos(e).y,(t<n.y||t+25>n.y+n.h)&&r.editor.getWin().scrollTo(0,t<n.y?t:t-n.h+25)},destroy:function(){this.win=null,this.controlSelection.destroy()}},a}),r(B,[p],function(e){function t(e){this.walk=function(t,r){function i(e){var t;return t=e[0],3===t.nodeType&&t===l&&c>=t.nodeValue.length&&e.splice(0,1),t=e[e.length-1],0===d&&e.length>0&&t===u&&3===t.nodeType&&e.splice(e.length-1,1),e}function o(e,t,n){for(var r=[];e&&e!=n;e=e[t])r.push(e);return r}function a(e,t){do{if(e.parentNode==t)return e;e=e.parentNode}while(e)}function s(e,t,n){var a=n?"nextSibling":"previousSibling";for(m=e,g=m.parentNode;m&&m!=t;m=g)g=m.parentNode,v=o(m==e?m:m[a],a),v.length&&(n||v.reverse(),r(i(v)))}var l=t.startContainer,c=t.startOffset,u=t.endContainer,d=t.endOffset,f,p,h,m,g,v,y;if(y=e.select("td.mce-item-selected,th.mce-item-selected"),y.length>0)return n(y,function(e){r([e])}),void 0;if(1==l.nodeType&&l.hasChildNodes()&&(l=l.childNodes[c]),1==u.nodeType&&u.hasChildNodes()&&(u=u.childNodes[Math.min(d-1,u.childNodes.length-1)]),l==u)return r(i([l]));for(f=e.findCommonAncestor(l,u),m=l;m;m=m.parentNode){if(m===u)return s(l,f,!0);if(m===f)break}for(m=u;m;m=m.parentNode){if(m===l)return s(u,f);if(m===f)break}p=a(l,f)||l,h=a(u,f)||u,s(l,p,!0),v=o(p==l?p:p.nextSibling,"nextSibling",h==u?h.nextSibling:h),v.length&&r(i(v)),s(u,h)},this.split=function(e){function t(e,t){return e.splitText(t)}var n=e.startContainer,r=e.startOffset,i=e.endContainer,o=e.endOffset;return n==i&&3==n.nodeType?r>0&&r<n.nodeValue.length&&(i=t(n,r),n=i.previousSibling,o>r?(o-=r,n=i=t(i,o).previousSibling,o=i.nodeValue.length,r=0):o=0):(3==n.nodeType&&r>0&&r<n.nodeValue.length&&(n=t(n,r),r=0),3==i.nodeType&&o>0&&o<i.nodeValue.length&&(i=t(i,o).previousSibling,o=i.nodeValue.length)),{startContainer:n,startOffset:r,endContainer:i,endOffset:o}}}var n=e.each;return t.compareRanges=function(e,t){if(e&&t){if(!e.item&&!e.duplicate)return e.startContainer==t.startContainer&&e.startOffset==t.startOffset;if(e.item&&t.item&&e.item(0)===t.item(0))return!0;if(e.isEqual&&t.isEqual&&t.isEqual(e))return!0}return!1},t}),r(L,[f,B,p],function(e,t,n){return function(r){function i(e){return e.nodeType&&(e=e.nodeName),!!r.schema.getTextBlockElements()[e.toLowerCase()]}function o(e,t){return I.getParents(e,t,I.getRoot())}function a(e){return 1===e.nodeType&&"_mce_caret"===e.id}function s(){u({alignleft:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"left"},defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"center"},defaultBlock:"div"},{selector:"img",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"right"},defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"right"}}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"justify"},defaultBlock:"div"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:!0},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:!1},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:!1},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:function(){return!0},onformat:function(e,t,n){et(n,function(t,n){I.setAttrib(e,n,t)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]}),et("p h1 h2 h3 h4 h5 h6 div address pre div dt dd samp".split(/\s/),function(e){u(e,{block:e,remove:"all"})}),u(r.settings.formats)}function l(){r.addShortcut("ctrl+b","bold_desc","Bold"),r.addShortcut("ctrl+i","italic_desc","Italic"),r.addShortcut("ctrl+u","underline_desc","Underline");for(var e=1;6>=e;e++)r.addShortcut("ctrl+"+e,"",["FormatBlock",!1,"h"+e]);r.addShortcut("ctrl+7","",["FormatBlock",!1,"p"]),r.addShortcut("ctrl+8","",["FormatBlock",!1,"div"]),r.addShortcut("ctrl+9","",["FormatBlock",!1,"address"])}function c(e){return e?O[e]:O}function u(e,t){e&&("string"!=typeof e?et(e,function(e,t){u(t,e)}):(t=t.length?t:[t],et(t,function(e){e.deep===X&&(e.deep=!e.selector),e.split===X&&(e.split=!e.selector||e.inline),e.remove===X&&e.selector&&!e.inline&&(e.remove="none"),e.selector&&e.inline&&(e.mixed=!0,e.block_expand=!0),"string"==typeof e.classes&&(e.classes=e.classes.split(/\s+/))}),O[e]=t))}function d(e){var t;return r.dom.getParent(e,function(e){return t=r.dom.getStyle(e,"text-decoration"),t&&"none"!==t}),t}function f(e){var t;1===e.nodeType&&e.parentNode&&1===e.parentNode.nodeType&&(t=d(e.parentNode),r.dom.getStyle(e,"color")&&t?r.dom.setStyle(e,"text-decoration",t):r.dom.getStyle(e,"textdecoration")===t&&r.dom.setStyle(e,"text-decoration",null))}function p(t,n,o){function s(e,t){t=t||m,e&&(t.onformat&&t.onformat(e,t,n,o),et(t.styles,function(t,r){I.setStyle(e,r,E(t,n))}),et(t.attributes,function(t,r){I.setAttrib(e,r,E(t,n))}),et(t.classes,function(t){t=E(t,n),I.hasClass(e,t)||I.addClass(e,t)}))}function l(){function t(t,n){var r=new e(n);for(o=r.current();o;o=r.prev())if(o.childNodes.length>1||o==t||"BR"==o.tagName)return o}var n=r.selection.getRng(),i=n.startContainer,a=n.endContainer;if(i!=a&&0===n.endOffset){var s=t(i,a),l=3==s.nodeType?s.length:s.childNodes.length;n.setEnd(s,l)}return n}function u(e,t,n,r,i){var o=[],a=-1,s,l=-1,c=-1,u;return et(e.childNodes,function(e,t){return"UL"===e.nodeName||"OL"===e.nodeName?(a=t,s=e,!1):void 0}),et(e.childNodes,function(e,n){"SPAN"===e.nodeName&&"bookmark"==I.getAttrib(e,"data-mce-type")&&(e.id==t.id+"_start"?l=n:e.id==t.id+"_end"&&(c=n))}),0>=a||a>l&&c>a?(et(tt(e.childNodes),i),0):(u=I.clone(n,K),et(tt(e.childNodes),function(e,t){(a>l&&a>t||l>a&&t>a)&&(o.push(e),e.parentNode.removeChild(e))}),a>l?e.insertBefore(u,s):l>a&&e.insertBefore(u,s.nextSibling),r.push(u),et(o,function(e){u.appendChild(e)}),u)}function d(e,r,o){var l=[],c,d,f=!0;c=m.inline||m.block,d=I.create(c),s(d),W.walk(e,function(e){function p(e){var y,C,x,_,N;return N=f,y=e.nodeName.toLowerCase(),C=e.parentNode.nodeName.toLowerCase(),1===e.nodeType&&J(e)&&(N=f,f="true"===J(e),_=!0),w(y,"br")?(v=0,m.block&&I.remove(e),void 0):m.wrapper&&g(e,t,n)?(v=0,void 0):f&&!_&&m.block&&!m.wrapper&&i(y)&&z(C,c)?(e=I.rename(e,c),s(e),l.push(e),v=0,void 0):m.selector&&(et(h,function(t){"collapsed"in t&&t.collapsed!==b||I.is(e,t.selector)&&!a(e)&&(s(e,t),x=!0)}),!m.inline||x)?(v=0,void 0):(!f||_||!z(c,y)||!z(C,c)||!o&&3===e.nodeType&&1===e.nodeValue.length&&65279===e.nodeValue.charCodeAt(0)||a(e)||m.inline&&V(e)?"li"==y&&r?v=u(e,r,d,l,p):(v=0,et(tt(e.childNodes),p),_&&(f=N),v=0):(v||(v=I.clone(d,K),e.parentNode.insertBefore(v,e),l.push(v)),v.appendChild(e)),void 0)}var v;et(e,p)}),m.wrap_links===!1&&et(l,function(e){function t(e){var n,r,i;if("A"===e.nodeName){for(r=I.clone(d,K),l.push(r),i=tt(e.childNodes),n=0;n<i.length;n++)r.appendChild(i[n]);e.appendChild(r)}et(tt(e.childNodes),t)}t(e)}),et(l,function(e){function r(e){var t=0;return et(e.childNodes,function(e){S(e)||L(e)||t++}),t}function i(e){var t,n;return et(e.childNodes,function(e){return 1!=e.nodeType||L(e)||a(e)?void 0:(t=e,K)}),t&&x(t,m)&&(n=I.clone(t,K),s(n),I.replace(n,e,G),I.remove(t,1)),n||e}var o;if(o=r(e),(l.length>1||!V(e))&&0===o)return I.remove(e,1),void 0;if(m.inline||m.wrapper){if(m.exact||1!==o||(e=i(e)),et(h,function(t){et(I.select(t.inline,e),function(e){var r;if(t.wrap_links===!1){r=e.parentNode;do if("A"===r.nodeName)return;while(r=r.parentNode)}R(t,n,e,t.exact?e:null)})}),g(e.parentNode,t,n))return I.remove(e,1),e=0,G;m.merge_with_parents&&I.getParent(e.parentNode,function(r){return g(r,t,n)?(I.remove(e,1),e=0,G):void 0}),e&&m.merge_siblings!==!1&&(e=M(B(e),e),e=M(e,B(e,G)))}})}var h=c(t),m=h[0],v,y,b=!o&&F.isCollapsed();if(m)if(o)o.nodeType?(y=I.createRng(),y.setStartBefore(o),y.setEndAfter(o),d(T(y,h),null,!0)):d(o,null,!0);else if(b&&m.inline&&!I.select("td.mce-item-selected,th.mce-item-selected").length)H("apply",t,n);else{var C=r.selection.getNode();U||!h[0].defaultBlock||I.getParent(C,I.isBlock)||p(h[0].defaultBlock),r.selection.setRng(l()),v=F.getBookmark(),d(T(F.getRng(G),h),v),m.styles&&(m.styles.color||m.styles.textDecoration)&&(nt(C,f,"childNodes"),f(C)),F.moveToBookmark(v),P(F.getRng(G)),r.nodeChanged()}}function h(e,t,n){function i(e){var n,r,o,a,s;if(1===e.nodeType&&J(e)&&(a=b,b="true"===J(e),s=!0),n=tt(e.childNodes),b&&!s)for(r=0,o=p.length;o>r&&!R(p[r],t,e,e);r++);if(h.deep&&n.length){for(r=0,o=n.length;o>r;r++)i(n[r]);s&&(b=a)}}function a(n){var r;return et(o(n.parentNode).reverse(),function(n){var i;r||"_start"==n.id||"_end"==n.id||(i=g(n,e,t),i&&i.split!==!1&&(r=n))}),r}function s(e,n,r,i){var o,a,s,l,c,u;if(e){for(u=e.parentNode,o=n.parentNode;o&&o!=u;o=o.parentNode){for(a=I.clone(o,K),c=0;c<p.length;c++)if(R(p[c],t,a,a)){a=0;break}a&&(s&&a.appendChild(s),l||(l=a),s=a)}!i||h.mixed&&V(e)||(n=I.split(e,n)),s&&(r.parentNode.insertBefore(s,r),l.appendChild(r))}return n}function l(e){return s(a(e),e,e,!0)}function u(e){var t=I.get(e?"_start":"_end"),n=t[e?"firstChild":"lastChild"];return L(n)&&(n=n[e?"firstChild":"lastChild"]),I.remove(t,!0),n}function f(e){var t,n;e=T(e,p,G),h.split&&(t=D(e,G),n=D(e),t!=n?(/^(TR|TD)$/.test(t.nodeName)&&t.firstChild&&(t="TD"==t.nodeName?t.firstChild||t:t.firstChild.firstChild||t),t=k(t,"span",{id:"_start","data-mce-type":"bookmark"}),n=k(n,"span",{id:"_end","data-mce-type":"bookmark"}),l(t),l(n),t=u(G),n=u()):t=n=l(t),e.startContainer=t.parentNode,e.startOffset=q(t),e.endContainer=n.parentNode,e.endOffset=q(n)+1),W.walk(e,function(e){et(e,function(e){i(e),1===e.nodeType&&"underline"===r.dom.getStyle(e,"text-decoration")&&e.parentNode&&"underline"===d(e.parentNode)&&R({deep:!1,exact:!0,inline:"span",styles:{textDecoration:"underline"}},null,e)})})}var p=c(e),h=p[0],m,y,b=!0;return n?(n.nodeType?(y=I.createRng(),y.setStartBefore(n),y.setEndAfter(n),f(y)):f(n),void 0):(F.isCollapsed()&&h.inline&&!I.select("td.mce-item-selected,th.mce-item-selected").length?H("remove",e,t):(m=F.getBookmark(),f(F.getRng(G)),F.moveToBookmark(m),h.inline&&v(e,t,F.getStart())&&P(F.getRng(!0)),r.nodeChanged()),void 0)}function m(e,t,n){var r=c(e);!v(e,t,n)||"toggle"in r[0]&&!r[0].toggle?p(e,t,n):h(e,t,n)}function g(e,t,n,r){function i(e,t,i){var o,a,s=t[i],l;if(t.onmatch)return t.onmatch(e,t,i);if(s)if(s.length===X){for(o in s)if(s.hasOwnProperty(o)){if(a="attributes"===i?I.getAttrib(e,o):_(e,o),r&&!a&&!t.exact)return;if((!r||t.exact)&&!w(a,N(E(s[o],n),o)))return}}else for(l=0;l<s.length;l++)if("attributes"===i?I.getAttrib(e,s[l]):_(e,s[l]))return t;return t}var o=c(t),a,s,l;if(o&&e)for(s=0;s<o.length;s++)if(a=o[s],x(e,a)&&i(e,a,"attributes")&&i(e,a,"styles")){if(l=a.classes)for(s=0;s<l.length;s++)if(!I.hasClass(e,l[s]))return;return a}}function v(e,t,n){function r(n){return n=I.getParent(n,function(n){return!!g(n,e,t,!0)}),g(n,e,t)}var i;return n?r(n):(n=F.getNode(),r(n)?G:(i=F.getStart(),i!=n&&r(i)?G:K))}function y(e,t){var n,r=[],i={};return n=F.getStart(),I.getParent(n,function(n){var o,a;for(o=0;o<e.length;o++)a=e[o],!i[a]&&g(n,a,t)&&(i[a]=!0,r.push(a))},I.getRoot()),r}function b(e){var t=c(e),n,r,i,a,s;if(t)for(n=F.getStart(),r=o(n),a=t.length-1;a>=0;a--){if(s=t[a].selector,!s)return G;for(i=r.length-1;i>=0;i--)if(I.is(r[i],s))return G}return K}function C(e,t,n){var i;return Y||(Y={},i={},r.on("NodeChange",function(e){var t=o(e.element),n={};et(Y,function(e,r){et(t,function(o){return g(o,r,{},e.similar)?(i[r]||(et(e,function(e){e(!0,{node:o,format:r,parents:t})}),i[r]=e),n[r]=e,!1):void 0})}),et(i,function(r,o){n[o]||(delete i[o],et(r,function(n){n(!1,{node:e.element,format:o,parents:t})}))})})),et(e.split(","),function(e){Y[e]||(Y[e]=[],Y[e].similar=n),Y[e].push(t)}),this}function x(e,t){return w(e,t.inline)?G:w(e,t.block)?G:t.selector?1==e.nodeType&&I.is(e,t.selector):void 0}function w(e,t){return e=e||"",t=t||"",e=""+(e.nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()==t.toLowerCase()}function _(e,t){return N(I.getStyle(e,t),t)}function N(e,t){return("color"==t||"backgroundColor"==t)&&(e=I.toHex(e)),"fontWeight"==t&&700==e&&(e="bold"),"fontFamily"==t&&(e=e.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),""+e}function E(e,t){return"string"!=typeof e?e=e(t):t&&(e=e.replace(/%(\w+)/g,function(e,n){return t[n]||e})),e}function S(e){return e&&3===e.nodeType&&/^([\t \r\n]+|)$/.test(e.nodeValue)}function k(e,t,n){var r=I.create(t,n);return e.parentNode.insertBefore(r,e),r.appendChild(e),r}function T(t,n,a){function s(e){function t(e){return"BR"==e.nodeName&&e.getAttribute("data-mce-bogus")&&!e.nextSibling}var r,i,o,a,s;if(r=i=e?g:y,a=e?"previousSibling":"nextSibling",s=I.getRoot(),3==r.nodeType&&!S(r)&&(e?v>0:b<r.nodeValue.length))return r;for(;;){if(!n[0].block_expand&&V(i))return i;for(o=i[a];o;o=o[a])if(!L(o)&&!S(o)&&!t(o))return i;if(i.parentNode==s){r=i;break}i=i.parentNode}return r}function l(e,t){for(t===X&&(t=3===e.nodeType?e.length:e.childNodes.length);e&&e.hasChildNodes();)e=e.childNodes[t],e&&(t=3===e.nodeType?e.length:e.childNodes.length);return{node:e,offset:t}}function c(e){for(var t=e;t;){if(1===t.nodeType&&J(t))return"false"===J(t)?t:e;t=t.parentNode}return e}function u(t,n,i){function o(e,t){var n,r,o=e.nodeValue;return"undefined"==typeof t&&(t=i?o.length:0),i?(n=o.lastIndexOf(" ",t),r=o.lastIndexOf("\xa0",t),n=n>r?n:r,-1===n||a||n++):(n=o.indexOf(" ",t),r=o.indexOf("\xa0",t),n=-1!==n&&(-1===r||r>n)?n:r),n}var s,l,c,u;if(3===t.nodeType){if(c=o(t,n),-1!==c)return{container:t,offset:c};u=t}for(s=new e(t,I.getParent(t,V)||r.getBody());l=s[i?"prev":"next"]();)if(3===l.nodeType){if(u=l,c=o(l),-1!==c)return{container:l,offset:c}
-}else if(V(l))break;return u?(n=i?0:u.length,{container:u,offset:n}):void 0}function d(e,r){var i,a,s,l;for(3==e.nodeType&&0===e.nodeValue.length&&e[r]&&(e=e[r]),i=o(e),a=0;a<i.length;a++)for(s=0;s<n.length;s++)if(l=n[s],!("collapsed"in l&&l.collapsed!==t.collapsed)&&I.is(i[a],l.selector))return i[a];return e}function f(e,t){var r;if(n[0].wrapper||(r=I.getParent(e,n[0].block)),r||(r=I.getParent(3==e.nodeType?e.parentNode:e,i)),r&&n[0].wrapper&&(r=o(r,"ul,ol").reverse()[0]||r),!r)for(r=e;r[t]&&!V(r[t])&&(r=r[t],!w(r,"br")););return r||e}var p,h,m,g=t.startContainer,v=t.startOffset,y=t.endContainer,b=t.endOffset;if(1==g.nodeType&&g.hasChildNodes()&&(p=g.childNodes.length-1,g=g.childNodes[v>p?p:v],3==g.nodeType&&(v=0)),1==y.nodeType&&y.hasChildNodes()&&(p=y.childNodes.length-1,y=y.childNodes[b>p?p:b-1],3==y.nodeType&&(b=y.nodeValue.length)),g=c(g),y=c(y),(L(g.parentNode)||L(g))&&(g=L(g)?g:g.parentNode,g=g.nextSibling||g,3==g.nodeType&&(v=0)),(L(y.parentNode)||L(y))&&(y=L(y)?y:y.parentNode,y=y.previousSibling||y,3==y.nodeType&&(b=y.length)),n[0].inline&&(t.collapsed&&(m=u(g,v,!0),m&&(g=m.container,v=m.offset),m=u(y,b),m&&(y=m.container,b=m.offset)),h=l(y,b),h.node)){for(;h.node&&0===h.offset&&h.node.previousSibling;)h=l(h.node.previousSibling);h.node&&h.offset>0&&3===h.node.nodeType&&" "===h.node.nodeValue.charAt(h.offset-1)&&h.offset>1&&(y=h.node,y.splitText(h.offset-1))}return(n[0].inline||n[0].block_expand)&&(n[0].inline&&3==g.nodeType&&0!==v||(g=s(!0)),n[0].inline&&3==y.nodeType&&b!==y.nodeValue.length||(y=s())),n[0].selector&&n[0].expand!==K&&!n[0].inline&&(g=d(g,"previousSibling"),y=d(y,"nextSibling")),(n[0].block||n[0].selector)&&(g=f(g,"previousSibling"),y=f(y,"nextSibling"),n[0].block&&(V(g)||(g=s(!0)),V(y)||(y=s()))),1==g.nodeType&&(v=q(g),g=g.parentNode),1==y.nodeType&&(b=q(y)+1,y=y.parentNode),{startContainer:g,startOffset:v,endContainer:y,endOffset:b}}function R(e,t,n,r){var i,o,a;if(!x(n,e))return K;if("all"!=e.remove)for(et(e.styles,function(e,i){e=N(E(e,t),i),"number"==typeof i&&(i=e,r=0),(!r||w(_(r,i),e))&&I.setStyle(n,i,""),a=1}),a&&""===I.getAttrib(n,"style")&&(n.removeAttribute("style"),n.removeAttribute("data-mce-style")),et(e.attributes,function(e,i){var o;if(e=E(e,t),"number"==typeof i&&(i=e,r=0),!r||w(I.getAttrib(r,i),e)){if("class"==i&&(e=I.getAttrib(n,i),e&&(o="",et(e.split(/\s+/),function(e){/mce\w+/.test(e)&&(o+=(o?" ":"")+e)}),o)))return I.setAttrib(n,i,o),void 0;"class"==i&&n.removeAttribute("className"),j.test(i)&&n.removeAttribute("data-mce-"+i),n.removeAttribute(i)}}),et(e.classes,function(e){e=E(e,t),(!r||I.hasClass(r,e))&&I.removeClass(n,e)}),o=I.getAttribs(n),i=0;i<o.length;i++)if(0!==o[i].nodeName.indexOf("_"))return K;return"none"!=e.remove?(A(n,e),G):void 0}function A(e,t){function n(e,t,n){return e=B(e,t,n),!e||"BR"==e.nodeName||V(e)}var r=e.parentNode,i;t.block&&(U?r==I.getRoot()&&(t.list_block&&w(e,t.list_block)||et(tt(e.childNodes),function(e){z(U,e.nodeName.toLowerCase())?i?i.appendChild(e):i=k(e,U):i=0})):V(e)&&!V(r)&&(n(e,K)||n(e.firstChild,G,1)||e.insertBefore(I.create("br"),e.firstChild),n(e,G)||n(e.lastChild,K,1)||e.appendChild(I.create("br")))),t.selector&&t.inline&&!w(t.inline,e)||I.remove(e,1)}function B(e,t,n){if(e)for(t=t?"nextSibling":"previousSibling",e=n?e:e[t];e;e=e[t])if(1==e.nodeType||!S(e))return e}function L(e){return e&&1==e.nodeType&&"bookmark"==e.getAttribute("data-mce-type")}function M(e,t){function n(e,t){function n(e){var t={};return et(I.getAttribs(e),function(n){var r=n.nodeName.toLowerCase();0!==r.indexOf("_")&&"style"!==r&&(t[r]=I.getAttrib(e,r))}),t}function r(e,t){var n,r;for(r in e)if(e.hasOwnProperty(r)){if(n=t[r],n===X)return K;if(e[r]!=n)return K;delete t[r]}for(r in t)if(t.hasOwnProperty(r))return K;return G}return e.nodeName!=t.nodeName?K:r(n(e),n(t))?r(I.parseStyle(I.getAttrib(e,"style")),I.parseStyle(I.getAttrib(t,"style")))?G:K:K}function r(e,t){for(i=e;i;i=i[t]){if(3==i.nodeType&&0!==i.nodeValue.length)return e;if(1==i.nodeType&&!L(i))return i}return e}var i,o;if(e&&t&&(e=r(e,"previousSibling"),t=r(t,"nextSibling"),n(e,t))){for(i=e.nextSibling;i&&i!=t;)o=i,i=i.nextSibling,e.appendChild(o);return I.remove(t),et(tt(t.childNodes),function(t){e.appendChild(t)}),e}return t}function D(t,n){var i,o,a;return i=t[n?"startContainer":"endContainer"],o=t[n?"startOffset":"endOffset"],1==i.nodeType&&(a=i.childNodes.length-1,!n&&o&&o--,i=i.childNodes[o>a?a:o]),3===i.nodeType&&n&&o>=i.nodeValue.length&&(i=new e(i,r.getBody()).next()||i),3!==i.nodeType||n||0!==o||(i=new e(i,r.getBody()).prev()||i),i}function H(t,n,o){function a(e){var t=I.create("span",{id:y,"data-mce-bogus":!0,style:b?"color:red":""});return e&&t.appendChild(r.getDoc().createTextNode($)),t}function s(e,t){for(;e;){if(3===e.nodeType&&e.nodeValue!==$||e.childNodes.length>1)return!1;t&&1===e.nodeType&&t.push(e),e=e.firstChild}return!0}function l(e){for(;e;){if(e.id===y)return e;e=e.parentNode}}function u(t){var n;if(t)for(n=new e(t,t),t=n.current();t;t=n.next())if(3===t.nodeType)return t}function d(e,t){var n,r;if(e)r=F.getRng(!0),s(e)?(t!==!1&&(r.setStartBefore(e),r.setEndBefore(e)),I.remove(e)):(n=u(e),n.nodeValue.charAt(0)===$&&(n=n.deleteData(0,1)),I.remove(e,1)),F.setRng(r);else if(e=l(F.getStart()),!e)for(;e=I.get(y);)d(e,!1)}function f(){var e,t,r,i,s,d,f;e=F.getRng(!0),i=e.startOffset,d=e.startContainer,f=d.nodeValue,t=l(F.getStart()),t&&(r=u(t)),f&&i>0&&i<f.length&&/\w/.test(f.charAt(i))&&/\w/.test(f.charAt(i-1))?(s=F.getBookmark(),e.collapse(!0),e=T(e,c(n)),e=W.split(e),p(n,o,e),F.moveToBookmark(s)):(t&&r.nodeValue===$?p(n,o,t):(t=a(!0),r=t.firstChild,e.insertNode(t),i=1,p(n,o,t)),F.setCursorLocation(r,i))}function m(){var e=F.getRng(!0),t,r,s,l,u,d,f=[],p,m;for(t=e.startContainer,r=e.startOffset,u=t,3==t.nodeType&&((r!=t.nodeValue.length||t.nodeValue===$)&&(l=!0),u=u.parentNode);u;){if(g(u,n,o)){d=u;break}u.nextSibling&&(l=!0),f.push(u),u=u.parentNode}if(d)if(l)s=F.getBookmark(),e.collapse(!0),e=T(e,c(n),!0),e=W.split(e),h(n,o,e),F.moveToBookmark(s);else{for(m=a(),u=m,p=f.length-1;p>=0;p--)u.appendChild(I.clone(f[p],!1)),u=u.firstChild;u.appendChild(I.doc.createTextNode($)),u=u.firstChild;var v=I.getParent(d,i);v&&I.isEmpty(v)?d.parentNode.replaceChild(m,d):I.insertAfter(m,d),F.setCursorLocation(u,1)}}function v(){var e;e=l(F.getStart()),e&&!I.isEmpty(e)&&nt(e,function(e){1!=e.nodeType||e.id===y||I.isEmpty(e)||I.setAttrib(e,"data-mce-bogus",null)},"childNodes")}var y="_mce_caret",b=r.settings.caret_debug;r._hasCaretEvents||(Z=function(){var e=[],t;if(s(l(F.getStart()),e))for(t=e.length;t--;)I.setAttrib(e[t],"data-mce-bogus","1")},Q=function(e){var t=e.keyCode;d(),(8==t||37==t||39==t)&&d(l(F.getStart())),v()},r.on("SetContent",function(e){e.selection&&v()}),r._hasCaretEvents=!0),"apply"==t?f():m()}function P(t){var n=t.startContainer,r=t.startOffset,i,o,a,s,l;if(3==n.nodeType&&r>=n.nodeValue.length&&(r=q(n),n=n.parentNode,i=!0),1==n.nodeType)for(s=n.childNodes,n=s[Math.min(r,s.length-1)],o=new e(n,I.getParent(n,I.isBlock)),(r>s.length-1||i)&&o.next(),a=o.current();a;a=o.next())if(3==a.nodeType&&!S(a))return l=I.create("a",null,$),a.parentNode.insertBefore(l,a),t.setStart(a,0),F.setRng(t),I.remove(l),void 0}var O={},I=r.dom,F=r.selection,W=new t(I),z=r.schema.isValidChild,V=I.isBlock,U=r.settings.forced_root_block,q=I.nodeIndex,$="\ufeff",j=/^(src|href|style)$/,K=!1,G=!0,Y,X,J=I.getContentEditable,Q,Z,et=n.each,tt=n.grep,nt=n.walk,rt=n.extend;rt(this,{get:c,register:u,apply:p,remove:h,toggle:m,match:v,matchAll:y,matchNode:g,canApply:b,formatChanged:C}),s(),l(),r.on("BeforeGetContent",function(){Z&&Z()}),r.on("mouseup keydown",function(e){Q&&Q(e)})}}),r(M,[g,p],function(e,t){var n=t.trim,r;return r=new RegExp(["<span[^>]+data-mce-bogus[^>]+>[\u200b\ufeff]+<\\/span>","<div[^>]+data-mce-bogus[^>]+><\\/div>",'\\s?data-mce-selected="[^"]+"'].join("|"),"gi"),function(t){function i(){return n(t.getContent({format:"raw",no_events:1}).replace(r,""))}function o(){a.typing=!1,a.add()}var a,s=0,l=[],c,u;return t.on("init",function(){a.add()}),t.on("BeforeExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&a.beforeChange()}),t.on("ExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&a.add()}),t.on("ObjectResizeStart",function(){a.beforeChange()}),t.on("SaveContent ObjectResized",o),t.dom.bind(t.dom.getRoot(),"dragend",o),t.dom.bind(t.getBody(),"focusout",function(){!t.removed&&a.typing&&o()}),t.on("KeyUp",function(n){var r=n.keyCode;(r>=33&&36>=r||r>=37&&40>=r||45==r||13==r||n.ctrlKey)&&(o(),t.nodeChanged()),(46==r||8==r||e.mac&&(91==r||93==r))&&t.nodeChanged(),u&&a.typing&&(t.isDirty()||(t.isNotDirty=!l[0]||i()==l[0].content),t.fire("TypingUndo"),u=!1,t.nodeChanged())}),t.on("KeyDown",function(e){var t=e.keyCode;return t>=33&&36>=t||t>=37&&40>=t||45==t?(a.typing&&o(),void 0):((16>t||t>20)&&224!=t&&91!=t&&!a.typing&&(a.beforeChange(),a.typing=!0,a.add(),u=!0),void 0)}),t.on("MouseDown",function(){a.typing&&o()}),t.addShortcut("ctrl+z","","Undo"),t.addShortcut("ctrl+y,ctrl+shift+z","","Redo"),t.on("AddUndo Undo Redo ClearUndos MouseUp",function(e){e.isDefaultPrevented()||t.nodeChanged()}),a={data:l,typing:!1,beforeChange:function(){c=t.selection.getBookmark(2,!0)},add:function(e){var n,r=t.settings,o;if(e=e||{},e.content=i(),t.fire("BeforeAddUndo",{level:e}).isDefaultPrevented())return null;if(o=l[s],o&&o.content==e.content)return null;if(l[s]&&(l[s].beforeBookmark=c),r.custom_undo_redo_levels&&l.length>r.custom_undo_redo_levels){for(n=0;n<l.length-1;n++)l[n]=l[n+1];l.length--,s=l.length}e.bookmark=t.selection.getBookmark(2,!0),s<l.length-1&&(l.length=s+1),l.push(e),s=l.length-1;var a={level:e,lastLevel:o};return t.fire("AddUndo",a),s>0&&(t.fire("change",a),t.isNotDirty=!1),e},undo:function(){var e;return a.typing&&(a.add(),a.typing=!1),s>0&&(e=l[--s],t.setContent(e.content,{format:"raw"}),t.selection.moveToBookmark(e.beforeBookmark),t.fire("undo",{level:e})),e},redo:function(){var e;return s<l.length-1&&(e=l[++s],t.setContent(e.content,{format:"raw"}),t.selection.moveToBookmark(e.bookmark),t.fire("redo",{level:e})),e},clear:function(){l=[],s=0,a.typing=!1,t.fire("ClearUndos")},hasUndo:function(){return s>0||a.typing&&l[0]&&i()!=l[0].content},hasRedo:function(){return s<l.length-1&&!this.typing},transact:function(e){a.beforeChange(),e(),a.add()}}}}),r(D,[f,g],function(e,t){var n=t.ie;return function(t){function r(r){function u(e){return e&&i.isBlock(e)&&!/^(TD|TH|CAPTION|FORM)$/.test(e.nodeName)&&!/^(fixed|absolute)/i.test(e.style.position)&&"true"!==i.getContentEditable(e)}function d(e){var t;i.isBlock(e)&&(t=o.getRng(),e.appendChild(i.create("span",null,"\xa0")),o.select(e),e.lastChild.outerHTML="",o.setRng(t))}function f(e){for(var t=e,n=[],r;t=t.firstChild;){if(i.isBlock(t))return;1!=t.nodeType||c[t.nodeName.toLowerCase()]||n.push(t)}for(r=n.length;r--;)t=n[r],!t.hasChildNodes()||t.firstChild==t.lastChild&&""===t.firstChild.nodeValue?i.remove(t):"A"==t.nodeName&&" "===(t.innerText||t.textContent)&&i.remove(t)}function p(t){var n,r,a,s=t,l;if(a=i.createRng(),t.hasChildNodes()){for(n=new e(t,t);r=n.current();){if(3==r.nodeType){a.setStart(r,0),a.setEnd(r,0);break}if(c[r.nodeName.toLowerCase()]){a.setStartBefore(r),a.setEndBefore(r);break}s=r,r=n.next()}r||(a.setStart(s,0),a.setEnd(s,0))}else"BR"==t.nodeName?t.nextSibling&&i.isBlock(t.nextSibling)?((!R||9>R)&&(l=i.create("br"),t.parentNode.insertBefore(l,t)),a.setStartBefore(t),a.setEndBefore(t)):(a.setStartAfter(t),a.setEndAfter(t)):(a.setStart(t,0),a.setEnd(t,0));o.setRng(a),i.remove(l),o.scrollIntoView(t)}function h(e){var t=S,r,o,s;if(r=e||"TABLE"==D?i.create(e||P):T.cloneNode(!1),s=r,a.keep_styles!==!1)do if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(t.nodeName)){if("_mce_caret"==t.id)continue;o=t.cloneNode(!1),i.setAttrib(o,"id",""),r.hasChildNodes()?(o.appendChild(r.firstChild),r.appendChild(o)):(s=o,r.appendChild(o))}while(t=t.parentNode);return n||(s.innerHTML='<br data-mce-bogus="1">'),r}function m(t){var n,r,i;if(3==S.nodeType&&(t?k>0:k<S.nodeValue.length))return!1;if(S.parentNode==T&&O&&!t)return!0;if(t&&1==S.nodeType&&S==T.firstChild)return!0;if("TABLE"===S.nodeName||S.previousSibling&&"TABLE"==S.previousSibling.nodeName)return O&&!t||!O&&t;for(n=new e(S,T),3==S.nodeType&&(t&&0===k?n.prev():t||k!=S.nodeValue.length||n.next());r=n.current();){if(1===r.nodeType){if(!r.getAttribute("data-mce-bogus")&&(i=r.nodeName.toLowerCase(),c[i]&&"br"!==i))return!1}else if(3===r.nodeType&&!/^[ \t\r\n]*$/.test(r.nodeValue))return!1;t?n.prev():n.next()}return!0}function g(e,n){var r,o,a,s,c,d,f=P||"P";if(o=i.getParent(e,i.isBlock),d=t.getBody().nodeName.toLowerCase(),!o||!u(o)){if(o=o||E,!o.hasChildNodes())return r=i.create(f),o.appendChild(r),_.setStart(r,0),_.setEnd(r,0),r;for(s=e;s.parentNode!=o;)s=s.parentNode;for(;s&&!i.isBlock(s);)a=s,s=s.previousSibling;if(a&&l.isValidChild(d,f.toLowerCase())){for(r=i.create(f),a.parentNode.insertBefore(r,a),s=a;s&&!i.isBlock(s);)c=s.nextSibling,r.appendChild(s),s=c;_.setStart(e,n),_.setEnd(e,n)}}return e}function v(){function e(e){for(var t=M[e?"firstChild":"lastChild"];t&&1!=t.nodeType;)t=t[e?"nextSibling":"previousSibling"];return t===T}function t(){var e=M.parentNode;return"LI"==e.nodeName?e:M}var n=M.parentNode.nodeName;/^(OL|UL|LI)$/.test(n)&&(P="LI"),B=P?h(P):i.create("BR"),e(!0)&&e()?"LI"==n?i.insertAfter(B,t()):i.replace(B,M):e(!0)?"LI"==n?(i.insertAfter(B,t()),B.appendChild(i.doc.createTextNode(" ")),B.appendChild(M)):M.parentNode.insertBefore(B,M):e()?(i.insertAfter(B,t()),d(B)):(M=t(),N=_.cloneRange(),N.setStartAfter(T),N.setEndAfter(M),L=N.extractContents(),i.insertAfter(L,M),i.insertAfter(B,M)),i.remove(T),p(B),s.add()}function y(){for(var t=new e(S,T),n;n=t.next();)if(c[n.nodeName.toLowerCase()]||n.length>0)return!0}function b(){var e,t,r;S&&3==S.nodeType&&k>=S.nodeValue.length&&(n||y()||(e=i.create("br"),_.insertNode(e),_.setStartAfter(e),_.setEndAfter(e),t=!0)),e=i.create("br"),_.insertNode(e),n&&"PRE"==D&&(!R||8>R)&&e.parentNode.insertBefore(i.doc.createTextNode("\r"),e),r=i.create("span",{},"&nbsp;"),e.parentNode.insertBefore(r,e),o.scrollIntoView(r),i.remove(r),t?(_.setStartBefore(e),_.setEndBefore(e)):(_.setStartAfter(e),_.setEndAfter(e)),o.setRng(_),s.add()}function C(e){do 3===e.nodeType&&(e.nodeValue=e.nodeValue.replace(/^[\r\n]+/,"")),e=e.firstChild;while(e)}function x(e){var t=i.getRoot(),n,r;for(n=e;n!==t&&"false"!==i.getContentEditable(n);)"true"===i.getContentEditable(n)&&(r=n),n=n.parentNode;return n!==t?r:t}function w(e){var t;n||(e.normalize(),t=e.lastChild,(!t||/^(left|right)$/gi.test(i.getStyle(t,"float",!0)))&&i.add(e,"br"))}var _=o.getRng(!0),N,E,S,k,T,R,A,B,L,M,D,H,P,O;if(!_.collapsed)return t.execCommand("Delete"),void 0;if(!r.isDefaultPrevented()&&(S=_.startContainer,k=_.startOffset,P=(a.force_p_newlines?"p":"")||a.forced_root_block,P=P?P.toUpperCase():"",R=i.doc.documentMode,A=r.shiftKey,1==S.nodeType&&S.hasChildNodes()&&(O=k>S.childNodes.length-1,S=S.childNodes[Math.min(k,S.childNodes.length-1)]||S,k=O&&3==S.nodeType?S.nodeValue.length:0),E=x(S))){if(s.beforeChange(),!i.isBlock(E)&&E!=i.getRoot())return(!P||A)&&b(),void 0;if((P&&!A||!P&&A)&&(S=g(S,k)),T=i.getParent(S,i.isBlock),M=T?i.getParent(T.parentNode,i.isBlock):null,D=T?T.nodeName.toUpperCase():"",H=M?M.nodeName.toUpperCase():"","LI"!=H||r.ctrlKey||(T=M,D=H),"LI"==D){if(!P&&A)return b(),void 0;if(i.isEmpty(T))return v(),void 0}if("PRE"==D&&a.br_in_pre!==!1){if(!A)return b(),void 0}else if(!P&&!A&&"LI"!=D||P&&A)return b(),void 0;P&&T===t.getBody()||(P=P||"P",m()?(B=/^(H[1-6]|PRE|FIGURE)$/.test(D)&&"HGROUP"!=H?h(P):h(),a.end_container_on_empty_block&&u(M)&&i.isEmpty(T)?B=i.split(M,T):i.insertAfter(B,T),p(B)):m(!0)?(B=T.parentNode.insertBefore(h(),T),d(B)):(N=_.cloneRange(),N.setEndAfter(T),L=N.extractContents(),C(L),B=L.firstChild,i.insertAfter(L,T),f(B),w(T),p(B)),i.setAttrib(B,"id",""),s.add())}}var i=t.dom,o=t.selection,a=t.settings,s=t.undoManager,l=t.schema,c=l.getNonEmptyElements();t.on("keydown",function(e){13==e.keyCode&&r(e)!==!1&&e.preventDefault()})}}),r(H,[],function(){return function(e){function t(){var t=i.getStart(),s=e.getBody(),l,c,u,d,f,p,h,m=-16777215,g,v,y,b,C;if(C=n.forced_root_block,t&&1===t.nodeType&&C){for(;t&&t!=s;){if(a[t.nodeName])return;t=t.parentNode}if(l=i.getRng(),l.setStart){c=l.startContainer,u=l.startOffset,d=l.endContainer,f=l.endOffset;try{v=e.getDoc().activeElement===s}catch(x){}}else l.item&&(t=l.item(0),l=e.getDoc().body.createTextRange(),l.moveToElementText(t)),v=l.parentElement().ownerDocument===e.getDoc(),y=l.duplicate(),y.collapse(!0),u=-1*y.move("character",m),y.collapsed||(y=l.duplicate(),y.collapse(!1),f=-1*y.move("character",m)-u);for(t=s.firstChild,b=s.nodeName.toLowerCase();t;)if((3===t.nodeType||1==t.nodeType&&!a[t.nodeName])&&o.isValidChild(b,C.toLowerCase())){if(3===t.nodeType&&0===t.nodeValue.length){h=t,t=t.nextSibling,r.remove(h);continue}p||(p=r.create(C),t.parentNode.insertBefore(p,t),g=!0),h=t,t=t.nextSibling,p.appendChild(h)}else p=null,t=t.nextSibling;if(g&&v){if(l.setStart)l.setStart(c,u),l.setEnd(d,f),i.setRng(l);else try{l=e.getDoc().body.createTextRange(),l.moveToElementText(s),l.collapse(!0),l.moveStart("character",u),f>0&&l.moveEnd("character",f),l.select()}catch(x){}e.nodeChanged()}}}var n=e.settings,r=e.dom,i=e.selection,o=e.schema,a=o.getBlockElements();n.forced_root_block&&e.on("KeyUp NodeChange",t)}}),r(P,[E,g,p],function(e,n,r){var i=r.each,o=r.extend,a=r.map,s=r.inArray,l=r.explode,c=n.gecko,u=n.ie,d=!0,f=!1;return function(n){function r(e,t,n){var r;return e=e.toLowerCase(),(r=_.exec[e])?(r(e,t,n),d):f}function p(e){var t;return e=e.toLowerCase(),(t=_.state[e])?t(e):-1}function h(e){var t;return e=e.toLowerCase(),(t=_.value[e])?t(e):f}function m(e,t){t=t||"exec",i(e,function(e,n){i(n.toLowerCase().split(","),function(n){_[t][n]=e})})}function g(e,r,i){return r===t&&(r=f),i===t&&(i=null),n.getDoc().execCommand(e,r,i)}function v(e){return E.match(e)}function y(e,r){E.toggle(e,r?{value:r}:t),n.nodeChanged()}function b(e){S=w.getBookmark(e)}function C(){w.moveToBookmark(S)}var x=n.dom,w=n.selection,_={state:{},exec:{},value:{}},N=n.settings,E=n.formatter,S;o(this,{execCommand:r,queryCommandState:p,queryCommandValue:h,addCommands:m}),m({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(e){var t=n.getDoc(),r;try{g(e)}catch(i){r=d}(r||!t.queryCommandSupported(e))&&n.windowManager.alert("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.")},unlink:function(e){w.isCollapsed()&&w.select(w.getNode()),g(e),w.collapse(f)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(e){var t=e.substring(7);"full"==t&&(t="justify"),i("left,center,right,justify".split(","),function(e){t!=e&&E.remove("align"+e)}),y("align"+t),r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(e){var t,n;g(e),t=x.getParent(w.getNode(),"ol,ul"),t&&(n=t.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName)&&(b(),x.split(n,t),C()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){y(e)},"ForeColor,HiliteColor,FontName":function(e,t,n){y(e,n)},FontSize:function(e,t,n){var r,i;n>=1&&7>=n&&(i=l(N.font_size_style_values),r=l(N.font_size_classes),n=r?r[n-1]||n:i[n-1]||n),y(e,n)},RemoveFormat:function(e){E.remove(e)},mceBlockQuote:function(){y("blockquote")},FormatBlock:function(e,t,n){return y(n||"p")},mceCleanup:function(){var e=w.getBookmark();n.setContent(n.getContent({cleanup:d}),{cleanup:d}),w.moveToBookmark(e)},mceRemoveNode:function(e,t,r){var i=r||w.getNode();i!=n.getBody()&&(b(),n.dom.remove(i,d),C())},mceSelectNodeDepth:function(e,t,r){var i=0;x.getParent(w.getNode(),function(e){return 1==e.nodeType&&i++==r?(w.select(e),f):void 0},n.getBody())},mceSelectNode:function(e,t,n){w.select(n)},mceInsertContent:function(t,r,i){function o(e){function t(e){return r[e]&&3==r[e].nodeType}var n,r,i;return n=w.getRng(!0),r=n.startContainer,i=n.startOffset,3==r.nodeType&&(i>0?e=e.replace(/^&nbsp;/," "):t("previousSibling")||(e=e.replace(/^ /,"&nbsp;")),i<r.length?e=e.replace(/&nbsp;(<br>|)$/," "):t("nextSibling")||(e=e.replace(/(&nbsp;| )(<br>|)$/,"&nbsp;"))),e}var a,s,l,c,d,f,p,h,m,g,v,y,b,C;if(/^ | $/.test(i)&&(i=o(i)),a=n.parser,s=new e({},n.schema),b='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;</span>',f={content:i,format:"html",selection:!0},n.fire("BeforeSetContent",f),i=f.content,-1==i.indexOf("{$caret}")&&(i+="{$caret}"),i=i.replace(/\{\$caret\}/,b),w.isCollapsed()||n.getDoc().execCommand("Delete",!1,null),l=w.getNode(),f={context:l.nodeName.toLowerCase()},d=a.parse(i,f),v=d.lastChild,"mce_marker"==v.attr("id"))for(p=v,v=v.prev;v;v=v.walk(!0))if(3==v.type||!x.isBlock(v.name)){v.parent.insert(p,v,"br"===v.name);break}if(f.invalid){for(w.setContent(b),l=w.getNode(),c=n.getBody(),9==l.nodeType?l=v=c:v=l;v!==c;)l=v,v=v.parentNode;i=l==c?c.innerHTML:x.getOuterHTML(l),i=s.serialize(a.parse(i.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return s.serialize(d)}))),l==c?x.setHTML(c,i):x.setOuterHTML(l,i)}else i=s.serialize(d),v=l.firstChild,y=l.lastChild,!v||v===y&&"BR"===v.nodeName?x.setHTML(l,i):w.setContent(i);p=x.get("mce_marker"),h=x.getRect(p),m=x.getViewPort(n.getWin()),(h.y+h.h>m.y+m.h||h.y<m.y||h.x>m.x+m.w||h.x<m.x)&&(C=u?n.getDoc().documentElement:n.getBody(),C.scrollLeft=h.x,C.scrollTop=h.y-m.h+25),g=x.createRng(),v=p.previousSibling,v&&3==v.nodeType?(g.setStart(v,v.nodeValue.length),u||(y=p.nextSibling,y&&3==y.nodeType&&(v.appendData(y.data),y.parentNode.removeChild(y)))):(g.setStartBefore(p),g.setEndBefore(p)),x.remove(p),w.setRng(g),n.fire("SetContent",f),n.addVisual()},mceInsertRawHTML:function(e,t,r){w.setContent("tiny_mce_marker"),n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return r}))},mceToggleFormat:function(e,t,n){y(n)},mceSetContent:function(e,t,r){n.setContent(r)},"Indent,Outdent":function(e){var t,n,r;t=N.indentation,n=/[a-z%]+$/i.exec(t),t=parseInt(t,10),p("InsertUnorderedList")||p("InsertOrderedList")?g(e):(N.forced_root_block||x.getParent(w.getNode(),x.isBlock)||E.apply("div"),i(w.getSelectedBlocks(),function(i){var o;"LI"!=i.nodeName&&(o="rtl"==x.getStyle(i,"direction",!0)?"paddingRight":"paddingLeft","outdent"==e?(r=Math.max(0,parseInt(i.style[o]||0,10)-t),x.setStyle(i,o,r?r+n:"")):(r=parseInt(i.style[o]||0,10)+t+n,x.setStyle(i,o,r)))}))},mceRepaint:function(){if(c)try{b(d),w.getSel()&&w.getSel().selectAllChildren(n.getBody()),w.collapse(d),C()}catch(e){}},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",!1,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual,n.addVisual()},mceReplaceContent:function(e,t,r){n.execCommand("mceInsertContent",!1,r.replace(/\{\$selection\}/g,w.getContent({format:"text"})))},mceInsertLink:function(e,t,n){var r;"string"==typeof n&&(n={href:n}),r=x.getParent(w.getNode(),"a"),n.href=n.href.replace(" ","%20"),r&&n.href||E.remove("link"),n.href&&E.apply("link",n,r)},selectAll:function(){var e=x.getRoot(),t=x.createRng();w.getRng().setStart?(t.setStart(e,0),t.setEnd(e,e.childNodes.length),w.setRng(t)):g("SelectAll")},mceNewDocument:function(){n.setContent("")}}),m({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(e){var t="align"+e.substring(7),n=w.isCollapsed()?[x.getParent(w.getNode(),x.isBlock)]:w.getSelectedBlocks(),r=a(n,function(e){return!!E.matchNode(e,t)});return-1!==s(r,d)},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return v(e)},mceBlockQuote:function(){return v("blockquote")},Outdent:function(){var e;if(N.inline_styles){if((e=x.getParent(w.getStart(),x.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return d;if((e=x.getParent(w.getEnd(),x.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return d}return p("InsertUnorderedList")||p("InsertOrderedList")||!N.inline_styles&&!!x.getParent(w.getNode(),"BLOCKQUOTE")},"InsertUnorderedList,InsertOrderedList":function(e){var t=x.getParent(w.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),m({"FontSize,FontName":function(e){var t=0,n;return(n=x.getParent(w.getNode(),"span"))&&(t="fontsize"==e?n.style.fontSize:n.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()),t}},"value"),m({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}),r(O,[p],function(e){function t(e,i){var o=this,a,s;return e=r(e),i=o.settings=i||{},/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)?(o.source=e,void 0):(0===e.indexOf("/")&&0!==e.indexOf("//")&&(e=(i.base_uri?i.base_uri.protocol||"http":"http")+"://mce_host"+e),/^[\w\-]*:?\/\//.test(e)||(s=i.base_uri?i.base_uri.path:new t(location.href).directory,e=(i.base_uri&&i.base_uri.protocol||"http")+"://mce_host"+o.toAbsPath(s,e)),e=e.replace(/@@/g,"(mce_at)"),e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e),n(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(t,n){var r=e[n];r&&(r=r.replace(/\(mce_at\)/g,"@@")),o[t]=r}),a=i.base_uri,a&&(o.protocol||(o.protocol=a.protocol),o.userInfo||(o.userInfo=a.userInfo),o.port||"mce_host"!==o.host||(o.port=a.port),o.host&&"mce_host"!==o.host||(o.host=a.host),o.source=""),void 0)}var n=e.each,r=e.trim;return t.prototype={setPath:function(e){var t=this;e=/^(.*?)\/?(\w+)?$/.exec(e),t.path=e[0],t.directory=e[1],t.file=e[2],t.source="",t.getURI()},toRelative:function(e){var n=this,r;if("./"===e)return e;if(e=new t(e,{base_uri:n}),"mce_host"!=e.host&&n.host!=e.host&&e.host||n.port!=e.port||n.protocol!=e.protocol)return e.getURI();var i=n.getURI(),o=e.getURI();return i==o||"/"==i.charAt(i.length-1)&&i.substr(0,i.length-1)==o?i:(r=n.toRelPath(n.path,e.path),e.query&&(r+="?"+e.query),e.anchor&&(r+="#"+e.anchor),r)},toAbsolute:function(e,n){return e=new t(e,{base_uri:this}),e.getURI(this.host==e.host&&this.protocol==e.protocol?n:0)},toRelPath:function(e,t){var n,r=0,i="",o,a;if(e=e.substring(0,e.lastIndexOf("/")),e=e.split("/"),n=t.split("/"),e.length>=n.length)for(o=0,a=e.length;a>o;o++)if(o>=n.length||e[o]!=n[o]){r=o+1;break}if(e.length<n.length)for(o=0,a=n.length;a>o;o++)if(o>=e.length||e[o]!=n[o]){r=o+1;break}if(1===r)return t;for(o=0,a=e.length-(r-1);a>o;o++)i+="../";for(o=r-1,a=n.length;a>o;o++)i+=o!=r-1?"/"+n[o]:n[o];return i},toAbsPath:function(e,t){var r,i=0,o=[],a,s;for(a=/\/$/.test(t)?"/":"",e=e.split("/"),t=t.split("/"),n(e,function(e){e&&o.push(e)}),e=o,r=t.length-1,o=[];r>=0;r--)0!==t[r].length&&"."!==t[r]&&(".."!==t[r]?i>0?i--:o.push(t[r]):i++);return r=e.length-i,s=0>=r?o.reverse().join("/"):e.slice(0,r).join("/")+"/"+o.reverse().join("/"),0!==s.indexOf("/")&&(s="/"+s),a&&s.lastIndexOf("/")!==s.length-1&&(s+=a),s},getURI:function(e){var t,n=this;return(!n.source||e)&&(t="",e||(n.protocol&&(t+=n.protocol+"://"),n.userInfo&&(t+=n.userInfo+"@"),n.host&&(t+=n.host),n.port&&(t+=":"+n.port)),n.path&&(t+=n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),n.source=t),n.source}},t}),r(I,[p],function(e){function t(){}var n=e.each,r=e.extend,i,o;return t.extend=i=function(e){function t(){var e,t,n,r;if(!o&&(r=this,r.init&&r.init.apply(r,arguments),t=r.Mixins))for(e=t.length;e--;)n=t[e],n.init&&n.init.apply(r,arguments)}function a(){return this}function s(e,t){return function(){var n=this,r=n._super,i;return n._super=c[e],i=t.apply(n,arguments),n._super=r,i}}var l=this,c=l.prototype,u,d,f;o=!0,u=new l,o=!1,e.Mixins&&(n(e.Mixins,function(t){t=t;for(var n in t)"init"!==n&&(e[n]=t[n])}),c.Mixins&&(e.Mixins=c.Mixins.concat(e.Mixins))),e.Methods&&n(e.Methods.split(","),function(t){e[t]=a}),e.Properties&&n(e.Properties.split(","),function(t){var n="_"+t;e[t]=function(e){var t=this,r;return e!==r?(t[n]=e,t):t[n]}}),e.Statics&&n(e.Statics,function(e,n){t[n]=e}),e.Defaults&&c.Defaults&&(e.Defaults=r({},c.Defaults,e.Defaults));for(d in e)f=e[d],u[d]="function"==typeof f&&c[d]?s(d,f):f;return t.prototype=u,t.constructor=t,t.extend=i,t},t}),r(F,[I,p],function(e,t){function n(e){for(var t=[],n=e.length,r;n--;)r=e[n],r.__checked||(t.push(r),r.__checked=1);for(n=t.length;n--;)delete t[n].__checked;return t}var r=/^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,i=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,o=/^\s*|\s*$/g,a,s=e.extend({init:function(e){function t(e){return e?(e=e.toLowerCase(),function(t){return"*"===e||t.type===e}):void 0}function n(e){return e?function(t){return t._name===e}:void 0}function a(e){return e?(e=e.split("."),function(t){for(var n=e.length;n--;)if(!t.hasClass(e[n]))return!1;return!0}):void 0}function s(e,t,n){return e?function(r){var i=r[e]?r[e]():"";return t?"="===t?i===n:"*="===t?i.indexOf(n)>=0:"~="===t?(" "+i+" ").indexOf(" "+n+" ")>=0:"!="===t?i!=n:"^="===t?0===i.indexOf(n):"$="===t?i.substr(i.length-n.length)===n:!1:!!n}:void 0}function l(e){var t;return e?(e=/(?:not\((.+)\))|(.+)/i.exec(e),e[1]?(t=u(e[1],[]),function(e){return!d(e,t)}):(e=e[2],function(t,n,r){return"first"===e?0===n:"last"===e?n===r-1:"even"===e?0===n%2:"odd"===e?1===n%2:t[e]?t[e]():!1})):void 0}function c(e,i,c){function u(e){e&&i.push(e)}var d;return d=r.exec(e.replace(o,"")),u(t(d[1])),u(n(d[2])),u(a(d[3])),u(s(d[4],d[5],d[6])),u(l(d[7])),i.psuedo=!!d[7],i.direct=c,i}function u(e,t){var n=[],r,o,a;do if(i.exec(""),o=i.exec(e),o&&(e=o[3],n.push(o[1]),o[2])){r=o[3];break}while(o);for(r&&u(r,t),e=[],a=0;a<n.length;a++)">"!=n[a]&&e.push(c(n[a],[],">"===n[a-1]));return t.push(e),t}var d=this.match;this._selectors=u(e,[])},match:function(e,n){var r,i,o,a,s,l,c,u,d,f,p,h,m;for(n=n||this._selectors,r=0,i=n.length;i>r;r++){for(s=n[r],a=s.length,m=e,h=0,o=a-1;o>=0;o--)for(u=s[o];m;){for(u.psuedo&&(p=m.parent().items(),d=t.inArray(m,p),f=p.length),l=0,c=u.length;c>l;l++)if(!u[l](m,d,f)){l=c+1;break}if(l===c){h++;break}if(o===a-1)break;m=m.parent()}if(h===a)return!0}return!1},find:function(e){function t(e,n,i){var o,a,s,l,c,u=n[i];for(o=0,a=e.length;a>o;o++){for(c=e[o],s=0,l=u.length;l>s;s++)if(!u[s](c,o,a)){s=l+1;break}if(s===l)i==n.length-1?r.push(c):c.items&&t(c.items(),n,i+1);else if(u.direct)return;c.items&&t(c.items(),n,i)}}var r=[],i,o,l=this._selectors;if(e.items){for(i=0,o=l.length;o>i;i++)t(e.items(),l[i],0);o>1&&(r=n(r))}return a||(a=s.Collection),new a(r)}});return s}),r(W,[p,F,I],function(e,t,n){var r,i,o=Array.prototype.push,a=Array.prototype.slice;return i={length:0,init:function(e){e&&this.add(e)},add:function(t){var n=this;return e.isArray(t)?o.apply(n,t):t instanceof r?n.add(t.toArray()):o.call(n,t),n},set:function(e){var t=this,n=t.length,r;for(t.length=0,t.add(e),r=t.length;n>r;r++)delete t[r];return t},filter:function(e){var n=this,i,o,a=[],s,l;for("string"==typeof e?(e=new t(e),l=function(t){return e.match(t)}):l=e,i=0,o=n.length;o>i;i++)s=n[i],l(s)&&a.push(s);return new r(a)},slice:function(){return new r(a.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},each:function(t){return e.each(this,t),this},toArray:function(){return e.toArray(this)},indexOf:function(e){for(var t=this,n=t.length;n--&&t[n]!==e;);return n},reverse:function(){return new r(e.toArray(this).reverse())},hasClass:function(e){return this[0]?this[0].hasClass(e):!1},prop:function(e,t){var n=this,r,i;return t!==r?(n.each(function(n){n[e]&&n[e](t)}),n):(i=n[0],i&&i[e]?i[e]():void 0)},exec:function(t){var n=this,r=e.toArray(arguments).slice(1);return n.each(function(e){e[t]&&e[t].apply(e,r)}),n}},e.each("fire on off show hide addClass removeClass append prepend before after reflow".split(" "),function(t){i[t]=function(){var n=e.toArray(arguments);return this.each(function(e){t in e&&e[t].apply(e,n)}),this}}),e.each("text name disabled active selected checked visible parent value data".split(" "),function(e){i[e]=function(t){return this.prop(e,t)
-}}),r=n.extend(i),t.Collection=r,r}),r(z,[p,v],function(e,t){return{id:function(){return t.DOM.uniqueId()},createFragment:function(e){return t.DOM.createFragment(e)},getWindowSize:function(){return t.DOM.getViewPort()},getSize:function(e){return t.DOM.getSize(e)},getPos:function(e,n){return t.DOM.getPos(e,n)},getViewPort:function(e){return t.DOM.getViewPort(e)},get:function(e){return document.getElementById(e)},addClass:function(e,n){return t.DOM.addClass(e,n)},removeClass:function(e,n){return t.DOM.removeClass(e,n)},hasClass:function(e,n){return t.DOM.hasClass(e,n)},toggleClass:function(e,n,r){return t.DOM.toggleClass(e,n,r)},css:function(e,n,r){return t.DOM.setStyle(e,n,r)},on:function(e,n,r,i){return t.DOM.bind(e,n,r,i)},off:function(e,n,r){return t.DOM.unbind(e,n,r)},fire:function(e,n,r){return t.DOM.fire(e,n,r)}}}),r(V,[I,p,W,z],function(e,t,n,r){var i=t.makeMap("focusin focusout scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave wheel keydown keypress keyup contextmenu"," "),o={},a="onmousewheel"in document,s=!1,l=e.extend({Statics:{controlIdLookup:{}},classPrefix:"mce-",init:function(e){var n=this,i,o;if(n.settings=e=t.extend({},n.Defaults,e),n._id=r.id(),n._text=n._name="",n._width=n._height=0,n._aria={role:e.role},i=e.classes)for(i=i.split(" "),i.map={},o=i.length;o--;)i.map[i[o]]=!0;n._classes=i||[],n.visible(!0),t.each("title text width height name classes visible disabled active value".split(" "),function(t){var r=e[t],i;r!==i?n[t](r):n["_"+t]===i&&(n["_"+t]=!1)}),n.on("click",function(){return n.disabled()?!1:void 0}),e.classes&&t.each(e.classes.split(" "),function(e){n.addClass(e)}),n.settings=e,n._borderBox=n.parseBox(e.border),n._paddingBox=n.parseBox(e.padding),n._marginBox=n.parseBox(e.margin),e.hidden&&n.hide()},Properties:"parent,title,text,width,height,disabled,active,name,value",Methods:"renderHtml",getContainerElm:function(){return document.body},getParentCtrl:function(e){for(var t;e&&!(t=l.controlIdLookup[e.id]);)e=e.parentNode;return t},parseBox:function(e){var t,n=10;if(e)return"number"==typeof e?(e=e||0,{top:e,left:e,bottom:e,right:e}):(e=e.split(" "),t=e.length,1===t?e[1]=e[2]=e[3]=e[0]:2===t?(e[2]=e[0],e[3]=e[1]):3===t&&(e[3]=e[1]),{top:parseInt(e[0],n)||0,right:parseInt(e[1],n)||0,bottom:parseInt(e[2],n)||0,left:parseInt(e[3],n)||0})},borderBox:function(){return this._borderBox},paddingBox:function(){return this._paddingBox},marginBox:function(){return this._marginBox},measureBox:function(e,t){function n(t){var n=document.defaultView;return n?(t=t.replace(/[A-Z]/g,function(e){return"-"+e}),n.getComputedStyle(e,null).getPropertyValue(t)):e.currentStyle[t]}function r(e){var t=parseInt(n(e),10);return isNaN(t)?0:t}return{top:r(t+"TopWidth"),right:r(t+"RightWidth"),bottom:r(t+"BottomWidth"),left:r(t+"LeftWidth")}},initLayoutRect:function(){var e=this,t=e.settings,n,r,i=e.getEl(),o,a,s,l,c,u,d;n=e._borderBox=e._borderBox||e.measureBox(i,"border"),e._paddingBox=e._paddingBox||e.measureBox(i,"padding"),e._marginBox=e._marginBox||e.measureBox(i,"margin"),u=t.minWidth,d=t.minHeight,s=u||i.offsetWidth,l=d||i.offsetHeight,o=t.width,a=t.height,c=t.autoResize,c="undefined"!=typeof c?c:!o&&!a,o=o||s,a=a||l;var f=n.left+n.right,p=n.top+n.bottom,h=t.maxWidth||65535,m=t.maxHeight||65535;return e._layoutRect=r={x:t.x||0,y:t.y||0,w:o,h:a,deltaW:f,deltaH:p,contentW:o-f,contentH:a-p,innerW:o-f,innerH:a-p,startMinWidth:u||0,startMinHeight:d||0,minW:Math.min(s,h),minH:Math.min(l,m),maxW:h,maxH:m,autoResize:c,scrollW:0},e._lastLayoutRect={},r},layoutRect:function(e){var t=this,n=t._layoutRect,r,i,o,a,s,c;return n||(n=t.initLayoutRect()),e?(o=n.deltaW,a=n.deltaH,e.x!==s&&(n.x=e.x),e.y!==s&&(n.y=e.y),e.minW!==s&&(n.minW=e.minW),e.minH!==s&&(n.minH=e.minH),i=e.w,i!==s&&(i=i<n.minW?n.minW:i,i=i>n.maxW?n.maxW:i,n.w=i,n.innerW=i-o),i=e.h,i!==s&&(i=i<n.minH?n.minH:i,i=i>n.maxH?n.maxH:i,n.h=i,n.innerH=i-a),i=e.innerW,i!==s&&(i=i<n.minW-o?n.minW-o:i,i=i>n.maxW-o?n.maxW-o:i,n.innerW=i,n.w=i+o),i=e.innerH,i!==s&&(i=i<n.minH-a?n.minH-a:i,i=i>n.maxH-a?n.maxH-a:i,n.innerH=i,n.h=i+a),e.contentW!==s&&(n.contentW=e.contentW),e.contentH!==s&&(n.contentH=e.contentH),r=t._lastLayoutRect,(r.x!==n.x||r.y!==n.y||r.w!==n.w||r.h!==n.h)&&(c=l.repaintControls,c&&c.map&&!c.map[t._id]&&(c.push(t),c.map[t._id]=!0),r.x=n.x,r.y=n.y,r.w=n.w,r.h=n.h),t):n},repaint:function(){var e=this,t,n,r,i,o=0,a=0,s;t=e.getEl().style,r=e._layoutRect,s=e._lastRepaintRect||{},i=e._borderBox,o=i.left+i.right,a=i.top+i.bottom,r.x!==s.x&&(t.left=r.x+"px",s.x=r.x),r.y!==s.y&&(t.top=r.y+"px",s.y=r.y),r.w!==s.w&&(t.width=r.w-o+"px",s.w=r.w),r.h!==s.h&&(t.height=r.h-a+"px",s.h=r.h),e._hasBody&&r.innerW!==s.innerW&&(n=e.getEl("body").style,n.width=r.innerW+"px",s.innerW=r.innerW),e._hasBody&&r.innerH!==s.innerH&&(n=n||e.getEl("body").style,n.height=r.innerH+"px",s.innerH=r.innerH),e._lastRepaintRect=s,e.fire("repaint",{},!1)},on:function(e,t){function n(e){var t,n;return function(i){return t||r.parents().each(function(r){var i=r.settings.callbacks;return i&&(t=i[e])?(n=r,!1):void 0}),t.call(n,i)}}var r=this,o,a,s,l;if(t)for("string"==typeof t&&(t=n(t)),s=e.toLowerCase().split(" "),l=s.length;l--;)e=s[l],o=r._bindings,o||(o=r._bindings={}),a=o[e],a||(a=o[e]=[]),a.push(t),i[e]&&(r._nativeEvents?r._nativeEvents[e]=!0:r._nativeEvents={name:!0},r._rendered&&r.bindPendingEvents());return r},off:function(e,t){var n=this,r,i=n._bindings,o,a,s,l;if(i)if(e)for(s=e.toLowerCase().split(" "),r=s.length;r--;){if(e=s[r],o=i[e],!e){for(a in i)i[a].length=0;return n}if(o)if(t)for(l=o.length;l--;)o[l]===t&&o.splice(l,1);else o.length=0}else n._bindings=[];return n},fire:function(e,t,n){function r(){return!1}function i(){return!0}var o=this,a,s,l,c;if(e=e.toLowerCase(),t=t||{},t.type||(t.type=e),t.control||(t.control=o),t.preventDefault||(t.preventDefault=function(){t.isDefaultPrevented=i},t.stopPropagation=function(){t.isPropagationStopped=i},t.stopImmediatePropagation=function(){t.isImmediatePropagationStopped=i},t.isDefaultPrevented=r,t.isPropagationStopped=r,t.isImmediatePropagationStopped=r),o._bindings&&(l=o._bindings[e]))for(a=0,s=l.length;s>a&&(t.isImmediatePropagationStopped()||l[a].call(o,t)!==!1);a++);if(n!==!1)for(c=o.parent();c&&!t.isPropagationStopped();)c.fire(e,t,!1),c=c.parent();return t},parents:function(e){var t=this,r=new n;for(t=t.parent();t;t=t.parent())r.add(t);return e&&(r=r.filter(e)),r},next:function(){var e=this.parent().items();return e[e.indexOf(this)+1]},prev:function(){var e=this.parent().items();return e[e.indexOf(this)-1]},findCommonAncestor:function(e,t){for(var n;e;){for(n=t;n&&e!=n;)n=n.parent();if(e==n)break;e=e.parent()}return e},hasClass:function(e,t){var n=this._classes[t||"control"];return e=this.classPrefix+e,n&&!!n.map[e]},addClass:function(e,t){var n=this,r,i;return e=this.classPrefix+e,r=n._classes[t||"control"],r||(r=[],r.map={},n._classes[t||"control"]=r),r.map[e]||(r.map[e]=e,r.push(e),n._rendered&&(i=n.getEl(t),i&&(i.className=r.join(" ")))),n},removeClass:function(e,t){var n=this,r,i,o;if(e=this.classPrefix+e,r=n._classes[t||"control"],r&&r.map[e])for(delete r.map[e],i=r.length;i--;)r[i]===e&&r.splice(i,1);return n._rendered&&(o=n.getEl(t),o&&(o.className=r.join(" "))),n},toggleClass:function(e,t,n){var r=this;return t?r.addClass(e,n):r.removeClass(e,n),r},classes:function(e){var t=this._classes[e||"control"];return t?t.join(" "):""},getEl:function(e,t){var n,i=e?this._id+"-"+e:this._id;return n=o[i]=(t===!0?null:o[i])||r.get(i)},visible:function(e){var t=this,n;return"undefined"!=typeof e?(t._visible!==e&&(t._rendered&&(t.getEl().style.display=e?"":"none"),t._visible=e,n=t.parent(),n&&(n._lastRect=null),t.fire(e?"show":"hide")),t):t._visible},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(e){}return this},blur:function(){return this.getEl().blur(),this},aria:function(e,t){var n=this,r=n.getEl();return"undefined"==typeof t?n._aria[e]:(n._aria[e]=t,n._rendered&&("label"==e&&r.setAttribute("aria-labeledby",n._id),r.setAttribute("role"==e?e:"aria-"+e,t)),n)},encode:function(e,t){return t!==!1&&l.translate&&(e=l.translate(e)),(e||"").replace(/[&<>"]/g,function(e){return"&#"+e.charCodeAt(0)+";"})},before:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t),!0),t},after:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t)),t},remove:function(){var e=this,t=e.getEl(),n=e.parent(),i;if(e.items)for(var o=e.items().toArray(),a=o.length;a--;)o[a].remove();return n&&n.items&&(i=[],n.items().each(function(t){t!==e&&i.push(t)}),n.items().set(i),n._lastRect=null),e._eventsRoot&&e._eventsRoot==e&&r.off(t),delete l.controlIdLookup[e._id],t.parentNode&&t.parentNode.removeChild(t),e},renderBefore:function(e){var t=this;return e.parentNode.insertBefore(r.createFragment(t.renderHtml()),e),t.postRender(),t},renderTo:function(e){var t=this;return e=e||t.getContainerElm(),e.appendChild(r.createFragment(t.renderHtml())),t.postRender(),t},postRender:function(){var e=this,t=e.settings,n,i,o,a,s;for(a in t)0===a.indexOf("on")&&e.on(a.substr(2),t[a]);if(e._eventsRoot){for(o=e.parent();!s&&o;o=o.parent())s=o._eventsRoot;if(s)for(a in s._nativeEvents)e._nativeEvents[a]=!0}e.bindPendingEvents(),t.style&&(n=e.getEl(),n&&(n.setAttribute("style",t.style),n.style.cssText=t.style)),e._visible||r.css(e.getEl(),"display","none"),e.settings.border&&(i=e.borderBox(),r.css(e.getEl(),{"border-top-width":i.top,"border-right-width":i.right,"border-bottom-width":i.bottom,"border-left-width":i.left})),l.controlIdLookup[e._id]=e;for(var c in e._aria)e.aria(c,e._aria[c]);e.fire("postrender",{},!1)},scrollIntoView:function(e){function t(e,t){var n,r,i=e;for(n=r=0;i&&i!=t&&i.nodeType;)n+=i.offsetLeft||0,r+=i.offsetTop||0,i=i.offsetParent;return{x:n,y:r}}var n=this.getEl(),r=n.parentNode,i,o,a,s,l,c,u=t(n,r);return i=u.x,o=u.y,a=n.offsetWidth,s=n.offsetHeight,l=r.clientWidth,c=r.clientHeight,"end"==e?(i-=l-a,o-=c-s):"center"==e&&(i-=l/2-a/2,o-=c/2-s/2),r.scrollLeft=i,r.scrollTop=o,this},bindPendingEvents:function(){function e(e){var t=o.getParentCtrl(e.target);t&&t.fire(e.type,e)}function t(){var e=d._lastHoverCtrl;e&&(e.fire("mouseleave",{target:e.getEl()}),e.parents().each(function(e){e.fire("mouseleave",{target:e.getEl()})}),d._lastHoverCtrl=null)}function n(e){var t=o.getParentCtrl(e.target),n=d._lastHoverCtrl,r=0,i,a,s;if(t!==n){if(d._lastHoverCtrl=t,a=t.parents().toArray().reverse(),a.push(t),n){for(s=n.parents().toArray().reverse(),s.push(n),r=0;r<s.length&&a[r]===s[r];r++);for(i=s.length-1;i>=r;i--)n=s[i],n.fire("mouseleave",{target:n.getEl()})}for(i=r;i<a.length;i++)t=a[i],t.fire("mouseenter",{target:t.getEl()})}}function i(e){e.preventDefault(),"mousewheel"==e.type?(e.deltaY=-1/40*e.wheelDelta,e.wheelDeltaX&&(e.deltaX=-1/40*e.wheelDeltaX)):(e.deltaX=0,e.deltaY=e.detail),e=o.fire("wheel",e)}var o=this,l,c,u,d,f,p;if(o._rendered=!0,f=o._nativeEvents){for(u=o.parents().toArray(),u.unshift(o),l=0,c=u.length;!d&&c>l;l++)d=u[l]._eventsRoot;for(d||(d=u[u.length-1]||o),o._eventsRoot=d,c=l,l=0;c>l;l++)u[l]._eventsRoot=d;for(p in f){if(!f)return!1;"wheel"!==p||s?("mouseenter"===p||"mouseleave"===p?d._hasMouseEnter||(r.on(d.getEl(),"mouseleave",t),r.on(d.getEl(),"mouseover",n),d._hasMouseEnter=1):d[p]||(r.on(d.getEl(),p,e),d[p]=!0),f[p]=!1):a?r.on(o.getEl(),"mousewheel",i):r.on(o.getEl(),"DOMMouseScroll",i)}}},reflow:function(){return this.repaint(),this}});return l}),r(U,[],function(){var e={},t;return{add:function(t,n){e[t.toLowerCase()]=n},has:function(t){return!!e[t.toLowerCase()]},create:function(n,r){var i,o,a;if(!t){a=tinymce.ui;for(o in a)e[o.toLowerCase()]=a[o];t=!0}if("string"==typeof n?(r=r||{},r.type=n):(r=n,n=r.type),n=n.toLowerCase(),i=e[n],!i)throw new Error("Could not find control by type: "+n);return i=new i(r),i.type=n,i}}}),r(q,[V,W,F,U,p,z],function(e,t,n,r,i,o){var a={};return e.extend({layout:"",innerClass:"container-inner",init:function(e){var n=this;n._super(e),e=n.settings,n._fixed=e.fixed,n._items=new t,n.addClass("container"),n.addClass("container-body","body"),e.containerCls&&n.addClass(e.containerCls),n._layout=r.create((e.layout||n.layout)+"layout"),n.settings.items&&n.add(n.settings.items),n._hasBody=!0},items:function(){return this._items},find:function(e){return e=a[e]=a[e]||new n(e),e.find(this)},add:function(e){var t=this;return t.items().add(t.create(e)).parent(t),t},focus:function(){var e=this;return e.keyNav?e.keyNav.focusFirst():e._super(),e},replace:function(e,t){for(var n,r=this.items(),i=r.length;i--;)if(r[i]===e){r[i]=t;break}i>=0&&(n=t.getEl(),n&&n.parentNode.removeChild(n),n=e.getEl(),n&&n.parentNode.removeChild(n)),t.parent(this)},create:function(t){var n=this,o,a=[];return i.isArray(t)||(t=[t]),i.each(t,function(t){t&&(t instanceof e||("string"==typeof t&&(t={type:t}),o=i.extend({},n.settings.defaults,t),t.type=o.type=o.type||t.type||n.settings.defaultType||(o.defaults?o.defaults.type:null),t=r.create(o)),a.push(t))}),a},renderNew:function(){var e=this;return e.items().each(function(t,n){var r,i;t.parent(e),t._rendered||(r=e.getEl("body"),i=o.createFragment(t.renderHtml()),r.hasChildNodes()&&n<=r.childNodes.length-1?r.insertBefore(i,r.childNodes[n]):r.appendChild(i),t.postRender())}),e._layout.applyClasses(e),e._lastRect=null,e},append:function(e){return this.add(e).renderNew()},prepend:function(e){var t=this;return t.items().set(t.create(e).concat(t.items().toArray())),t.renderNew()},insert:function(e,t,n){var r=this,i,o,a;return e=r.create(e),i=r.items(),!n&&t<i.length-1&&(t+=1),t>=0&&t<i.length&&(o=i.slice(0,t).toArray(),a=i.slice(t).toArray(),i.set(o.concat(e,a))),r.renderNew()},fromJSON:function(e){var t=this;for(var n in e)t.find("#"+n).value(e[n]);return t},toJSON:function(){var e=this,t={};return e.find("*").each(function(e){var n=e.name(),r=e.value();n&&"undefined"!=typeof r&&(t[n]=r)}),t},preRender:function(){},renderHtml:function(){var e=this,t=e._layout;return e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes()+'" role="'+this.settings.role+'">'+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div>"+"</div>"},postRender:function(){var e=this,t;return e.items().exec("postRender"),e._super(),e._layout.postRender(e),e._rendered=!0,e.settings.style&&o.css(e.getEl(),e.settings.style),e.settings.border&&(t=e.borderBox(),o.css(e.getEl(),{"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left})),e},initLayoutRect:function(){var e=this,t=e._super();return e._layout.recalc(e),t},recalc:function(){var e=this,t=e._layoutRect,n=e._lastRect;return n&&n.w==t.w&&n.h==t.h?void 0:(e._layout.recalc(e),t=e.layoutRect(),e._lastRect={x:t.x,y:t.y,w:t.w,h:t.h},!0)},reflow:function(){var t,n;if(this.visible()){for(e.repaintControls=[],e.repaintControls.map={},n=this.recalc(),t=e.repaintControls.length;t--;)e.repaintControls[t].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),e.repaintControls=[]}return this}})}),r($,[z],function(e){function t(){var e=document,t,n,r,i,o,a,s,l,c=Math.max;return t=e.documentElement,n=e.body,r=c(t.scrollWidth,n.scrollWidth),i=c(t.clientWidth,n.clientWidth),o=c(t.offsetWidth,n.offsetWidth),a=c(t.scrollHeight,n.scrollHeight),s=c(t.clientHeight,n.clientHeight),l=c(t.offsetHeight,n.offsetHeight),{width:o>r?i:r,height:l>a?s:a}}return function(n,r){function i(){return a.getElementById(r.handle||n)}var o,a=document,s,l,c,u,d,f;r=r||{},l=function(n){var l=t(),p,h;n.preventDefault(),s=n.button,p=i(),d=n.screenX,f=n.screenY,h=window.getComputedStyle?window.getComputedStyle(p,null).getPropertyValue("cursor"):p.runtimeStyle.cursor,o=a.createElement("div"),e.css(o,{position:"absolute",top:0,left:0,width:l.width,height:l.height,zIndex:2147483647,opacity:1e-4,background:"red",cursor:h}),a.body.appendChild(o),e.on(a,"mousemove",u),e.on(a,"mouseup",c),r.start(n)},u=function(e){return e.button!==s?c(e):(e.deltaX=e.screenX-d,e.deltaY=e.screenY-f,e.preventDefault(),r.drag(e),void 0)},c=function(t){e.off(a,"mousemove",u),e.off(a,"mouseup",c),o.parentNode.removeChild(o),r.stop&&r.stop(t)},this.destroy=function(){e.off(i())},e.on(i(),"mousedown",l)}}),r(j,[z,$],function(e,t){return{init:function(){var e=this;e.on("repaint",e.renderScroll)},renderScroll:function(){function n(){function t(t,a,s,l,c,u){var d,f,p,h,m,g,v,y,b;if(f=i.getEl("scroll"+t)){if(y=a.toLowerCase(),b=s.toLowerCase(),i.getEl("absend")&&e.css(i.getEl("absend"),y,i.layoutRect()[l]-1),!c)return e.css(f,"display","none"),void 0;e.css(f,"display","block"),d=i.getEl("body"),p=i.getEl("scroll"+t+"t"),h=d["client"+s]-2*o,h-=n&&r?f["client"+u]:0,m=d["scroll"+s],g=h/m,v={},v[y]=d["offset"+a]+o,v[b]=h,e.css(f,v),v={},v[y]=d["scroll"+a]*g,v[b]=h*g,e.css(p,v)}}var n,r,a;a=i.getEl("body"),n=a.scrollWidth>a.clientWidth,r=a.scrollHeight>a.clientHeight,t("h","Left","Width","contentW",n,"Height"),t("v","Top","Height","contentH",r,"Width")}function r(){function n(n,r,a,s,l){var c,u=i._id+"-scroll"+n,d=i.classPrefix;i.getEl().appendChild(e.createFragment('<div id="'+u+'" class="'+d+"scrollbar "+d+"scrollbar-"+n+'">'+'<div id="'+u+'t" class="'+d+'scrollbar-thumb"></div>'+"</div>")),i.draghelper=new t(u+"t",{start:function(){c=i.getEl("body")["scroll"+r],e.addClass(e.get(u),d+"active")},drag:function(e){var t,u,d,f,p=i.layoutRect();u=p.contentW>p.innerW,d=p.contentH>p.innerH,f=i.getEl("body")["client"+a]-2*o,f-=u&&d?i.getEl("scroll"+n)["client"+l]:0,t=f/i.getEl("body")["scroll"+a],i.getEl("body")["scroll"+r]=c+e["delta"+s]/t},stop:function(){e.removeClass(e.get(u),d+"active")}})}i.addClass("scroll"),n("v","Top","Height","Y","Width"),n("h","Left","Width","X","Height")}var i=this,o=2;i.settings.autoScroll&&(i._hasScroll||(i._hasScroll=!0,r(),i.on("wheel",function(e){var t=i.getEl("body");t.scrollLeft+=10*(e.deltaX||0),t.scrollTop+=10*e.deltaY,n()}),e.on(i.getEl("body"),"scroll",n)),n())}}}),r(K,[q,j],function(e,t){return e.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[t],renderHtml:function(){var e=this,t=e._layout,n=e.settings.html;return e.preRender(),t.preRender(e),"undefined"==typeof n?n='<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+t.renderHtml(e)+"</div>":("function"==typeof n&&(n=n.call(e)),e._hasBody=!1),'<div id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+(e._preBodyHtml||"")+n+"</div>"}})}),r(G,[z],function(e){function t(t,n,r){var i,o,a,s,l,c,u,d,f;return f=e.getViewPort(),o=e.getPos(n),a=o.x,s=o.y,t._fixed&&(a-=f.x,s-=f.y),i=t.getEl(),l=i.offsetWidth,c=i.offsetHeight,u=n.offsetWidth,d=n.offsetHeight,r=(r||"").split(""),"b"===r[0]&&(s+=d),"r"===r[1]&&(a+=u),"c"===r[0]&&(s+=Math.round(d/2)),"c"===r[1]&&(a+=Math.round(u/2)),"b"===r[3]&&(s-=c),"r"===r[4]&&(a-=l),"c"===r[3]&&(s-=Math.round(c/2)),"c"===r[4]&&(a-=Math.round(l/2)),{x:a,y:s,w:l,h:c}}return{testMoveRel:function(n,r){for(var i=e.getViewPort(),o=0;o<r.length;o++){var a=t(this,n,r[o]);if(this._fixed){if(a.x>0&&a.x+a.w<i.w&&a.y>0&&a.y+a.h<i.h)return r[o]}else if(a.x>i.x&&a.x+a.w<i.w+i.x&&a.y>i.y&&a.y+a.h<i.h+i.y)return r[o]}return r[0]},moveRel:function(e,n){"string"!=typeof n&&(n=this.testMoveRel(e,n));var r=t(this,e,n);return this.moveTo(r.x,r.y)},moveBy:function(e,t){var n=this,r=n.layoutRect();return n.moveTo(r.x+e,r.y+t),n},moveTo:function(t,n){function r(e,t,n){return 0>e?0:e+n>t?(e=t-n,0>e?0:e):e}var i=this;if(i.settings.constrainToViewport){var o=e.getViewPort(window),a=i.layoutRect();t=r(t,o.w+o.x,a.w),n=r(n,o.h+o.y,a.h)}return i._rendered?i.layoutRect({x:t,y:n}).repaint():(i.settings.x=t,i.settings.y=n),i.fire("move",{x:t,y:n}),i}}}),r(Y,[z],function(e){return{resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(t,n){if(1>=t||1>=n){var r=e.getWindowSize();t=1>=t?t*r.w:t,n=1>=n?n*r.h:n}return this._layoutRect.autoResize=!1,this.layoutRect({minW:t,minH:n,w:t,h:n}).reflow()},resizeBy:function(e,t){var n=this,r=n.layoutRect();return n.resizeTo(r.w+e,r.h+t)}}}),r(X,[K,G,Y,z],function(e,t,n,r){function i(e){var t;for(t=s.length;t--;)s[t]===e&&s.splice(t,1)}var o,a,s=[],l=[],c,u=e.extend({Mixins:[t,n],init:function(e){function t(){var e,t=u.zIndex||65535,n;if(l.length)for(e=0;e<l.length;e++)l[e].modal&&(t++,n=l[e]),l[e].getEl().style.zIndex=t,l[e].zIndex=t,t++;var i=document.getElementById(d.classPrefix+"modal-block");n?r.css(i,"z-index",n.zIndex-1):i&&(i.parentNode.removeChild(i),c=!1),u.currentZIndex=t}function n(e,t){for(;e;){if(e==t)return!0;e=e.parent()}}function i(e){function t(t,n){for(var r,i=0;i<s.length;i++)if(s[i]!=e)for(r=s[i].parent();r&&(r=r.parent());)r==e&&s[i].fixed(t).moveBy(0,n).repaint()}var n=r.getViewPort().y;e.settings.autofix&&(e._fixed?e._autoFixY>n&&(e.fixed(!1).layoutRect({y:e._autoFixY}).repaint(),t(!1,e._autoFixY-n)):(e._autoFixY=e.layoutRect().y,e._autoFixY<n&&(e.fixed(!0).layoutRect({y:0}).repaint(),t(!0,n-e._autoFixY))))}var d=this;d._super(e),d._eventsRoot=d,d.addClass("floatpanel"),e.autohide&&(o||(o=function(e){var t,r=d.getParentCtrl(e.target);for(t=s.length;t--;){var i=s[t];if(i.settings.autohide){if(r&&(n(r,i)||i.parent()===r))continue;e=i.fire("autohide",{target:e.target}),e.isDefaultPrevented()||i.hide()}}},r.on(document,"click",o)),s.push(d)),e.autofix&&(a||(a=function(){var e;for(e=s.length;e--;)i(s[e])},r.on(window,"scroll",a)),d.on("move",function(){i(this)})),d.on("postrender show",function(e){if(e.control==d){var n,i=d.classPrefix;d.modal&&!c&&(n=r.createFragment('<div id="'+i+'modal-block" class="'+i+"reset "+i+'fade"></div>'),n=n.firstChild,d.getContainerElm().appendChild(n),setTimeout(function(){r.addClass(n,i+"in"),r.addClass(d.getEl(),i+"in")},0),c=!0),l.push(d),t()}}),d.on("close hide",function(e){if(e.control==d){for(var n=l.length;n--;)l[n]===d&&l.splice(n,1);t()}}),d.on("show",function(){d.parents().each(function(e){return e._fixed?(d.fixed(!0),!1):void 0})}),e.popover&&(d._preBodyHtml='<div class="'+d.classPrefix+'arrow"></div>',d.addClass("popover").addClass("bottom").addClass("start"))},fixed:function(e){var t=this;if(t._fixed!=e){if(t._rendered){var n=r.getViewPort();e?t.layoutRect().y-=n.y:t.layoutRect().y+=n.y}t.toggleClass("fixed",e),t._fixed=e}return t},show:function(){var e=this,t,n=e._super();for(t=s.length;t--&&s[t]!==e;);return-1===t&&s.push(e),n},hide:function(){return i(this),this._super()},hideAll:function(){u.hideAll()},close:function(){var e=this;return e.fire("close"),e.remove()},remove:function(){i(this),this._super()}});return u.hideAll=function(){for(var e=s.length;e--;){var t=s[e];t.settings.autohide&&(t.fire("cancel",{},!1),t.hide(),s.splice(e,1))}},u}),r(J,[z],function(e){return function(t){function n(){if(!h)if(h=[],d.find)d.find("*").each(function(e){e.canFocus&&h.push(e.getEl())});else for(var e=d.getEl().getElementsByTagName("*"),t=0;t<e.length;t++)e[t].id&&e[t]&&h.push(e[t])}function r(){return document.getElementById(m)}function i(e){return e=e||r(),e&&e.getAttribute("role")}function o(e){for(var t,n=e||r();n=n.parentNode;)if(t=i(n))return t}function a(e){var t=document.getElementById(m);return t?t.getAttribute("aria-"+e):void 0}function s(){var n=r();if(!n||"TEXTAREA"!=n.nodeName&&"text"!=n.type)return t.onAction?t.onAction(m):e.fire(r(),"click",{keyboard:!0}),!0}function l(){var e;t.onCancel?((e=r())&&e.blur(),t.onCancel()):t.root.fire("cancel")}function c(e){function r(e){for(var t=d?d.getEl():document.body;e&&e!=t;){if("none"==e.style.display)return!1;e=e.parentNode}return!0}var i=-1,o,a,l=[];for(n(),a=l.length,a=0;a<h.length;a++)r(h[a])&&l.push(h[a]);for(a=l.length;a--;)if(l[a].id===m){i=a;break}i+=e,0>i?i=l.length-1:i>=l.length&&(i=0),o=l[i],o.focus(),m=o.id,t.actOnFocus&&s()}function u(){var e,r;for(r=i(t.root.getEl()),n(),e=h.length;e--;)if("toolbar"==r&&h[e].id===m)return h[e].focus(),void 0;h[0].focus()}var d=t.root,f=t.enableUpDown!==!1,p=t.enableLeftRight!==!1,h=t.items,m;return d.on("keydown",function(e){var n=37,r=39,u=38,d=40,h=27,m=14,g=13,v=32,y=9,b;switch(e.keyCode){case n:p&&(t.leftAction?t.leftAction():c(-1),b=!0);break;case r:p&&("menuitem"==i()&&"menu"==o()?a("haspopup")&&s():c(1),b=!0);break;case u:f&&(c(-1),b=!0);break;case d:f&&("menuitem"==i()&&"menubar"==o()?s():"button"==i()&&a("haspopup")?s():c(1),b=!0);break;case y:b=!0,e.shiftKey?c(-1):c(1);break;case h:b=!0,l();break;case m:case g:case v:b=s()}b&&(e.stopPropagation(),e.preventDefault())}),d.on("focusin",function(e){n(),m=e.target.id}),{moveFocus:c,focusFirst:u,cancel:l}}}),r(Q,[X,K,z,J,$],function(e,t,n,r,i){var o=e.extend({modal:!0,Defaults:{border:1,layout:"flex",containerCls:"panel",role:"dialog",callbacks:{submit:function(){this.fire("submit",{data:this.toJSON()})},close:function(){this.close()}}},init:function(e){var n=this;n._super(e),n.addClass("window"),n._fixed=!0,e.buttons&&(n.statusbar=new t({layout:"flex",border:"1 0 0 0",spacing:3,padding:10,align:"center",pack:"end",defaults:{type:"button"},items:e.buttons}),n.statusbar.addClass("foot"),n.statusbar.parent(n)),n.on("click",function(e){-1!=e.target.className.indexOf(n.classPrefix+"close")&&n.close()}),n.aria("label",e.title),n._fullscreen=!1},recalc:function(){var e=this,t=e.statusbar,r,i,o;e._fullscreen&&(e.layoutRect(n.getWindowSize()),e.layoutRect().contentH=e.layoutRect().innerH),e._super(),r=e.layoutRect(),e.settings.title&&!e._fullscreen&&(i=r.headerW,i>r.w&&(e.layoutRect({w:i}),o=!0)),t&&(t.layoutRect({w:e.layoutRect().innerW}).recalc(),i=t.layoutRect().minW+r.deltaW,i>r.w&&(e.layoutRect({w:i}),o=!0)),o&&e.recalc()},initLayoutRect:function(){var e=this,t=e._super(),r=0,i;e.settings.title&&!e._fullscreen&&(i=e.getEl("head"),t.headerW=i.offsetWidth,t.headerH=i.offsetHeight,r+=t.headerH),e.statusbar&&(r+=e.statusbar.layoutRect().h),t.deltaH+=r,t.minH+=r,t.h+=r;var o=n.getWindowSize();return t.x=Math.max(0,o.w/2-t.w/2),t.y=Math.max(0,o.h/2-t.h/2),t},renderHtml:function(){var e=this,t=e._layout,n=e._id,r=e.classPrefix,i=e.settings,o="",a="",s=i.html;return e.preRender(),t.preRender(e),i.title&&(o='<div id="'+n+'-head" class="'+r+'window-head">'+'<div class="'+r+'title">'+e.encode(i.title)+"</div>"+'<button type="button" class="'+r+'close" aria-hidden="true">&times;</button>'+'<div id="'+n+'-dragh" class="'+r+'dragh"></div>'+"</div>"),i.url&&(s='<iframe src="'+i.url+'" tabindex="-1"></iframe>'),"undefined"==typeof s&&(s=t.renderHtml(e)),e.statusbar&&(a=e.statusbar.renderHtml()),'<div id="'+n+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+o+'<div id="'+n+'-body" class="'+e.classes("body")+'">'+s+"</div>"+a+"</div>"},fullscreen:function(e){var t=this,r=document.documentElement,i,o=t.classPrefix,a;if(e!=t._fullscreen)if(n.on(window,"resize",function(){var e;if(t._fullscreen)if(i)t._timer||(t._timer=setTimeout(function(){var e=n.getWindowSize();t.moveTo(0,0).resizeTo(e.w,e.h),t._timer=0},50));else{e=(new Date).getTime();var r=n.getWindowSize();t.moveTo(0,0).resizeTo(r.w,r.h),(new Date).getTime()-e>50&&(i=!0)}}),a=t.layoutRect(),t._fullscreen=e,e){t._initial={x:a.x,y:a.y,w:a.w,h:a.h},t._borderBox=t.parseBox("0"),t.getEl("head").style.display="none",a.deltaH-=a.headerH+2,n.addClass(r,o+"fullscreen"),n.addClass(document.body,o+"fullscreen"),t.addClass("fullscreen");var s=n.getWindowSize();t.moveTo(0,0).resizeTo(s.w,s.h)}else t._borderBox=t.parseBox(t.settings.border),t.getEl("head").style.display="",a.deltaH+=a.headerH,n.removeClass(r,o+"fullscreen"),n.removeClass(document.body,o+"fullscreen"),t.removeClass("fullscreen"),t.moveTo(t._initial.x,t._initial.y).resizeTo(t._initial.w,t._initial.h);return t.reflow()},postRender:function(){var e=this,t=[],n,o,a;setTimeout(function(){e.addClass("in")},0),e.keyboardNavigation=new r({root:e,enableLeftRight:!1,enableUpDown:!1,items:t,onCancel:function(){e.close()}}),e.find("*").each(function(e){e.canFocus&&(o=o||e.settings.autofocus,n=n||e,"filepicker"==e.type?(t.push(e.getEl("inp")),e.getEl("open")&&t.push(e.getEl("open").firstChild)):t.push(e.getEl()))}),e.statusbar&&e.statusbar.find("*").each(function(e){e.canFocus&&(o=o||e.settings.autofocus,n=n||e,t.push(e.getEl()))}),e._super(),e.statusbar&&e.statusbar.postRender(),!o&&n&&n.focus(),this.dragHelper=new i(e._id+"-dragh",{start:function(){a={x:e.layoutRect().x,y:e.layoutRect().y}},drag:function(t){e.moveTo(a.x+t.deltaX,a.y+t.deltaY)}}),e.on("submit",function(t){t.isDefaultPrevented()||e.close()})},submit:function(){var e=this.getParentCtrl(document.activeElement);return e&&e.blur(),this.fire("submit",{data:this.toJSON()})},remove:function(){var e=this;e._super(),e.dragHelper.destroy(),e.statusbar&&this.statusbar.remove()}});return o}),r(Z,[Q],function(e){var t=e.extend({init:function(e){e={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(e)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(n){var r,i=n.callback||function(){};switch(n.buttons){case t.OK_CANCEL:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close(),i(!0)}},{type:"button",text:"Cancel",onClick:function(e){e.control.parents()[1].close(),i(!1)}}];break;case t.YES_NO:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close(),i(!0)}}];break;case t.YES_NO_CANCEL:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close()}}];break;default:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close()}}]}return new e({padding:20,x:n.x,y:n.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:r,title:n.title,items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:n.text},onClose:n.onClose}).renderTo(document.body).reflow()},alert:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,t.msgBox(e)},confirm:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,e.buttons=t.OK_CANCEL,t.msgBox(e)}}});return t}),r(et,[Q,Z],function(e,t){return function(n){var r=this,i=[];r.windows=i,r.open=function(t,r){var o;return t.url=t.url||t.file,t.url&&(t.width=parseInt(t.width||320,10),t.height=parseInt(t.height||240,10)),t.body&&(t.items={defaults:t.defaults,type:t.bodyType||"form",items:t.body}),t.url||t.buttons||(t.buttons=[{text:"Ok",subtype:"primary",onclick:function(){o.find("form")[0].submit(),o.close()}},{text:"Cancel",onclick:function(){o.close()}}]),o=new e(t),i.push(o),o.on("close",function(){for(var e=i.length;e--;)i[e]===o&&i.splice(e,1);n.focus()}),t.data&&o.on("postRender",function(){this.find("*").each(function(e){var n=e.name();n in t.data&&e.value(t.data[n])})}),o.params=r||{},n.nodeChanged(),o.renderTo(document.body).reflow()},r.alert=function(e,n,r){t.alert(e,function(){n.call(r||this)})},r.confirm=function(e,n,r){t.confirm(e,function(e){n.call(r||this,e)})},r.close=function(){i.length&&i[i.length-1].close()},r.getParams=function(){return i.length?i[i.length-1].params:null},r.setParams=function(e){i.length&&(i[i.length-1].params=e)}}}),r(tt,[T,B,C,m,g,p],function(e,t,n,r,i,o){return function(a){function s(e,t){try{a.getDoc().execCommand(e,!1,t)}catch(n){}}function l(){var e=a.getDoc().documentMode;return e?e:6}function c(e){return e.isDefaultPrevented()}function u(){function t(e){function t(){if(3==l.nodeType){if(e&&c==l.length)return!0;if(!e&&0===c)return!0}}var n,r,i,s,l,c,u;n=F.getRng();var d=[n.startContainer,n.startOffset,n.endContainer,n.endOffset];if(n.collapsed||(e=!0),l=n[(e?"start":"end")+"Container"],c=n[(e?"start":"end")+"Offset"],3==l.nodeType&&(r=I.getParent(n.startContainer,I.isBlock),e&&(r=I.getNext(r,I.isBlock)),!r||!t()&&n.collapsed||(i=I.create("em",{id:"__mceDel"}),H(o.grep(r.childNodes),function(e){i.appendChild(e)}),r.appendChild(i))),n=I.createRng(),n.setStart(d[0],d[1]),n.setEnd(d[2],d[3]),F.setRng(n),a.getDoc().execCommand(e?"ForwardDelete":"Delete",!1,null),i){for(s=F.getBookmark();u=I.get("__mceDel");)I.remove(u,!0);
-F.moveToBookmark(s)}}a.on("keydown",function(n){var r;r=n.keyCode==O,c(n)||!r&&n.keyCode!=P||e.modifierPressed(n)||(n.preventDefault(),t(r))}),a.addCommand("Delete",function(){t()})}function d(){function e(e){var t=I.create("body"),n=e.cloneContents();return t.appendChild(n),F.serializer.serialize(t,{format:"html"})}function t(t){var n=e(t),r=I.createRng();r.selectNode(a.getBody());var i=e(r);return n===i}a.on("keydown",function(e){var n=e.keyCode,r;if(!c(e)&&(n==O||n==P)){if(r=a.selection.isCollapsed(),r&&!I.isEmpty(a.getBody()))return;if(q&&!r)return;if(!r&&!t(a.selection.getRng()))return;e.preventDefault(),a.setContent(""),a.selection.setCursorLocation(a.getBody(),0),a.nodeChanged()}})}function f(){a.on("keydown",function(t){!c(t)&&65==t.keyCode&&e.metaKeyPressed(t)&&(t.preventDefault(),a.execCommand("SelectAll"))})}function p(){a.settings.content_editable||(I.bind(a.getDoc(),"focusin",function(){F.setRng(F.getRng())}),I.bind(a.getDoc(),"mousedown",function(e){e.target==a.getDoc().documentElement&&(a.getWin().focus(),F.setRng(F.getRng()))}))}function h(){a.on("keydown",function(e){if(!c(e)&&e.keyCode===P&&F.isCollapsed()&&0===F.getRng(!0).startOffset){var t=F.getNode(),n=t.previousSibling;n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(I.remove(n),e.preventDefault())}})}function m(){window.Range.prototype.getClientRects||a.on("mousedown",function(e){if(!c(e)&&"HTML"===e.target.nodeName){var t=a.getBody();t.blur(),setTimeout(function(){t.focus()},0)}})}function g(){a.on("click",function(e){e=e.target,/^(IMG|HR)$/.test(e.nodeName)&&F.getSel().setBaseAndExtent(e,0,e,1),"A"==e.nodeName&&I.hasClass(e,"mce-item-anchor")&&F.select(e),a.nodeChanged()})}function v(){function e(){var e=I.getAttribs(F.getStart().cloneNode(!1));return function(){var t=F.getStart();t!==a.getBody()&&(I.setAttrib(t,"style",null),H(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}}function t(){return!F.isCollapsed()&&I.getParent(F.getStart(),I.isBlock)!=I.getParent(F.getEnd(),I.isBlock)}a.on("keypress",function(n){var r;return c(n)||8!=n.keyCode&&46!=n.keyCode||!t()?void 0:(r=e(),a.getDoc().execCommand("delete",!1,null),r(),n.preventDefault(),!1)}),I.bind(a.getDoc(),"cut",function(n){var r;!c(n)&&t()&&(r=e(),setTimeout(function(){r()},0))})}function y(){var e,n;a.on("selectionchange",function(){n&&(clearTimeout(n),n=0),n=window.setTimeout(function(){var n=F.getRng();e&&t.compareRanges(n,e)||(a.nodeChanged(),e=n)},50)})}function b(){document.body.setAttribute("role","application")}function C(){a.on("keydown",function(e){if(!c(e)&&e.keyCode===P&&F.isCollapsed()&&0===F.getRng(!0).startOffset){var t=F.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})}function x(){l()>7||(s("RespectVisibilityInDesign",!0),a.contentStyles.push(".mceHideBrInPre pre br {display: none}"),I.addClass(a.getBody(),"mceHideBrInPre"),z.addNodeFilter("pre",function(e){for(var t=e.length,r,i,o,a;t--;)for(r=e[t].getAll("br"),i=r.length;i--;)o=r[i],a=o.prev,a&&3===a.type&&"\n"!=a.value.charAt(a.value-1)?a.value+="\n":o.parent.insert(new n("#text",3),o,!0).value="\n"}),V.addNodeFilter("pre",function(e){for(var t=e.length,n,r,i,o;t--;)for(n=e[t].getAll("br"),r=n.length;r--;)i=n[r],o=i.prev,o&&3==o.type&&(o.value=o.value.replace(/\r?\n$/,""))}))}function w(){I.bind(a.getBody(),"mouseup",function(){var e,t=F.getNode();"IMG"==t.nodeName&&((e=I.getStyle(t,"width"))&&(I.setAttrib(t,"width",e.replace(/[^0-9%]+/g,"")),I.setStyle(t,"width","")),(e=I.getStyle(t,"height"))&&(I.setAttrib(t,"height",e.replace(/[^0-9%]+/g,"")),I.setStyle(t,"height","")))})}function _(){a.on("keydown",function(t){var n,r,i,o,s,l,u,d;if(n=t.keyCode==O,!c(t)&&(n||t.keyCode==P)&&!e.modifierPressed(t)&&(r=F.getRng(),i=r.startContainer,o=r.startOffset,u=r.collapsed,3==i.nodeType&&i.nodeValue.length>0&&(0===o&&!u||u&&o===(n?0:1)))){if(l=i.previousSibling,l&&"IMG"==l.nodeName)return;d=a.schema.getNonEmptyElements(),t.preventDefault(),s=I.create("br",{id:"__tmp"}),i.parentNode.insertBefore(s,i),a.getDoc().execCommand(n?"ForwardDelete":"Delete",!1,null),i=F.getRng().startContainer,l=i.previousSibling,l&&1==l.nodeType&&!I.isBlock(l)&&I.isEmpty(l)&&!d[l.nodeName.toLowerCase()]&&I.remove(l),I.remove("__tmp")}})}function N(){a.on("keydown",function(t){var n,r,i,o,s;if(!c(t)&&t.keyCode==e.BACKSPACE&&(n=F.getRng(),r=n.startContainer,i=n.startOffset,o=I.getRoot(),s=r,n.collapsed&&0===i)){for(;s&&s.parentNode&&s.parentNode.firstChild==s&&s.parentNode!=o;)s=s.parentNode;"BLOCKQUOTE"===s.tagName&&(a.formatter.toggle("blockquote",null,s),n=I.createRng(),n.setStart(r,0),n.setEnd(r,0),F.setRng(n))}})}function E(){function e(){a._refreshContentEditable(),s("StyleWithCSS",!1),s("enableInlineTableEditing",!1),W.object_resizing||s("enableObjectResizing",!1)}W.readonly||a.on("BeforeExecCommand MouseDown",e)}function S(){function e(){H(I.select("a"),function(e){var t=e.parentNode,n=I.getRoot();if(t.lastChild===e){for(;t&&!I.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}I.add(t,"br",{"data-mce-bogus":1})}})}a.on("SetContent ExecCommand",function(t){("setcontent"==t.type||"mceInsertLink"===t.command)&&e()})}function k(){W.forced_root_block&&a.on("init",function(){s("DefaultParagraphSeparator",W.forced_root_block)})}function T(){a.on("Undo Redo SetContent",function(e){e.initial||a.execCommand("mceRepaint")})}function R(){a.on("keydown",function(e){var t;c(e)||e.keyCode!=P||(t=a.getDoc().selection.createRange(),t&&t.item&&(e.preventDefault(),a.undoManager.beforeChange(),I.remove(t.item(0)),a.undoManager.add()))})}function A(){var e;l()>=10&&(e="",H("p div h1 h2 h3 h4 h5 h6".split(" "),function(t,n){e+=(n>0?",":"")+t+":empty"}),a.contentStyles.push(e+"{padding-right: 1px !important}"))}function B(){l()<9&&(z.addNodeFilter("noscript",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.firstChild,r&&n.attr("data-mce-innertext",r.value)}),V.addNodeFilter("noscript",function(e){for(var t=e.length,i,o,a;t--;)i=e[t],o=e[t].firstChild,o?o.value=r.decode(o.value):(a=i.attributes.map["data-mce-innertext"],a&&(i.attr("data-mce-innertext",null),o=new n("#text",3),o.value=a,o.raw=!0,i.append(o)))}))}function L(){function e(e,t){var n=i.createTextRange();try{n.moveToPoint(e,t)}catch(r){n=null}return n}function t(t){var r;t.button?(r=e(t.x,t.y),r&&(r.compareEndPoints("StartToStart",a)>0?r.setEndPoint("StartToStart",a):r.setEndPoint("EndToEnd",a),r.select())):n()}function n(){var e=r.selection.createRange();a&&!e.item&&0===e.compareEndPoints("StartToEnd",e)&&a.select(),I.unbind(r,"mouseup",n),I.unbind(r,"mousemove",t),a=o=0}var r=I.doc,i=r.body,o,a,s;r.documentElement.unselectable=!0,I.bind(r,"mousedown contextmenu",function(i){if("HTML"===i.target.nodeName){if(o&&n(),s=r.documentElement,s.scrollHeight>s.clientHeight)return;o=1,a=e(i.x,i.y),a&&(I.bind(r,"mouseup",n),I.bind(r,"mousemove",t),I.win.focus(),a.select())}})}function M(){a.on("keyup focusin",function(t){65==t.keyCode&&e.metaKeyPressed(t)||F.normalize()})}function D(){a.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")}var H=o.each,P=e.BACKSPACE,O=e.DELETE,I=a.dom,F=a.selection,W=a.settings,z=a.parser,V=a.serializer,U=i.gecko,q=i.ie,$=i.webkit;C(),N(),d(),M(),$&&(_(),u(),p(),g(),k(),i.iOS?y():f()),q&&(h(),b(),x(),w(),R(),A(),B(),L()),U&&(h(),m(),v(),E(),S(),T(),D())}}),r(nt,[p],function(e){function t(){return!1}function n(){return!0}var r="__bindings",i=e.makeMap("focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave keydown keypress keyup contextmenu dragend dragover draggesture dragdrop drop drag"," ");return{fire:function(e,i,o){var a=this,s,l,c,u,d;if(e=e.toLowerCase(),i=i||{},i.type=e,i.target||(i.target=a),i.preventDefault||(i.preventDefault=function(){i.isDefaultPrevented=n},i.stopPropagation=function(){i.isPropagationStopped=n},i.stopImmediatePropagation=function(){i.isImmediatePropagationStopped=n},i.isDefaultPrevented=t,i.isPropagationStopped=t,i.isImmediatePropagationStopped=t),a[r]&&(s=a[r][e]))for(l=0,c=s.length;c>l&&(s[l]=u=s[l],!i.isImmediatePropagationStopped());l++)if(u.call(a,i)===!1)return i.preventDefault(),i;if(o!==!1&&a.parent)for(d=a.parent();d&&!i.isPropagationStopped();)d.fire(e,i,!1),d=d.parent();return i},on:function(e,t){var n=this,o,a,s,l;if(t===!1&&(t=function(){return!1}),t)for(s=e.toLowerCase().split(" "),l=s.length;l--;)e=s[l],o=n[r],o||(o=n[r]={}),a=o[e],a||(a=o[e]=[],n.bindNative&&i[e]&&n.bindNative(e)),a.push(t);return n},off:function(e,t){var n=this,o,a=n[r],s,l,c,u;if(a)if(e)for(c=e.toLowerCase().split(" "),o=c.length;o--;){if(e=c[o],s=a[e],!e){for(l in a)a[e].length=0;return n}if(s){if(t)for(u=s.length;u--;)s[u]===t&&s.splice(u,1);else s.length=0;!s.length&&n.unbindNative&&i[e]&&(n.unbindNative(e),delete a[e])}}else{if(n.unbindNative)for(e in a)n.unbindNative(e);n[r]=[]}return n}}}),r(rt,[p,g],function(e,t){var n=e.each,r=e.explode,i={f9:120,f10:121,f11:122};return function(o){var a=this,s={};o.on("keyup keypress keydown",function(e){(e.altKey||e.ctrlKey||e.metaKey)&&n(s,function(n){var r=t.mac?e.ctrlKey||e.metaKey:e.ctrlKey;if(n.ctrl==r&&n.alt==e.altKey&&n.shift==e.shiftKey)return e.keyCode==n.keyCode||e.charCode&&e.charCode==n.charCode?(e.preventDefault(),"keydown"==e.type&&n.func.call(n.scope),!0):void 0})}),a.add=function(t,a,l,c){var u;return u=l,"string"==typeof l?l=function(){o.execCommand(u,!1,null)}:e.isArray(u)&&(l=function(){o.execCommand(u[0],u[1],u[2])}),n(r(t.toLowerCase()),function(e){var t={func:l,scope:c||o,desc:o.translate(a),alt:!1,ctrl:!1,shift:!1};n(r(e,"+"),function(e){switch(e){case"alt":case"ctrl":case"shift":t[e]=!0;break;default:t.charCode=e.charCodeAt(0),t.keyCode=i[e]||e.toUpperCase().charCodeAt(0)}}),s[(t.ctrl?"ctrl":"")+","+(t.alt?"alt":"")+","+(t.shift?"shift":"")+","+t.keyCode]=t}),!0}}}),r(it,[v,b,C,S,E,A,L,M,D,H,P,O,y,l,et,x,_,tt,g,p,nt,rt],function(e,n,r,i,o,a,s,l,c,u,d,f,p,h,m,g,v,y,b,C,x,w){function _(e,t){return"selectionchange"==t||"drop"==t?e.getDoc():!e.inline&&/^mouse|click|contextmenu/.test(t)?e.getDoc():e.getBody()}function N(e,t,r){var i=this,o,a;o=i.documentBaseUrl=r.documentBaseURL,a=r.baseURI,i.settings=t=T({id:e,theme:"modern",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:o,add_form_submit_trigger:!0,submit_patch:!0,add_unload_trigger:!0,convert_urls:!0,relative_urls:!0,remove_script_host:!0,object_resizing:!0,doctype:"<!DOCTYPE html>",visual:!0,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,padd_empty_editor:!0,render_ui:!0,indentation:"30px",inline_styles:!0,convert_fonts_to_spans:!0,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",validate:!0,entity_encoding:"named",url_converter:i.convertURL,url_converter_scope:i,ie7_compat:!0},t),n.settings=t,n.baseURL=r.baseURL,i.id=t.id=e,i.isNotDirty=!0,i.plugins={},i.documentBaseURI=new f(t.document_base_url||o,{base_uri:a}),i.baseURI=a,i.contentCSS=[],i.contentStyles=[],i.shortcuts=new w(i),i.execCommands={},i.queryStateCommands={},i.queryValueCommands={},i.loadedCSS={},i.suffix=r.suffix,i.editorManager=r,i.inline=t.inline,i.execCallback("setup",i)}var E=e.DOM,S=n.ThemeManager,k=n.PluginManager,T=C.extend,R=C.each,A=C.explode,B=C.inArray,L=C.trim,M=C.resolve,D=h.Event,H=b.gecko,P=b.ie,O=b.opera;return N.prototype={render:function(){function e(){var e=p.ScriptLoader;n.language&&"en"!=n.language&&(n.language_url=t.editorManager.baseURL+"/langs/"+n.language+".js"),n.language_url&&e.add(n.language_url),n.theme&&"function"!=typeof n.theme&&"-"!=n.theme.charAt(0)&&!S.urls[n.theme]&&S.load(n.theme,"themes/"+n.theme+"/theme"+i+".js"),C.isArray(n.plugins)&&(n.plugins=n.plugins.join(" ")),R(n.external_plugins,function(e,t){k.load(t,e),n.plugins+=" "+t}),R(n.plugins.split(/[ ,]/),function(e){if(e=L(e),e&&!k.urls[e])if("-"==e.charAt(0)){e=e.substr(1,e.length);var t=k.dependencies(e);R(t,function(e){var t={prefix:"plugins/",resource:e,suffix:"/plugin"+i+".js"};e=k.createUrl(t,e),k.load(e.resource,e)})}else k.load(e,{prefix:"plugins/",resource:e,suffix:"/plugin"+i+".js"})}),e.loadQueue(function(){t.removed||t.init()})}var t=this,n=t.settings,r=t.id,i=t.suffix;if(!D.domLoaded)return E.bind(window,"ready",function(){t.render()}),void 0;if(t.editorManager.settings=n,t.getElement()&&b.contentEditable){n.inline?t.inline=!0:(t.orgVisibility=t.getElement().style.visibility,t.getElement().style.visibility="hidden");var o=t.getElement().form||E.getParent(r,"form");o&&(t.formElement=o,n.hidden_input&&!/TEXTAREA|INPUT/i.test(t.getElement().nodeName)&&E.insertAfter(E.create("input",{type:"hidden",name:r}),r),t.formEventDelegate=function(e){t.fire(e.type,e)},E.bind(o,"submit reset",t.formEventDelegate),t.on("reset",function(){t.setContent(t.startContent,{format:"raw"})}),!n.submit_patch||o.submit.nodeType||o.submit.length||o._mceOldSubmit||(o._mceOldSubmit=o.submit,o.submit=function(){return t.editorManager.triggerSave(),t.isNotDirty=!0,o._mceOldSubmit(o)})),t.windowManager=new m(t),"xml"==n.encoding&&t.on("GetContent",function(e){e.save&&(e.content=E.encode(e.content))}),n.add_form_submit_trigger&&t.on("submit",function(){t.initialized&&(t.save(),t.isNotDirty=!0)}),n.add_unload_trigger&&(t._beforeUnload=function(){!t.initialized||t.destroyed||t.isHidden()||t.save({format:"raw",no_events:!0})},t.editorManager.on("BeforeUnload",t._beforeUnload)),e()}},init:function(){function e(n){var r=k.get(n),i,o;i=k.urls[n]||t.documentBaseUrl.replace(/\/$/,""),n=L(n),r&&-1===B(h,n)&&(R(k.dependencies(n),function(t){e(t)}),o=new r(t,i),t.plugins[n]=o,o.init&&(o.init(t,i),h.push(n)))}var t=this,n=t.settings,r=t.getElement(),i,o,a,s,l,c,u,d,f,p,h=[];if(t.editorManager.add(t),n.aria_label=n.aria_label||E.getAttrib(r,"aria-label",t.getLang("aria.rich_text_area")),n.theme&&("function"!=typeof n.theme?(n.theme=n.theme.replace(/-/,""),l=S.get(n.theme),t.theme=new l(t,S.urls[n.theme]),t.theme.init&&t.theme.init(t,S.urls[n.theme]||t.documentBaseUrl.replace(/\/$/,""))):t.theme=n.theme),R(n.plugins.replace(/\-/g,"").split(/[ ,]/),e),t.fire("BeforeRenderUI"),n.render_ui&&t.theme&&(t.orgDisplay=r.style.display,"function"!=typeof n.theme?(i=n.width||r.style.width||r.offsetWidth,o=n.height||r.style.height||r.offsetHeight,a=n.min_height||100,f=/^[0-9\.]+(|px)$/i,f.test(""+i)&&(i=Math.max(parseInt(i,10)+(l.deltaWidth||0),100)),f.test(""+o)&&(o=Math.max(parseInt(o,10)+(l.deltaHeight||0),a)),l=t.theme.renderUI({targetNode:r,width:i,height:o,deltaWidth:n.delta_width,deltaHeight:n.delta_height}),n.content_editable||(E.setStyles(l.sizeContainer||l.editorContainer,{wi2dth:i,h2eight:o}),o=(l.iframeHeight||o)+("number"==typeof o?l.deltaHeight||0:""),a>o&&(o=a))):(l=n.theme(t,r),l.editorContainer.nodeType&&(l.editorContainer=l.editorContainer.id=l.editorContainer.id||t.id+"_parent"),l.iframeContainer.nodeType&&(l.iframeContainer=l.iframeContainer.id=l.iframeContainer.id||t.id+"_iframecontainer"),o=l.iframeHeight||r.offsetHeight),t.editorContainer=l.editorContainer),n.content_css&&R(A(n.content_css),function(e){t.contentCSS.push(t.documentBaseURI.toAbsolute(e))}),n.content_style&&t.contentStyles.push(n.content_style),n.content_editable)return r=s=l=null,t.initContentBody();for(document.domain&&location.hostname!=document.domain&&(t.editorManager.relaxedDomain=document.domain),t.iframeHTML=n.doctype+"<html><head>",n.document_base_url!=t.documentBaseUrl&&(t.iframeHTML+='<base href="'+t.documentBaseURI.getURI()+'" />'),!b.caretAfter&&n.ie7_compat&&(t.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'),t.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />',p=0;p<t.contentCSS.length;p++){var m=t.contentCSS[p];t.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+m+'" />',t.loadedCSS[m]=!0}u=n.body_id||"tinymce",-1!=u.indexOf("=")&&(u=t.getParam("body_id","","hash"),u=u[t.id]||u),d=n.body_class||"",-1!=d.indexOf("=")&&(d=t.getParam("body_class","","hash"),d=d[t.id]||""),t.iframeHTML+='</head><body id="'+u+'" class="mce-content-body '+d+'" '+"onload=\"window.parent.tinymce.get('"+t.id+"').fire('load');\"><br></body></html>",t.editorManager.relaxedDomain&&(P||O&&parseFloat(window.opera.version())<11)&&(c='javascript:(function(){document.open();document.domain="'+document.domain+'";'+'var ed = window.parent.tinymce.get("'+t.id+'");document.write(ed.iframeHTML);'+"document.close();ed.initContentBody();})()"),s=E.add(l.iframeContainer,"iframe",{id:t.id+"_ifr",src:c||'javascript:""',frameBorder:"0",allowTransparency:"true",title:t.editorManager.translate("Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"),style:{width:"100%",height:o,display:"block"}}),t.contentAreaContainer=l.iframeContainer,l.editorContainer&&(E.get(l.editorContainer).style.display=t.orgDisplay),E.get(t.id).style.display="none",E.setAttrib(t.id,"aria-hidden",!0),t.editorManager.relaxedDomain&&c||t.initContentBody(),r=s=l=null},initContentBody:function(){var t=this,n=t.settings,o=E.get(t.id),f=t.getDoc(),p,h;n.inline||(t.getElement().style.visibility=t.orgVisibility),P&&t.editorManager.relaxedDomain||n.content_editable||(f.open(),f.write(t.iframeHTML),f.close(),t.editorManager.relaxedDomain&&(f.domain=t.editorManager.relaxedDomain)),n.content_editable&&(t.on("remove",function(){var e=this.getBody();E.removeClass(e,"mce-content-body"),E.removeClass(e,"mce-edit-focus"),E.setAttrib(e,"tabIndex",null),E.setAttrib(e,"contentEditable",null)}),E.addClass(o,"mce-content-body"),o.tabIndex=-1,t.contentDocument=f=n.content_document||document,t.contentWindow=n.content_window||window,t.bodyElement=o,n.content_document=n.content_window=null,n.root_name=o.nodeName.toLowerCase()),p=t.getBody(),p.disabled=!0,n.readonly||(p.contentEditable=t.getParam("content_editable_state",!0)),p.disabled=!1,t.schema=new g(n),t.dom=new e(f,{keep_values:!0,url_converter:t.convertURL,url_converter_scope:t,hex_colors:n.force_hex_style_colors,class_filter:n.class_filter,update_styles:!0,root_element:n.content_editable?t.id:null,schema:t.schema,onSetAttrib:function(e){t.fire("SetAttrib",e)}}),t.parser=new v(n,t.schema),t.parser.addAttributeFilter("src,href,style",function(e,n){for(var r=e.length,i,o=t.dom,a,s;r--;)i=e[r],a=i.attr(n),s="data-mce-"+n,i.attributes.map[s]||("style"===n?i.attr(s,o.serializeStyle(o.parseStyle(a),i.name)):i.attr(s,t.convertURL(a,n,i.name)))}),t.parser.addNodeFilter("script",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("type","mce-"+(n.attr("type")||"text/javascript"))}),t.parser.addNodeFilter("#cdata",function(e){for(var t=e.length,n;t--;)n=e[t],n.type=8,n.name="#comment",n.value="[CDATA["+n.value+"]]"}),t.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var n=e.length,i,o=t.schema.getNonEmptyElements();n--;)i=e[n],i.isEmpty(o)&&(i.empty().append(new r("br",1)).shortEnded=!0)}),t.serializer=new i(n,t),t.selection=new a(t.dom,t.getWin(),t.serializer,t),t.formatter=new s(t),t.undoManager=new l(t),t.forceBlocks=new u(t),t.enterKey=new c(t),t.editorCommands=new d(t),t.fire("PreInit"),n.browser_spellcheck||n.gecko_spellcheck||(f.body.spellcheck=!1,E.setAttrib(p,"spellcheck","false")),t.fire("PostRender"),t.quirks=y(t),n.directionality&&(p.dir=n.directionality),n.nowrap&&(p.style.whiteSpace="nowrap"),n.protect&&t.on("BeforeSetContent",function(e){R(n.protect,function(t){e.content=e.content.replace(t,function(e){return"<!--mce:protected "+escape(e)+"-->"})})}),t.on("SetContent",function(){t.addVisual(t.getBody())}),n.padd_empty_editor&&t.on("PostProcess",function(e){e.content=e.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")}),t.load({initial:!0,format:"html"}),t.startContent=t.getContent({format:"raw"}),t.initialized=!0,R(t._pendingNativeEvents,function(e){t.dom.bind(_(t,e),e,function(e){t.fire(e.type,e)})}),t.fire("init"),t.focus(!0),t.nodeChanged({initial:!0}),t.execCallback("init_instance_callback",t),t.contentStyles.length>0&&(h="",R(t.contentStyles,function(e){h+=e+"\r\n"}),t.dom.addStyle(h)),R(t.contentCSS,function(e){t.loadedCSS[e]||(t.dom.loadCSS(e),t.loadedCSS[e]=!0)}),n.auto_focus&&setTimeout(function(){var e=t.editorManager.get(n.auto_focus);e.selection.select(e.getBody(),1),e.selection.collapse(1),e.getBody().focus(),e.getWin().focus()},100),o=f=p=null},focus:function(e){var t,n=this,r=n.selection,i=n.settings.content_editable,o,a,s=n.getDoc(),l;e||(o=r.getRng(),o.item&&(a=o.item(0)),n._refreshContentEditable(),i||(b.opera||n.getBody().focus(),n.getWin().focus()),(H||i)&&(l=n.getBody(),l.setActive?l.setActive():l.focus(),i&&r.normalize()),a&&a.ownerDocument==s&&(o=s.body.createControlRange(),o.addElement(a),o.select())),n.editorManager.activeEditor!=n&&((t=n.editorManager.activeEditor)&&t.fire("deactivate",{relatedTarget:n}),n.fire("activate",{relatedTarget:t})),n.editorManager.activeEditor=n},execCallback:function(e){var t=this,n=t.settings[e],r;if(n)return t.callbackLookup&&(r=t.callbackLookup[e])&&(n=r.func,r=r.scope),"string"==typeof n&&(r=n.replace(/\.\w+$/,""),r=r?M(r):0,n=M(n),t.callbackLookup=t.callbackLookup||{},t.callbackLookup[e]={func:n,scope:r}),n.apply(r||t,Array.prototype.slice.call(arguments,1))},translate:function(e){var t=this.settings.language||"en",n=this.editorManager.i18n;return e?n[t+"."+e]||e.replace(/\{\#([^\}]+)\}/g,function(e,r){return n[t+"."+r]||"{#"+r+"}"}):""},getLang:function(e,n){return this.editorManager.i18n[(this.settings.language||"en")+"."+e]||(n!==t?n:"{#"+e+"}")},getParam:function(e,t,n){var r=e in this.settings?this.settings[e]:t,i;return"hash"===n?(i={},"string"==typeof r?R(r.indexOf("=")>0?r.split(/[;,](?![^=;,]*(?:[;,]|$))/):r.split(","),function(e){e=e.split("="),i[L(e[0])]=e.length>1?L(e[1]):L(e)}):i=r,i):r},nodeChanged:function(){var e=this,t=e.selection,n,r,i;e.initialized&&!e.settings.disable_nodechange&&(i=e.getBody(),n=t.getStart()||i,n=P&&n.ownerDocument!=e.getDoc()?e.getBody():n,"IMG"==n.nodeName&&t.isCollapsed()&&(n=n.parentNode),r=[],e.dom.getParent(n,function(e){return e===i?!0:(r.push(e),void 0)}),e.fire("NodeChange",{element:n,parents:r}))},addButton:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),t.text||t.icon||(t.icon=e),n.buttons=n.buttons||{},t.tooltip=t.tooltip||t.title,n.buttons[e]=t},addMenuItem:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),n.menuItems=n.menuItems||{},n.menuItems[e]=t},addCommand:function(e,t,n){this.execCommands[e]={func:t,scope:n||this}},addQueryStateHandler:function(e,t,n){this.queryStateCommands[e]={func:t,scope:n||this}},addQueryValueHandler:function(e,t,n){this.queryValueCommands[e]={func:t,scope:n||this}},addShortcut:function(e,t,n,r){this.shortcuts.add(e,t,n,r)},execCommand:function(e,t,n,r){var i=this,o=0,a;return/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(e)||r&&r.skip_focus||i.focus(),r=T({},r),r=i.fire("BeforeExecCommand",{command:e,ui:t,value:n}),r.isDefaultPrevented()?!1:(a=i.execCommands[e])&&a.func.call(a.scope,t,n)!==!0?(i.fire("ExecCommand",{command:e,ui:t,value:n}),!0):(R(i.plugins,function(r){return r.execCommand&&r.execCommand(e,t,n)?(i.fire("ExecCommand",{command:e,ui:t,value:n}),o=!0,!1):void 0}),o?o:i.theme&&i.theme.execCommand&&i.theme.execCommand(e,t,n)?(i.fire("ExecCommand",{command:e,ui:t,value:n}),!0):i.editorCommands.execCommand(e,t,n)?(i.fire("ExecCommand",{command:e,ui:t,value:n}),!0):(i.getDoc().execCommand(e,t,n),i.fire("ExecCommand",{command:e,ui:t,value:n}),void 0))},queryCommandState:function(e){var t=this,n,r;if(!t._isHidden()){if((n=t.queryStateCommands[e])&&(r=n.func.call(n.scope),r!==!0))return r;if(r=t.editorCommands.queryCommandState(e),-1!==r)return r;try{return t.getDoc().queryCommandState(e)}catch(i){}}},queryCommandValue:function(e){var n=this,r,i;if(!n._isHidden()){if((r=n.queryValueCommands[e])&&(i=r.func.call(r.scope),i!==!0))return i;if(i=n.editorCommands.queryCommandValue(e),i!==t)return i;try{return n.getDoc().queryCommandValue(e)}catch(o){}}},show:function(){var e=this;E.show(e.getContainer()),E.hide(e.id),e.load(),e.fire("show")},hide:function(){var e=this,t=e.getDoc();P&&t&&t.execCommand("SelectAll"),e.save(),E.hide(e.getContainer()),E.setStyle(e.id,"display",e.orgDisplay),e.fire("hide")},isHidden:function(){return!E.isHidden(this.id)},setProgressState:function(e,t){this.fire("ProgressState",{state:e,time:t})},load:function(e){var n=this,r=n.getElement(),i;return r?(e=e||{},e.load=!0,i=n.setContent(r.value!==t?r.value:r.innerHTML,e),e.element=r,e.no_events||n.fire("LoadContent",e),e.element=r=null,i):void 0},save:function(e){var t=this,n=t.getElement(),r,i;if(n&&t.initialized)return e=e||{},e.save=!0,e.element=n,r=e.content=t.getContent(e),e.no_events||t.fire("SaveContent",e),r=e.content,/TEXTAREA|INPUT/i.test(n.nodeName)?n.value=r:(n.innerHTML=r,(i=E.getParent(t.id,"form"))&&R(i.elements,function(e){return e.name==t.id?(e.value=r,!1):void 0})),e.element=n=null,t.isNotDirty=!0,r},setContent:function(e,t){var n=this,r=n.getBody(),i;return t=t||{},t.format=t.format||"html",t.set=!0,t.content=e,t.no_events||n.fire("BeforeSetContent",t),e=t.content,P||0!==e.length&&!/^\s+$/.test(e)?("raw"!==t.format&&(e=new o({},n.schema).serialize(n.parser.parse(e,{isRootContent:!0}))),t.content=L(e),n.dom.setHTML(r,t.content),t.no_events||n.fire("SetContent",t),n.settings.content_editable&&document.activeElement!==n.getBody()||n.selection.normalize(),t.content):(i=n.settings.forced_root_block,e=i&&n.schema.isValidChild(r.nodeName.toLowerCase(),i.toLowerCase())?"<"+i+'><br data-mce-bogus="1"></'+i+">":'<br data-mce-bogus="1">',r.innerHTML=e,n.selection.select(r,!0),n.selection.collapse(!0),n.fire("SetContent",t),void 0)},getContent:function(e){var t=this,n,r=t.getBody();return e=e||{},e.format=e.format||"html",e.get=!0,e.getInner=!0,e.no_events||t.fire("BeforeGetContent",e),n="raw"==e.format?r.innerHTML:"text"==e.format?r.innerText||r.textContent:t.serializer.serialize(r,e),e.content="text"!=e.format?L(n):n,e.no_events||t.fire("GetContent",e),e.content},insertContent:function(e){this.execCommand("mceInsertContent",!1,e)},isDirty:function(){return!this.isNotDirty},getContainer:function(){var e=this;return e.container||(e.container=E.get(e.editorContainer||e.id+"_parent")),e.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return E.get(this.settings.content_element||this.id)},getWin:function(){var e=this,t;return e.contentWindow||(t=E.get(e.id+"_ifr"),t&&(e.contentWindow=t.contentWindow)),e.contentWindow},getDoc:function(){var e=this,t;return e.contentDocument||(t=e.getWin(),t&&(e.contentDocument=t.document)),e.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(e,t,n){var r=this,i=r.settings;return i.urlconverter_callback?r.execCallback("urlconverter_callback",e,n,!0,t):!i.convert_urls||n&&"LINK"==n.nodeName||0===e.indexOf("file:")||0===e.length?e:i.relative_urls?r.documentBaseURI.toRelative(e):e=r.documentBaseURI.toAbsolute(e,i.remove_script_host)},addVisual:function(e){var n=this,r=n.settings,i=n.dom,o;e=e||n.getBody(),n.hasVisual===t&&(n.hasVisual=r.visual),R(i.select("table,a",e),function(e){var t;switch(e.nodeName){case"TABLE":return o=r.visual_table_class||"mce-item-table",t=i.getAttrib(e,"border"),t&&"0"!=t||(n.hasVisual?i.addClass(e,o):i.removeClass(e,o)),void 0;case"A":return i.getAttrib(e,"href",!1)||(t=i.getAttrib(e,"name")||e.id,o="mce-item-anchor",t&&(n.hasVisual?i.addClass(e,o):i.removeClass(e,o))),void 0}}),n.fire("VisualAid",{element:e,hasVisual:n.hasVisual})},remove:function(){var e=this,t=e.getContainer(),n=e.getDoc();e.removed||(e.removed=1,P&&n&&n.execCommand("SelectAll"),e.save(),E.setStyle(e.id,"display",e.orgDisplay),e.settings.content_editable||(D.unbind(e.getWin()),D.unbind(e.getDoc())),D.unbind(e.getBody()),D.unbind(t),e.fire("remove"),e.editorManager.remove(e),E.remove(t))},bindNative:function(e){var t=this;t.initialized?t.dom.bind(_(t,e),e,function(n){t.fire(e,n)}):t._pendingNativeEvents?t._pendingNativeEvents.push(e):t._pendingNativeEvents=[e]},unbindNative:function(e){var t=this;t.initialized&&t.dom.unbind(e)},destroy:function(e){var t=this,n;t.destroyed||(H&&(D.unbind(t.getDoc()),D.unbind(t.getWin()),D.unbind(t.getBody())),e||(t.editorManager.off("beforeunload",t._beforeUnload),t.theme&&t.theme.destroy&&t.theme.destroy(),t.selection.destroy(),t.dom.destroy()),n=t.formElement,n&&(n.submit=n._mceOldSubmit,n._mceOldSubmit=null,E.unbind(n,"submit reset",t.formEventDelegate)),t.contentAreaContainer=t.formElement=t.container=null,t.settings.content_element=t.bodyElement=t.contentDocument=t.contentWindow=null,t.selection&&(t.selection=t.selection.win=t.selection.dom=t.selection.dom.doc=null),t.destroyed=1)},_refreshContentEditable:function(){var e=this,t,n;e._isHidden()&&(t=e.getBody(),n=t.parentNode,n.removeChild(t),n.appendChild(t),t.focus())},_isHidden:function(){var e;return H?(e=this.selection.getSel(),!e||!e.rangeCount||0===e.rangeCount):0}},T(N.prototype,x),N}),r(ot,[],function(){var e={};return{add:function(t,n){for(var r in n)e[r]=n[r]},translate:function(t){if("undefined"==typeof t)return t;if("string"!=typeof t&&t.raw)return t.raw;if(t.push){var n=t.slice(1);t=(e[t[0]]||t[0]).replace(/\{([^\}]+)\}/g,function(e,t){return n[t]})}return e[t]||t},data:e}}),r(at,[v,g],function(e,t){function n(r){function i(){try{return document.activeElement}catch(e){return document.body}}function o(o){function a(t){return!!e.DOM.getParent(t,n.isEditorUIElement)}var s=o.editor,l,c;s.on("init",function(){"onbeforedeactivate"in document?s.dom.bind(s.getBody(),"beforedeactivate",function(){var e=s.getDoc().selection;l=e&&e.createRange?e.createRange():s.selection.getRng()}):s.inline&&(s.on("nodechange",function(){for(var e,t=document.activeElement;t;){if(t==s.getBody()){e=!0;break}t=t.parentNode}e&&(l=s.selection.getRng())}),t.webkit&&(c=function(){var e=s.selection.getRng();e.collapsed||(l=e)},e.DOM.bind(document,"selectionchange",c),s.on("remove",function(){e.DOM.unbind(document,"selectionchange",c)})))}),s.on("focusin",function(){var e=r.focusedEditor;s.selection.restoreRng&&(s.selection.setRng(s.selection.restoreRng),s.selection.restoreRng=null),e!=s&&(e&&e.fire("blur",{focusedEditor:s}),s.fire("focus",{blurredEditor:e}),s.focus(!1),r.focusedEditor=s)}),s.on("focusout",function(){s.selection.restoreRng=l,window.setTimeout(function(){var e=r.focusedEditor;e!=s&&(s.selection.restoreRng=null),a(i())||e!=s||(s.fire("blur",{focusedEditor:null}),r.focusedEditor=null,s.selection.restoreRng=null)},0)})}r.on("AddEditor",o)}return n.isEditorUIElement=function(e){return-1!==e.className.indexOf("mce-")},n}),r(st,[it,v,O,g,p,nt,ot,at],function(e,n,r,i,o,a,s,l){var c=n.DOM,u=o.explode,d=o.each,f=o.extend,p=0,h,m={majorVersion:"4",minorVersion:"0",releaseDate:"2013-07-18",editors:[],i18n:s,activeEditor:null,setup:function(){var e=this,t,n,i="",o;if(n=document.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/"),o=window.tinymce||window.tinyMCEPreInit)t=o.base||o.baseURL,i=o.suffix;else for(var a=document.getElementsByTagName("script"),s=0;s<a.length;s++){var c=a[s].src;if(/tinymce(\.jquery|)(\.min|\.dev|)\.js/.test(c)){-1!=c.indexOf(".min")&&(i=".min"),t=c.substring(0,c.lastIndexOf("/"));break}}e.baseURL=new r(n).toAbsolute(t),e.documentBaseURL=n,e.baseURI=new r(e.baseURL),e.suffix=i,e.focusManager=new l(e)},init:function(t){function n(e){var t=e.id;return t||(t=e.name,t=t&&!c.get(t)?e.name:c.uniqueId(),e.setAttribute("id",t)),t}function r(e,t,n){var r=e[t];
-if(r)return r.apply(n||this,Array.prototype.slice.call(arguments,2))}function i(e,t){return t.constructor===RegExp?t.test(e.className):c.hasClass(e,t)}var o=this,a=[],s;o.settings=t,c.bind(window,"ready",function(){var l,h;if(r(t,"onpageload"),t.types)return d(t.types,function(r){d(c.select(r.selector),function(i){var s=new e(n(i),f({},t,r),o);a.push(s),s.render(1)})}),void 0;if(t.selector)return d(c.select(t.selector),function(r){var i=new e(n(r),t,o);a.push(i),i.render(1)}),void 0;switch(t.mode){case"exact":l=t.elements||"",l.length>0&&d(u(l),function(n){c.get(n)?(s=new e(n,t,o),a.push(s),s.render(!0)):d(document.forms,function(r){d(r.elements,function(r){r.name===n&&(n="mce_editor_"+p++,c.setAttrib(r,"id",n),s=new e(n,t,o),a.push(s),s.render(1))})})});break;case"textareas":case"specific_textareas":d(c.select("textarea"),function(r){t.editor_deselector&&i(r,t.editor_deselector)||(!t.editor_selector||i(r,t.editor_selector))&&(s=new e(n(r),t,o),a.push(s),s.render(!0))})}t.oninit&&(l=h=0,d(a,function(e){h++,e.initialized?l++:e.on("init",function(){l++,l==h&&r(t,"oninit")}),l==h&&r(t,"oninit")}))})},get:function(e){return e===t?this.editors:this.editors[e]},add:function(e){var t=this,n=t.editors;return n[e.id]=e,n.push(e),t.activeEditor=e,t.fire("AddEditor",{editor:e}),h||(h=function(){t.fire("BeforeUnload")},c.bind(window,"beforeunload",h)),e},createEditor:function(t,n){return this.add(new e(t,n,this))},remove:function(e){var t=this,n,r=t.editors,i;if(e){if("string"==typeof e)return e=e.selector||e,d(c.select(e),function(e){t.remove(r[e.id])}),void 0;if(i=e,!r[i.id])return null;for(delete r[i.id],n=0;n<r.length;n++)if(r[n]==i){r.splice(n,1);break}if(t.activeEditor==i&&(t.activeEditor=r[0]),i&&!i.removed)return i.remove(),i.destroy(),t.fire("RemoveEditor",{editor:i}),r.length||c.unbind(window,"beforeunload",h),i}else for(n=r.length-1;n>=0;n--)t.remove(r[n])},execCommand:function(t,n,r){var i=this,o=i.get(r);switch(t){case"mceAddEditor":return i.get(r)||new e(r,i.settings,i).render(),!0;case"mceRemoveEditor":return o&&o.remove(),!0;case"mceToggleEditor":return o?(o.isHidden()?o.show():o.hide(),!0):(i.execCommand("mceAddEditor",0,r),!0)}return i.activeEditor?i.activeEditor.execCommand(t,n,r):!1},triggerSave:function(){d(this.editors,function(e){e.save()})},addI18n:function(e,t){s.add(e,t)},translate:function(e){return s.translate(e)}};return f(m,a),m.setup(),window.tinymce=window.tinyMCE=m,m}),r(lt,[st,p],function(e,t){var n=t.each,r=t.explode;e.on("AddEditor",function(e){var t=e.editor;t.on("preInit",function(){function e(e,t){n(t,function(t,n){t&&s.setStyle(e,n,t)}),s.rename(e,"span")}function i(e){s=t.dom,l.convert_fonts_to_spans&&n(s.select("font,u,strike",e.node),function(e){o[e.nodeName.toLowerCase()](s,e)})}var o,a,s,l=t.settings;l.inline_styles&&(a=r(l.font_size_legacy_values),o={font:function(t,n){e(n,{backgroundColor:n.style.backgroundColor,color:n.color,fontFamily:n.face,fontSize:a[parseInt(n.size,10)-1]})},u:function(t,n){e(n,{textDecoration:"underline"})},strike:function(t,n){e(n,{textDecoration:"line-through"})}},t.on("PreProcess SetContent",i))})})}),r(ct,[],function(){return{send:function(e){function t(){!e.async||4==n.readyState||r++>1e4?(e.success&&1e4>r&&200==n.status?e.success.call(e.success_scope,""+n.responseText,n,e):e.error&&e.error.call(e.error_scope,r>1e4?"TIMED_OUT":"GENERAL",n,e),n=null):setTimeout(t,10)}var n,r=0;if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=e.async===!1?!1:!0,e.data=e.data||"",n=new XMLHttpRequest){if(n.overrideMimeType&&n.overrideMimeType(e.content_type),n.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.content_type&&n.setRequestHeader("Content-Type",e.content_type),n.setRequestHeader("X-Requested-With","XMLHttpRequest"),n.send(e.data),!e.async)return t();setTimeout(t,10)}}}}),r(ut,[],function(){function e(t,n){var r,i,o,a;if(n=n||'"',null===t)return"null";if(o=typeof t,"string"==o)return i="\bb	t\nn\ff\rr\"\"''\\\\",n+t.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(e,t){return'"'===n&&"'"===e?e:(r=i.indexOf(t),r+1?"\\"+i.charAt(r+1):(e=t.charCodeAt().toString(16),"\\u"+"0000".substring(e.length)+e))})+n;if("object"==o){if(t.hasOwnProperty&&"[object Array]"===Object.prototype.toString.call(t)){for(r=0,i="[";r<t.length;r++)i+=(r>0?",":"")+e(t[r],n);return i+"]"}i="{";for(a in t)t.hasOwnProperty(a)&&(i+="function"!=typeof t[a]?(i.length>1?","+n:n)+a+n+":"+e(t[a],n):"");return i+"}"}return""+t}return{serialize:e,parse:function(e){try{return window[String.fromCharCode(101)+"val"]("("+e+")")}catch(t){}}}}),r(dt,[ut,ct,p],function(e,t,n){function r(e){this.settings=i({},e),this.count=0}var i=n.extend;return r.sendRPC=function(e){return(new r).send(e)},r.prototype={send:function(n){var r=n.error,o=n.success;n=i(this.settings,n),n.success=function(t,i){t=e.parse(t),"undefined"==typeof t&&(t={error:"JSON Parse error."}),t.error?r.call(n.error_scope||n.scope,t.error,i):o.call(n.success_scope||n.scope,t.result)},n.error=function(e,t){r&&r.call(n.error_scope||n.scope,e,t)},n.data=e.serialize({id:n.id||"c"+this.count++,method:n.method,params:n.params}),n.content_type="application/json",t.send(n)}},r}),r(ft,[v],function(e){return{callbacks:{},count:0,send:function(n){var r=this,i=e.DOM,o=n.count!==t?n.count:r.count,a="tinymce_jsonp_"+o;r.callbacks[o]=function(e){i.remove(a),delete r.callbacks[o],n.callback(e)},i.add(i.doc.body,"script",{id:a,src:n.url,type:"text/javascript"}),r.count++}}}),r(pt,[],function(){function e(){s=[];for(var e in a)s.push(e);i.length=s.length}function n(){function n(e){var n,r;return r=e!==t?c+e:i.indexOf(",",c),-1===r||r>i.length?null:(n=i.substring(c,r),c=r+1,n)}var r,i,s,c=0;a={},o.load(l),i=o.getAttribute(l)||"";do r=n(parseInt(n(),32)||0),null!==r&&(s=n(parseInt(n(),32)||0),a[r]=s);while(null!==r);e()}function r(){var t,n="";for(var r in a)t=a[r],n+=(n?",":"")+r.length.toString(32)+","+r+","+t.length.toString(32)+","+t;o.setAttribute(l,n),o.save(l),e()}var i,o,a,s,l;return window.localStorage?localStorage:(l="tinymce",o=document.documentElement,o.addBehavior("#default#userData"),i={key:function(e){return s[e]},getItem:function(e){return e in a?a[e]:null},setItem:function(e,t){a[e]=""+t,r()},removeItem:function(e){delete a[e],r()},clear:function(){a={},r()}},n(),i)}),r(ht,[v,l,y,b,p,g],function(e,t,n,r,i,o){var a=window.tinymce;return a.DOM=e.DOM,a.ScriptLoader=n.ScriptLoader,a.PluginManager=r.PluginManager,a.ThemeManager=r.ThemeManager,a.dom=a.dom||{},a.dom.Event=t.Event,i.each(i,function(e,t){a[t]=e}),i.each("isOpera isWebKit isIE isGecko isMac".split(" "),function(e){a[e]=o[e.substr(2).toLowerCase()]}),{}}),r(mt,[I,p],function(e,t){return e.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(e){this.settings=t.extend({},this.Defaults,e)},preRender:function(e){e.addClass(this.settings.containerClass,"body")},applyClasses:function(e){var t=this,n=t.settings,r,i,o;r=e.items().filter(":visible"),i=n.firstControlClass,o=n.lastControlClass,r.each(function(e){e.removeClass(i).removeClass(o),n.controlClass&&e.addClass(n.controlClass)}),r.eq(0).addClass(i),r.eq(-1).addClass(o)},renderHtml:function(e){var t=this,n=t.settings,r,i="";return r=e.items(),r.eq(0).addClass(n.firstControlClass),r.eq(-1).addClass(n.lastControlClass),r.each(function(e){n.controlClass&&e.addClass(n.controlClass),i+=e.renderHtml()}),i},recalc:function(){},postRender:function(){}})}),r(gt,[mt],function(e){return e.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(e){e.items().filter(":visible").each(function(e){var t=e.settings;e.layoutRect({x:t.x,y:t.y,w:t.w,h:t.h}),e.recalc&&e.recalc()})},renderHtml:function(e){return'<div id="'+e._id+'-absend" class="'+e.classPrefix+'abs-end"></div>'+this._super(e)}})}),r(vt,[V,G],function(e,t){return e.extend({Mixins:[t],Defaults:{classes:"widget tooltip tooltip-n"},text:function(e){var t=this;return"undefined"!=typeof e?(t._value=e,t._rendered&&(t.getEl().lastChild.innerHTML=t.encode(e)),t):t._value},renderHtml:function(){var e=this,t=e.classPrefix;return'<div id="'+e._id+'" class="'+e.classes()+'" role="presentation">'+'<div class="'+t+'tooltip-arrow"></div>'+'<div class="'+t+'tooltip-inner">'+e.encode(e._text)+"</div>"+"</div>"},repaint:function(){var e=this,t,n;t=e.getEl().style,n=e._layoutRect,t.left=n.x+"px",t.top=n.y+"px",t.zIndex=131070}})}),r(yt,[V,vt],function(e,t){var n,r=e.extend({init:function(e){var t=this;t._super(e),t.canFocus=!0,e.tooltip&&r.tooltips!==!1&&t.on("mouseenter mouseleave",function(n){var r=t.tooltip().moveTo(-65535);if(n.control==t&&"mouseenter"==n.type){var i=r.text(e.tooltip).show().testMoveRel(t.getEl(),["bc-tc","bc-tl","bc-tr"]);r.toggleClass("tooltip-n","bc-tc"==i),r.toggleClass("tooltip-nw","bc-tl"==i),r.toggleClass("tooltip-ne","bc-tr"==i),r.moveRel(t.getEl(),i)}else r.hide()}),t.aria("label",e.tooltip)},tooltip:function(){var e=this;return n||(n=new t({type:"tooltip"}),n.renderTo(e.getContainerElm())),n},active:function(e){var t=this,n;return e!==n&&(t.aria("pressed",e),t.toggleClass("active",e)),t._super(e)},disabled:function(e){var t=this,n;return e!==n&&(t.aria("disabled",e),t.toggleClass("disabled",e)),t._super(e)},postRender:function(){var e=this,t=e.settings;e._rendered=!0,e._super(),e.parent()||!t.width&&!t.height||(e.initLayoutRect(),e.repaint()),t.autofocus&&setTimeout(function(){e.focus()},0)},remove:function(){this._super(),n&&(n.remove(),n=null)}});return r}),r(bt,[yt],function(e){return e.extend({Defaults:{classes:"widget btn",role:"button"},init:function(e){var t=this,n;t.on("click mousedown",function(e){e.preventDefault()}),t._super(e),n=e.size,e.subtype&&t.addClass(e.subtype),n&&t.addClass("btn-"+n)},repaint:function(){var e=this.getEl().firstChild.style;e.width=e.height="100%",this._super()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.settings.icon,i="";return e.settings.image&&(r="none",i=" style=\"background-image: url('"+e.settings.image+"')\""),r=e.settings.icon?n+"ico "+n+"i-"+r:"",'<div id="'+t+'" class="'+e.classes()+'" tabindex="-1">'+'<button role="presentation" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+i+"></i>":"")+(e._text?(r?" ":"")+e.encode(e._text):"")+"</button>"+"</div>"}})}),r(Ct,[q],function(e){return e.extend({Defaults:{defaultType:"button",role:"toolbar"},renderHtml:function(){var e=this,t=e._layout;return e.addClass("btn-group"),e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes()+'">'+'<div id="'+e._id+'-body">'+(e.settings.html||"")+t.renderHtml(e)+"</div>"+"</div>"}})}),r(xt,[yt],function(e){return e.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(e){var t=this;t._super(e),t.on("click mousedown",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault(),t.disabled()||t.checked(!t.checked())}),t.checked(t.settings.checked)},checked:function(e){var t=this;return"undefined"!=typeof e?(e?t.addClass("checked"):t.removeClass("checked"),t._checked=e,t.aria("checked",e),t):t._checked},value:function(e){return this.checked(e)},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'<div id="'+t+'" class="'+e.classes()+'" unselectable="on" aria-labeledby="'+t+'-al" tabindex="-1">'+'<i class="'+n+"ico "+n+'i-checkbox"></i>'+'<span id="'+t+'-al" class="'+n+'label">'+e.encode(e._text)+"</span>"+"</div>"}})}),r(wt,[bt,X],function(e,t){return e.extend({showPanel:function(){var e=this,n=e.settings;n.panel.popover=!0,n.panel.autohide=!0,e.active(!0),e.panel?e.panel.show():(e.panel=new t(n.panel).on("hide",function(){e.active(!1)}).parent(e).renderTo(e.getContainerElm()),e.panel.fire("show"),e.panel.reflow()),e.panel.moveRel(e.getEl(),n.popoverAlign||"bc-tc")},hidePanel:function(){var e=this;e.panel&&e.panel.hide()},postRender:function(){var e=this;return e.on("click",function(t){t.control===e&&(e.panel&&e.panel.visible()?e.hidePanel():e.showPanel())}),e._super()}})}),r(_t,[wt,v],function(e,t){var n=t.DOM;return e.extend({init:function(e){this._super(e),this.addClass("colorbutton")},color:function(e){return e?(this._color=e,this.getEl("preview").style.backgroundColor=e,this):this._color},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"",i=e.settings.image?" style=\"background-image: url('"+e.settings.image+"')\"":"";return'<div id="'+t+'" class="'+e.classes()+'">'+'<button role="presentation" hidefocus type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+i+"></i>":"")+'<span id="'+t+'-preview" class="'+n+'preview"></span>'+(e._text?(r?" ":"")+e._text:"")+"</button>"+'<button type="button" class="'+n+'open" hidefocus tabindex="-1">'+' <i class="'+n+'caret"></i>'+"</button>"+"</div>"},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(r){r.control!=e||n.getParent(r.target,"."+e.classPrefix+"open")||(r.stopImmediatePropagation(),t.call(e,r))}),delete e.settings.onclick,e._super()}})}),r(Nt,[yt,z],function(e,t){return e.extend({init:function(e){var n=this;n._super(e),n.addClass("combobox"),n.on("click",function(e){for(var t=e.target;t;)t.id&&-1!=t.id.indexOf("-open")&&n.fire("action"),t=t.parentNode}),n.on("keydown",function(e){"INPUT"==e.target.nodeName&&13==e.keyCode&&n.parents().reverse().each(function(t){return e.preventDefault(),n.fire("change"),t.submit?(t.submit(),!1):void 0})}),e.placeholder&&(n.addClass("placeholder"),n.on("focusin",function(){n._hasOnChange||(t.on(n.getEl("inp"),"change",function(){n.fire("change")}),n._hasOnChange=!0),n.hasClass("placeholder")&&(n.getEl("inp").value="",n.removeClass("placeholder"))}),n.on("focusout",function(){0===n.value().length&&(n.getEl("inp").value=e.placeholder,n.addClass("placeholder"))}))},value:function(e){var t=this;return"undefined"!=typeof e?(t._value=e,t.removeClass("placeholder"),t._rendered&&(t.getEl("inp").value=e),t):t._rendered?(e=t.getEl("inp").value,e!=t.settings.placeholder?e:""):t._value},disabled:function(e){var t=this;t._super(e),t._rendered&&(t.getEl("inp").disabled=e)},focus:function(){this.getEl("inp").focus()},repaint:function(){var e=this,n=e.getEl(),r=e.getEl("open"),i=e.layoutRect(),o,a;o=r?i.w-r.offsetWidth-10:i.w-10;var s=document;return s.all&&(!s.documentMode||s.documentMode<=8)&&(a=e.layoutRect().h-2+"px"),t.css(n.firstChild,{width:o,lineHeight:a}),e._super(),e},postRender:function(){var e=this;return t.on(this.getEl("inp"),"change",function(){e.fire("change")}),e._super()},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.classPrefix,i=n.value||n.placeholder||"",o,a,s="";return o=n.icon?r+"ico "+r+"i-"+n.icon:"",a=e._text,(o||a)&&(s='<div id="'+t+'-open" class="'+r+"btn "+r+'open" tabIndex="-1">'+'<button id="'+t+'-action" type="button" hidefocus tabindex="-1">'+(o?'<i class="'+o+'"></i>':'<i class="'+r+'caret"></i>')+(a?(o?" ":"")+a:"")+"</button>"+"</div>",e.addClass("has-open")),'<div id="'+t+'" class="'+e.classes()+'">'+'<input id="'+t+'-inp" class="'+r+"textbox "+r+'placeholder" value="'+i+'" hidefocus="true">'+s+"</div>"}})}),r(Et,[V,J],function(e,t){return e.extend({Defaults:{delimiter:"\xbb"},init:function(e){var t=this;t._super(e),t.addClass("path"),t.canFocus=!0,t.on("click",function(e){var n,r=e.target;(n=r.getAttribute("data-index"))&&t.fire("select",{value:t.data()[n],index:n})})},focus:function(){var e=this;return e.keyNav=new t({root:e,enableLeftRight:!0}),e.keyNav.focusFirst(),e},data:function(e){var t=this;return"undefined"!=typeof e?(t._data=e,t.update(),t):t._data},update:function(){this.getEl().innerHTML=this._getPathHtml()},postRender:function(){var e=this;e._super(),e.data(e.settings.data)},renderHtml:function(){var e=this;return'<div id="'+e._id+'" class="'+e.classPrefix+'path">'+e._getPathHtml()+"</div>"},_getPathHtml:function(){var e=this,t=e._data||[],n,r,i="",o=e.classPrefix;for(n=0,r=t.length;r>n;n++)i+=(n>0?'<div class="'+o+'divider" aria-hidden="true"> '+e.settings.delimiter+" </div>":"")+'<div role="button" class="'+o+"path-item"+(n==r-1?" "+o+"last":"")+'" data-index="'+n+'" tabindex="-1" id="'+e._id+"-"+n+'">'+t[n].name+"</div>";return i||(i='<div class="'+o+'path-item">&nbsp;</div>'),i}})}),r(St,[Et,st],function(e,t){return e.extend({postRender:function(){function e(e){return 1===e.nodeType&&("BR"==e.nodeName||!!e.getAttribute("data-mce-bogus"))}var n=this,r=t.activeEditor;return n.on("select",function(t){var n=[],i,o=r.getBody();for(r.focus(),i=r.selection.getStart();i&&i!=o;)e(i)||n.push(i),i=i.parentNode;r.selection.select(n[n.length-1-t.index]),r.nodeChanged()}),r.on("nodeChange",function(t){for(var i=[],o=t.parents,a=o.length;a--;)if(1==o[a].nodeType&&!e(o[a])){var s=r.fire("ResolveName",{name:o[a].nodeName.toLowerCase(),target:o[a]});i.push({name:s.name})}n.data(i)}),n._super()}})}),r(kt,[q],function(e){return e.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.addClass("formitem"),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+(e.settings.title?'<div id="'+e._id+'-title" class="'+n+'title">'+e.settings.title+"</div>":"")+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div>"+"</div>"}})}),r(Tt,[q,kt],function(e,t){return e.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:20,labelGap:30,spacing:10},preRender:function(){var e=this,n=e.items();n.each(function(n){var r,i=n.settings.label;i&&(r=new t({layout:"flex",autoResize:"overflow",defaults:{flex:1},items:[{type:"label",text:i,flex:0,forId:n._id}]}),r.type="formitem","undefined"==typeof n.settings.flex&&(n.settings.flex=1),e.replace(n,r),r.add(n))})},recalcLabels:function(){var e=this,t=0,n=[],r,i;if(e.settings.labelGapCalc!==!1)for(e.items().filter("formitem").each(function(e){var r=e.items()[0],i=r.getEl().clientWidth;t=i>t?i:t,n.push(r)}),i=e.settings.labelGap||0,r=n.length;r--;)n[r].settings.minWidth=t+i},visible:function(e){var t=this._super(e);return e===!0&&this._rendered&&this.recalcLabels(),t},submit:function(){var e=this.getParentCtrl(document.activeElement);return e&&e.blur(),this.fire("submit",{data:this.toJSON()})},postRender:function(){var e=this;e._super(),e.recalcLabels(),e.fromJSON(e.settings.data)}})}),r(Rt,[Tt],function(e){return e.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.preRender(),t.preRender(e),'<fieldset id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+(e.settings.title?'<legend id="'+e._id+'-title" class="'+n+'fieldset-title">'+e.settings.title+"</legend>":"")+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div>"+"</fieldset>"}})}),r(At,[Nt],function(e){return e.extend({init:function(e){var t=this,n=tinymce.activeEditor,r;e.spellcheck=!1,r=n.settings.file_browser_callback,r&&(e.icon="browse",e.onaction=function(){r(t.getEl("inp").id,t.getEl("inp").value,e.filetype,window)}),t._super(e)}})}),r(Bt,[gt],function(e){return e.extend({recalc:function(e){var t=e.layoutRect(),n=e.paddingBox();e.items().filter(":visible").each(function(e){e.layoutRect({x:n.left,y:n.top,w:t.innerW-n.right-n.left,h:t.innerH-n.top-n.bottom}),e.recalc&&e.recalc()})}})}),r(Lt,[gt],function(e){return e.extend({recalc:function(e){var t,n,r,i,o,a,s,l,c,u,d,f,p,h,m,g,v=[],y,b,C,x,w,_,N,E,S,k,T,R,A,B,L,M,D,H,P,O,I,F,W,z,V=Math.max,U=Math.min;for(r=e.items().filter(":visible"),i=e.layoutRect(),o=e._paddingBox,a=e.settings,f=a.direction,s=a.align,l=a.pack,c=a.spacing||0,("row-reversed"==f||"column-reverse"==f)&&(r=r.set(r.toArray().reverse()),f=f.split("-")[0]),"column"==f?(S="y",N="h",E="minH",k="maxH",R="innerH",T="top",A="bottom",B="deltaH",L="contentH",I="left",H="w",M="x",D="innerW",P="minW",O="maxW",F="right",W="deltaW",z="contentW"):(S="x",N="w",E="minW",k="maxW",R="innerW",T="left",A="right",B="deltaW",L="contentW",I="top",H="h",M="y",D="innerH",P="minH",O="maxH",F="bottom",W="deltaH",z="contentH"),d=i[R]-o[T]-o[T],_=u=0,t=0,n=r.length;n>t;t++)p=r[t],h=p.layoutRect(),m=p.settings,g=m.flex,d-=n-1>t?c:0,g>0&&(u+=g,h[k]&&v.push(p),h.flex=g),d-=h[E],y=o[I]+h[P]+o[F],y>_&&(_=y);if(x={},x[E]=0>d?i[E]-d+i[B]:i[R]-d+i[B],x[P]=_+i[W],x[L]=i[R]-d,x[z]=_,x.minW=U(x.minW,i.maxW),x.minH=U(x.minH,i.maxH),x.minW=V(x.minW,i.startMinWidth),x.minH=V(x.minH,i.startMinHeight),!i.autoResize||x.minW==i.minW&&x.minH==i.minH){for(C=d/u,t=0,n=v.length;n>t;t++)p=v[t],h=p.layoutRect(),b=h[k],y=h[E]+Math.ceil(h.flex*C),y>b?(d-=h[k]-h[E],u-=h.flex,h.flex=0,h.maxFlexSize=b):h.maxFlexSize=0;for(C=d/u,w=o[T],x={},0===u&&("end"==l?w=d+o[T]:"center"==l?(w=Math.round(i[R]/2-(i[R]-d)/2)+o[T],0>w&&(w=o[T])):"justify"==l&&(w=o[T],c=Math.floor(d/(r.length-1)))),x[M]=o[I],t=0,n=r.length;n>t;t++)p=r[t],h=p.layoutRect(),y=h.maxFlexSize||h[E],"center"===s?x[M]=Math.round(i[D]/2-h[H]/2):"stretch"===s?(x[H]=V(h[P]||0,i[D]-o[I]-o[F]),x[M]=o[I]):"end"===s&&(x[M]=i[D]-h[H]-o.top),h.flex>0&&(y+=Math.ceil(h.flex*C)),x[N]=y,x[S]=w,p.layoutRect(x),p.recalc&&p.recalc(),w+=y+c}else if(x.w=x.minW,x.h=x.minH,e.layoutRect(x),this.recalc(e),null===e._lastRect){var q=e.parent();q&&(q._lastRect=null,q.recalc())}}})}),r(Mt,[mt],function(e){return e.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(e){e.items().filter(":visible").each(function(e){e.recalc&&e.recalc()})}})}),r(Dt,[U,V,yt,X,p,st,g],function(e,t,n,r,i,o,a){function s(e){function t(e){return e.replace(/%(\w+)/g,"")}var n=o.activeEditor,r,i,a=n.dom,s="",l,c;return c=n.settings.preview_styles,c===!1?"":(c||(c="font-family font-size font-weight text-decoration text-transform color background-color border border-radius"),(e=n.formatter.get(e))?(e=e[0],r=e.block||e.inline||"span",i=a.create(r),u(e.styles,function(e,n){e=t(e),e&&a.setStyle(i,n,e)}),u(e.attributes,function(e,n){e=t(e),e&&a.setAttrib(i,n,e)}),u(e.classes,function(e){e=t(e),a.hasClass(i,e)||a.addClass(i,e)}),n.fire("PreviewFormats"),a.setStyles(i,{position:"absolute",left:-65535}),n.getBody().appendChild(i),l=a.getStyle(n.getBody(),"fontSize",!0),l=/px$/.test(l)?parseInt(l,10):0,u(c.split(" "),function(e){var t=a.getStyle(i,e,!0);if(!("background-color"==e&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)&&(t=a.getStyle(n.getBody(),e,!0),"#ffffff"==a.toHex(t).toLowerCase())||"color"==e&&"#000000"==a.toHex(t).toLowerCase())){if("font-size"==e&&/em|%$/.test(t)){if(0===l)return;t=parseFloat(t,10)/(/%$/.test(t)?100:1),t=t*l+"px"}"border"==e&&t&&(s+="padding:0 2px;"),s+=e+":"+t+";"}}),n.fire("AfterPreviewFormats"),a.remove(i),s):void 0)}function l(e,t){return function(){var n=this;o.activeEditor.on("nodeChange",function(r){var i=o.activeEditor.formatter,a=null;u(r.parents,function(n){return u(e,function(e){return t?i.matchNode(n,t,{value:e.value})&&(a=e.value):i.matchNode(n,e.value)&&(a=e.value),a?!1:void 0}),a?!1:void 0}),n.value(a)})}}function c(e){e=e.split(";");for(var t=e.length;t--;)e[t]=e[t].split("=");return e}var u=i.each;t.translate=function(e){return o.translate(e)},n.tooltips=!a.iOS,o.on("AddEditor",function(t){function n(){function e(r){var i=[];if(r)return u(r,function(r){var o={text:r.title,icon:r.icon,preview:!0};if(r.items)o.menu=e(r.items);else{var a=r.format||"custom"+t++;r.format||(r.name=a,n.push(r)),o.textStyle=function(){return s(a)},o.onclick=function(){m(a)},o.onPostRender=function(){var e=this;e.parent().on("show",function(){e.disabled(!g.formatter.canApply(a)),e.active(g.formatter.match(a))})}}i.push(o)}),i}var t=0,n=[],r=[{title:"Headers",items:[{title:"Header 1",format:"h1"},{title:"Header 2",format:"h2"},{title:"Header 3",format:"h3"},{title:"Header 4",format:"h4"},{title:"Header 5",format:"h5"},{title:"Header 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}];g.on("init",function(){u(n,function(e){g.formatter.register(e.name,e)})});var i=e(g.settings.style_formats||r);return i}function a(){return g.undoManager?g.undoManager.hasUndo():!1}function d(){return g.undoManager?g.undoManager.hasRedo():!1}function f(){var e=this;e.disabled(!a()),g.on("Undo Redo AddUndo TypingUndo",function(){e.disabled(!a())})}function p(){var e=this;e.disabled(!d()),g.on("Undo Redo AddUndo TypingUndo",function(){e.disabled(!d())})}function h(){var e=this;g.on("VisualAid",function(t){e.active(t.hasVisual)}),e.active(g.hasVisual)}function m(e){e.control&&(e=e.control.value()),e&&o.activeEditor.execCommand("mceToggleFormat",!1,e)}var g=t.editor,v;v=n(),u({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(e,t){g.addButton(t,{tooltip:e,onPostRender:function(){var e=this;g.formatter?g.formatter.formatChanged(t,function(t){e.active(t)}):g.on("init",function(){g.formatter.formatChanged(t,function(t){e.active(t)})})},onclick:function(){m(t)}})}),u({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],hr:["Insert horizontal rule","InsertHorizontalRule"],removeformat:["Clear formatting","RemoveFormat"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"]},function(e,t){g.addButton(t,{tooltip:e[0],cmd:e[1]})}),u({blockquote:["Toggle blockquote","mceBlockQuote"],numlist:["Numbered list","InsertOrderedList"],bullist:["Bulleted list","InsertUnorderedList"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"]},function(e,t){g.addButton(t,{tooltip:e[0],cmd:e[1],onPostRender:function(){var e=this;g.formatter?g.formatter.formatChanged(t,function(t){e.active(t)}):g.on("init",function(){g.formatter.formatChanged(t,function(t){e.active(t)})})}})}),g.addButton("undo",{tooltip:"Undo",onPostRender:f,cmd:"undo"}),g.addButton("redo",{tooltip:"Redo",onPostRender:p,cmd:"redo"}),g.addMenuItem("newdocument",{text:"New document",shortcut:"Ctrl+N",icon:"newdocument",cmd:"mceNewDocument"}),g.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Ctrl+Z",onPostRender:f,cmd:"undo"}),g.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Ctrl+Y",onPostRender:p,cmd:"redo"}),g.addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:h,cmd:"mceToggleVisualAid"}),u({cut:["Cut","Cut","Ctrl+X"],copy:["Copy","Copy","Ctrl+C"],paste:["Paste","Paste","Ctrl+V"],selectall:["Select all","SelectAll","Ctrl+A"],bold:["Bold","Bold","Ctrl+B"],italic:["Italic","Italic","Ctrl+I"],underline:["Underline","Underline"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"]},function(e,t){g.addMenuItem(t,{text:e[0],icon:t,shortcut:e[2],cmd:e[1]})}),g.on("mousedown",function(){r.hideAll()}),e.add("styleselect",function(t){var n=[].concat(v);return e.create("menubutton",i.extend({text:"Formats",menu:n},t))}),e.add("formatselect",function(t){var n=[],r=c(g.settings.block_formats||"Paragraph=p;Address=address;Pre=pre;Header 1=h1;Header 2=h2;Header 3=h3;Header 4=h4;Header 5=h5;Header 6=h6");return u(r,function(e){n.push({text:{raw:e[0]},value:e[1],textStyle:function(){return s(e[1])}})}),e.create("listbox",i.extend({text:{raw:r[0][0]},values:n,fixedWidth:!0,onselect:m,onPostRender:l(n)},t))}),e.add("fontselect",function(t){var n="Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",r=[],a=c(g.settings.font_formats||n);return u(a,function(e){r.push({text:{raw:e[0]},value:e[1],textStyle:-1==e[1].indexOf("dings")?"font-family:"+e[1]:""})}),e.create("listbox",i.extend({text:"Font Family",tooltip:"Font Family",values:r,fixedWidth:!0,onPostRender:l(r,"fontname"),onselect:function(e){e.control.settings.value&&o.activeEditor.execCommand("FontName",!1,e.control.settings.value)}},t))}),e.add("fontsizeselect",function(t){var n=[],r="8pt 10pt 12pt 14pt 18pt 24pt 36pt",a=g.settings.fontsize_formats||r;return u(a.split(" "),function(e){n.push({text:e,value:e})}),e.create("listbox",i.extend({text:"Font Sizes",tooltip:"Font Sizes",values:n,fixedWidth:!0,onPostRender:l(n,"fontsize"),onclick:function(e){e.control.settings.value&&o.activeEditor.execCommand("FontSize",!1,e.control.settings.value)}},t))}),g.addMenuItem("formats",{text:"Formats",menu:v})})}),r(Ht,[gt],function(e){return e.extend({recalc:function(e){var t=e.settings,n,r,i,o,a,s,l,c,u,d,f,p,h,m,g,v,y,b,C,x,w,_,N=[],E=[],S,k,T,R,A,B;for(t=e.settings,i=e.items().filter(":visible"),o=e.layoutRect(),r=t.columns||Math.ceil(Math.sqrt(i.length)),n=Math.ceil(i.length/r),y=t.spacingH||t.spacing||0,b=t.spacingV||t.spacing||0,C=t.alignH||t.align,x=t.alignV||t.align,g=e._paddingBox,C&&"string"==typeof C&&(C=[C]),x&&"string"==typeof x&&(x=[x]),d=0;r>d;d++)N.push(0);for(f=0;n>f;f++)E.push(0);for(f=0;n>f;f++)for(d=0;r>d&&(u=i[f*r+d],u);d++)c=u.layoutRect(),S=c.minW,k=c.minH,N[d]=S>N[d]?S:N[d],E[f]=k>E[f]?k:E[f];for(A=o.innerW-g.left-g.right,w=0,d=0;r>d;d++)w+=N[d]+(d>0?y:0),A-=(d>0?y:0)+N[d];for(B=o.innerH-g.top-g.bottom,_=0,f=0;n>f;f++)_+=E[f]+(f>0?b:0),B-=(f>0?b:0)+E[f];if(w+=g.left+g.right,_+=g.top+g.bottom,l={},l.minW=w+(o.w-o.innerW),l.minH=_+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW==o.minW&&l.minH==o.minH){o.autoResize&&(l=e.layoutRect(l),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH);var L;L="start"==t.packV?0:B>0?Math.floor(B/n):0;var M=0,D=t.flexWidths;if(D)for(d=0;d<D.length;d++)M+=D[d];else M=r;var H=A/M;for(d=0;r>d;d++)N[d]+=D?Math.ceil(D[d]*H):H;for(h=g.top,f=0;n>f;f++){for(p=g.left,s=E[f]+L,d=0;r>d&&(u=i[f*r+d],u);d++)m=u.settings,c=u.layoutRect(),a=N[d],T=R=0,c.x=p,c.y=h,v=m.alignH||(C?C[d]||C[0]:null),"center"==v?c.x=p+a/2-c.w/2:"right"==v?c.x=p+a-c.w:"stretch"==v&&(c.w=a),v=m.alignV||(x?x[d]||x[0]:null),"center"==v?c.y=h+s/2-c.h/2:"bottom"==v?c.y=h+s-c.h:"stretch"==v&&(c.h=s),u.layoutRect(c),p+=a+y,u.recalc&&u.recalc();h+=s+b}}else if(l.w=l.minW,l.h=l.minH,e.layoutRect(l),this.recalc(e),null===e._lastRect){var P=e.parent();P&&(P._lastRect=null,P.recalc())}}})}),r(Pt,[yt],function(e){return e.extend({renderHtml:function(){var e=this;return e.addClass("iframe"),e.canFocus=!1,'<iframe id="'+e._id+'" class="'+e.classes()+'" tabindex="-1" src="'+(e.settings.url||"javascript:''")+'" frameborder="0"></iframe>'},src:function(e){this.getEl().src=e
-},html:function(e){return this.getEl().contentWindow.document.body.innerHTML=e,this}})}),r(Ot,[yt],function(e){return e.extend({init:function(e){var t=this;t._super(e),t.addClass("widget"),t.addClass("label"),t.canFocus=!1,e.multiline&&t.addClass("autoscroll"),e.strong&&t.addClass("strong")},initLayoutRect:function(){var e=this,t=e._super();return e.settings.multiline&&(e.getEl().offsetWidth>t.maxW&&(t.minW=t.maxW,e.addClass("multiline")),e.getEl().style.width=t.minW+"px",t.startMinH=t.h=t.minH=Math.min(t.maxH,e.getEl().offsetHeight)),t},disabled:function(e){var t=this,n;return e!==n&&(t.toggleClass("label-disabled",e),t._rendered&&(t.getEl()[0].className=t.classes())),t._super(e)},repaint:function(){var e=this;return e.settings.multiline||(e.getEl().style.lineHeight=e.layoutRect().h+"px"),e._super()},text:function(e){var t=this;return t._rendered&&e&&(t.getEl().innerHTML=t.encode(e)),t._super(e)},renderHtml:function(){var e=this,t=e.settings.forId;return'<label id="'+e._id+'" class="'+e.classes()+'"'+(t?' for="'+t:"")+'">'+e.encode(e._text)+"</label>"}})}),r(It,[q,J],function(e,t){return e.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(e){var t=this;t._super(e),t.addClass("toolbar")},postRender:function(){var e=this;return e.items().addClass("toolbar-item"),e.keyNav=new t({root:e,enableLeftRight:!0}),e._super()}})}),r(Ft,[It],function(e){return e.extend({Defaults:{role:"menubar",containerCls:"menubar",defaults:{type:"menubutton"}}})}),r(Wt,[bt,U,Ft],function(e,t,n){function r(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1}var i=e.extend({init:function(e){var t=this;t._renderOpen=!0,t._super(e),t.addClass("menubtn"),e.fixedWidth&&t.addClass("fixed-width"),t.aria("haspopup",!0),t.hasPopup=!0},showMenu:function(){var e=this,n=e.settings,r;return e.menu&&e.menu.visible()?e.hideMenu():(e.menu||(r=n.menu||[],r.length?r={type:"menu",items:r}:r.type=r.type||"menu",e.menu=t.create(r).parent(e).renderTo(e.getContainerElm()),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control===e.menu&&e.focus()}),e.menu.on("show hide",function(t){t.control==e.menu&&e.activeMenu("show"==t.type)}).fire("show"),e.aria("expanded",!0)),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),e.menu.moveRel(e.getEl(),["bl-tl","tl-bl"]),void 0)},hideMenu:function(){var e=this;e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1))},activeMenu:function(e){this.toggleClass("active",e)},renderHtml:function(){var e=this,t=e._id,r=e.classPrefix,i=e.settings.icon?r+"ico "+r+"i-"+e.settings.icon:"";return e.aria("role",e.parent()instanceof n?"menuitem":"button"),'<div id="'+t+'" class="'+e.classes()+'" tabindex="-1">'+'<button id="'+t+'-open" role="presentation" type="button" tabindex="-1">'+(i?'<i class="'+i+'"></i>':"")+"<span>"+(e._text?(i?" ":"")+e.encode(e._text):"")+"</span>"+' <i class="'+r+'caret"></i>'+"</button>"+"</div>"},postRender:function(){var e=this;return e.on("click",function(t){t.control===e&&r(t.target,e.getEl())&&(e.showMenu(),t.keyboard&&e.menu.items()[0].focus())}),e.on("mouseenter",function(t){var n=t.control,r=e.parent(),o;n&&r&&n instanceof i&&n.parent()==r&&(r.items().filter("MenuButton").each(function(e){e.hideMenu&&e!=n&&(e.menu&&e.menu.visible()&&(o=!0),e.hideMenu())}),o&&(n.focus(),n.showMenu()))}),e._super()},text:function(e){var t=this,n,r;if(t._rendered)for(r=t.getEl("open").getElementsByTagName("span"),n=0;n<r.length;n++)r[n].innerHTML=t.encode(e);return this._super(e)},remove:function(){this._super(),this.menu&&this.menu.remove()}});return i}),r(zt,[Wt],function(e){return e.extend({init:function(e){var t=this,n,r,i,o,a;if(t._values=n=e.values,n){for(r=0;r<n.length;r++)i=n[r].selected||e.value===n[r].value,i&&(o=o||n[r].text,t._value=n[r].value);e.menu=n}e.text=e.text||o||n[0].text,t._super(e),t.addClass("listbox"),t.on("select",function(n){var r=n.control;a&&(n.lastControl=a),e.multiple?r.active(!r.active()):t.value(n.control.settings.value),a=r})},value:function(e){function t(e,n){e.items().each(function(e){r=e.value()===n,r&&(i=i||e.text()),e.active(r),e.menu&&t(e.menu,n)})}var n=this,r,i,o,a;if("undefined"!=typeof e){if(n.menu)t(n.menu,e);else for(o=n.settings.menu,a=0;a<o.length;a++)r=o[a].value==e,r&&(i=i||o[a].text),o[a].active=r;n.text(i||this.settings.text)}return n._super(e)}})}),r(Vt,[yt,U],function(e,t){return e.extend({Defaults:{border:0,role:"menuitem"},init:function(e){var t=this;t.hasPopup=!0,t._super(e),e=t.settings,t.addClass("menu-item"),e.menu&&t.addClass("menu-item-expand"),e.preview&&t.addClass("menu-item-preview"),("-"===t._text||"|"===t._text)&&(t.addClass("menu-item-sep"),t.aria("role","separator"),t.canFocus=!1,t._text="-"),e.selectable&&(t.aria("role","menuitemcheckbox"),t.aria("checked",!0),t.addClass("menu-item-checkbox"),e.icon="selected"),t.on("mousedown",function(e){e.preventDefault()}),t.on("mouseenter click",function(n){n.control===t&&(e.menu||"click"!==n.type?(t.showMenu(),n.keyboard&&setTimeout(function(){t.menu.items()[0].focus()},0)):(t.parent().hideAll(),t.fire("cancel"),t.fire("select")))}),e.menu&&t.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var e=this,n=e.settings,r;if(e.parent().items().each(function(t){t!==e&&t.hideMenu()}),n.menu){r=e.menu,r?r.show():(r=n.menu,r.length?r={type:"menu",items:r}:r.type=r.type||"menu",r=e.menu=t.create(r).parent(e).renderTo(e.getContainerElm()),r.reflow(),r.fire("show"),r.on("cancel",function(){e.focus()}),r.on("hide",function(t){t.control===r&&e.removeClass("selected")})),r._parentMenu=e.parent(),r.addClass("menu-sub");var i=r.testMoveRel(e.getEl(),["tr-tl","br-bl","tl-tr","bl-br"]);r.moveRel(e.getEl(),i),i="menu-sub-"+i,r.removeClass(r._lastRel),r.addClass(i),r._lastRel=i,e.addClass("selected"),e.aria("expanded",!0)}},hideMenu:function(){var e=this;return e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1)),e},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.classPrefix,i=e.encode(e._text),o=e.settings.icon;return o&&e.parent().addClass("menu-has-icons"),o=r+"ico "+r+"i-"+(e.settings.icon||"none"),'<div id="'+t+'" class="'+e.classes()+'" tabindex="-1">'+("-"!==i?'<i class="'+o+'"></i>&nbsp;':"")+("-"!==i?'<span id="'+t+'-text" class="'+r+'text">'+i+"</span>":"")+(n.shortcut?'<div id="'+t+'-shortcut" class="'+r+'menu-shortcut">'+n.shortcut+"</div>":"")+(n.menu?'<div class="'+r+'caret"></div>':"")+"</div>"},postRender:function(){var e=this,t=e.settings,n=t.textStyle;if("function"==typeof n&&(n=n()),n){var r=e.getEl("text");r&&r.setAttribute("style",n)}return e._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}})}),r(Ut,[X,J,Vt],function(e,t,n){var r=e.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"menu"},init:function(e){var r=this;e.autohide=!0,e.constrainToViewport=!0,r._super(e),r.addClass("menu"),r.keyNav=new t({root:r,enableUpDown:!0,enableLeftRight:!0,leftAction:function(){r.parent()instanceof n&&r.keyNav.cancel()},onCancel:function(){r.fire("cancel",{},!1),r.hide()}})},repaint:function(){return this.toggleClass("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){var e=this;e.hideAll(),e.fire("cancel"),e.fire("select")},hideAll:function(){var e=this;return this.find("menuitem").exec("hideMenu"),e._super()},preRender:function(){var e=this;return e.items().each(function(t){var n=t.settings;return n.icon||n.selectable?(e._hasIcons=!0,!1):void 0}),e._super()}});return r}),r(qt,[xt],function(e){return e.extend({Defaults:{classes:"radio",role:"radio"}})}),r($t,[yt,$],function(e,t){return e.extend({renderHtml:function(){var e=this,t=e.classPrefix;return e.addClass("resizehandle"),"both"==e.settings.direction&&e.addClass("resizehandle-both"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes()+'">'+'<i class="'+t+"ico "+t+'i-resize"></i>'+"</div>"},postRender:function(){var e=this;e._super(),e.resizeDragHelper=new t(this._id,{start:function(){e.fire("ResizeStart")},drag:function(t){"both"!=e.settings.direction&&(t.deltaX=0),e.fire("Resize",t)},end:function(){e.fire("ResizeEnd")}})}})}),r(jt,[yt],function(e){return e.extend({renderHtml:function(){var e=this;return e.addClass("spacer"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes()+'"></div>'}})}),r(Kt,[Wt,v],function(e,t){var n=t.DOM;return e.extend({Defaults:{classes:"widget btn splitbtn",role:"splitbutton"},repaint:function(){var e=this,t=e.getEl(),r=e.layoutRect(),i,o,a;return e._super(),i=t.firstChild,o=t.lastChild,n.css(i,{width:r.w-o.offsetWidth,height:r.h-2}),n.css(o,{height:r.h-2}),a=i.firstChild.style,a.width=a.height="100%",a=o.firstChild.style,a.width=a.height="100%",e},activeMenu:function(e){var t=this;n.toggleClass(t.getEl().lastChild,t.classPrefix+"active",e)},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"";return'<div id="'+t+'" class="'+e.classes()+'">'+'<button type="button" hidefocus tabindex="-1">'+(r?'<i class="'+r+'"></i>':"")+(e._text?(r?" ":"")+e._text:"")+"</button>"+'<button type="button" class="'+n+'open" hidefocus tabindex="-1">'+(e._menuBtnText?(r?" ":"")+e._menuBtnText:"")+' <i class="'+n+'caret"></i>'+"</button>"+"</div>"},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(e){e.control!=this||n.getParent(e.target,"."+this.classPrefix+"open")||(e.stopImmediatePropagation(),t.call(this,e))}),delete e.settings.onclick,e._super()}})}),r(Gt,[Mt],function(e){return e.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"}})}),r(Yt,[K,z],function(e,t){"use stict";return e.extend({lastIdx:0,Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(e){this.activeTabId&&t.removeClass(this.getEl(this.activeTabId),this.classPrefix+"active"),this.activeTabId="t"+e,t.addClass(this.getEl("t"+e),this.classPrefix+"active"),e!=this.lastIdx&&(this.items()[this.lastIdx].hide(),this.lastIdx=e),this.items()[e].show().fire("showtab"),this.reflow()},renderHtml:function(){var e=this,t=e._layout,n="",r=e.classPrefix;return e.preRender(),t.preRender(e),e.items().each(function(t,i){n+='<div id="'+e._id+"-t"+i+'" class="'+r+'tab" unselectable="on">'+e.encode(t.settings.title)+"</div>"}),'<div id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+'<div id="'+e._id+'-head" class="'+r+'tabs">'+n+"</div>"+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+t.renderHtml(e)+"</div>"+"</div>"},postRender:function(){var e=this;e._super(),e.settings.activeTab=e.settings.activeTab||0,e.activateTab(e.settings.activeTab),this.on("click",function(t){var n=t.target.parentNode;if(t.target.parentNode.id==e._id+"-head")for(var r=n.childNodes.length;r--;)n.childNodes[r]==t.target&&e.activateTab(r)})},initLayoutRect:function(){var e=this,t,n,r;n=r=0,e.items().each(function(t,i){n=Math.max(n,t.layoutRect().minW),r=Math.max(r,t.layoutRect().minH),e.settings.activeTab!=i&&t.hide()}),e.items().each(function(e){e.settings.x=0,e.settings.y=0,e.settings.w=n,e.settings.h=r,e.layoutRect({x:0,y:0,w:n,h:r})});var i=e.getEl("head").offsetHeight;return e.settings.minWidth=n,e.settings.minHeight=r+i,t=e._super(),t.deltaH+=e.getEl("head").offsetHeight,t.innerH=t.h-t.deltaH,t}})}),r(Xt,[yt,z],function(e,t){return e.extend({init:function(e){var t=this;t._super(e),t._value=e.value||"",t.addClass("textbox"),e.multiline?t.addClass("multiline"):t.on("keydown",function(e){13==e.keyCode&&t.parents().reverse().each(function(t){return e.preventDefault(),t.submit?(t.submit(),!1):void 0})})},value:function(e){var t=this;return"undefined"!=typeof e?(t._value=e,t._rendered&&(t.getEl().value=e),t):t._rendered?t.getEl().value:t._value},repaint:function(){var e=this,t,n,r,i=0,o=0,a;t=e.getEl().style,n=e._layoutRect,a=e._lastRepaintRect||{};var s=document;return!e.settings.multiline&&s.all&&(!s.documentMode||s.documentMode<=8)&&(t.lineHeight=n.h-o+"px"),r=e._borderBox,i=r.left+r.right+8,o=r.top+r.bottom+(e.settings.multiline?8:0),n.x!==a.x&&(t.left=n.x+"px",a.x=n.x),n.y!==a.y&&(t.top=n.y+"px",a.y=n.y),n.w!==a.w&&(t.width=n.w-i+"px",a.w=n.w),n.h!==a.h&&(t.height=n.h-o+"px",a.h=n.h),e._lastRepaintRect=a,e.fire("repaint",{},!1),e},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.encode(e._value,!1),i="";return"spellcheck"in n&&(i+=' spellcheck="'+n.spellcheck+'"'),n.maxLength&&(i+=' maxlength="'+n.maxLength+'"'),n.size&&(i+=' size="'+n.size+'"'),n.subtype&&(i+=' type="'+n.subtype+'"'),n.multiline?'<textarea id="'+t+'" class="'+e.classes()+'" '+(n.rows?' rows="'+n.rows+'"':"")+' hidefocus="true"'+i+">"+r+"</textarea>":'<input id="'+t+'" class="'+e.classes()+'" value="'+r+'" hidefocus="true"'+i+">"},postRender:function(){var e=this;return t.on(e.getEl(),"change",function(t){e.fire("change",t)}),e._super()}})}),r(Jt,[z],function(e){return function(t){var n=this,r;n.show=function(i){return n.hide(),r=!0,window.setTimeout(function(){r&&t.appendChild(e.createFragment('<div class="mce-throbber"></div>'))},i||0),n},n.hide=function(){var e=t.lastChild;return e&&-1!=e.className.indexOf("throbber")&&e.parentNode.removeChild(e),r=!1,n}}}),a([l,c,u,d,f,p,h,m,g,v,y,b,C,x,w,_,N,E,S,k,T,R,A,B,L,M,D,H,P,O,I,F,W,z,V,U,q,$,j,K,G,Y,X,J,Q,Z,et,tt,nt,rt,it,ot,at,st,lt,ct,ut,dt,ft,pt,ht,mt,gt,vt,yt,bt,Ct,xt,wt,_t,Nt,Et,St,kt,Tt,Rt,At,Bt,Lt,Mt,Dt,Ht,Pt,Ot,It,Ft,Wt,zt,Vt,Ut,qt,$t,jt,Kt,Gt,Yt,Xt,Jt])}(this);
\ No newline at end of file
diff --git a/extlib/video-js/LICENSE b/extlib/video-js/LICENSE
deleted file mode 100644
index 138a50e8..00000000
--- a/extlib/video-js/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2013 Brightcove, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/extlib/video-js/demo.captions.vtt b/extlib/video-js/demo.captions.vtt
deleted file mode 100644
index e598be19..00000000
--- a/extlib/video-js/demo.captions.vtt
+++ /dev/null
@@ -1,41 +0,0 @@
-WEBVTT
-
-00:00.700 --> 00:04.110
-Captions describe all relevant audio for the hearing impaired.
-[ Heroic music playing for a seagull ]
-
-00:04.500 --> 00:05.000
-[ Splash!!! ]
-
-00:05.100 --> 00:06.000
-[ Sploosh!!! ]
-
-00:08.000 --> 00:09.225
-[ Splash...splash...splash splash splash ]
-
-00:10.525 --> 00:11.255
-[ Splash, Sploosh again ]
-
-00:13.500 --> 00:14.984
-Dolphin: eeeEEEEEeeee!
-
-00:14.984 --> 00:16.984
-Dolphin: Squawk! eeeEEE?
-
-00:25.000 --> 00:28.284
-[ A whole ton of splashes ]
-
-00:29.500 --> 00:31.000
-Mine. Mine. Mine.
-
-00:34.300 --> 00:36.000
-Shark: Chomp
-
-00:36.800 --> 00:37.900
-Shark: CHOMP!!!
-
-00:37.861 --> 00:41.193
-EEEEEEOOOOOOOOOOWHALENOISE
-
-00:42.593 --> 00:45.611
-[ BIG SPLASH ]
\ No newline at end of file
diff --git a/extlib/video-js/demo.html b/extlib/video-js/demo.html
deleted file mode 100644
index fb26a087..00000000
--- a/extlib/video-js/demo.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Video.js | HTML5 Video Player</title>
-
-  <!-- Chang URLs to wherever Video.js files will be hosted -->
-  <link href="video-js.css" rel="stylesheet" type="text/css">
-  <!-- video.js must be in the <head> for older IEs to work. -->
-  <script src="video.js"></script>
-
-  <!-- Unless using the CDN hosted version, update the URL to the Flash SWF -->
-  <script>
-    videojs.options.flash.swf = "video-js.swf";
-  </script>
-
-
-</head>
-<body>
-
-  <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
-      poster="http://video-js.zencoder.com/oceans-clip.png"
-      data-setup="{}">
-    <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
-    <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
-    <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
-    <track kind="captions" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
-  </video>
-
-</body>
-</html>
diff --git a/extlib/video-js/font/vjs.eot b/extlib/video-js/font/vjs.eot
deleted file mode 100644
index 1b8202af..00000000
--- a/extlib/video-js/font/vjs.eot
+++ /dev/null
diff --git a/extlib/video-js/font/vjs.svg b/extlib/video-js/font/vjs.svg
deleted file mode 100644
index 2059a1f2..00000000
--- a/extlib/video-js/font/vjs.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon.
-<iconset grid="16"></iconset>
-</metadata>
-<defs>
-<font id="VideoJS" horiz-adv-x="512" >
-<font-face units-per-em="512" ascent="480" descent="-32" />
-<missing-glyph horiz-adv-x="512" />
-<glyph unicode="&#xe000;" d="M 512.00,480.00 L 512.00,272.00 L 432.00,352.00 L 336.00,256.00 L 288.00,304.00 L 384.00,400.00 L 304.00,480.00 ZM 224.00,144.00 L 128.00,48.00 L 208.00-32.00 L 0.00-32.00 L 0.00,176.00 L 80.00,96.00 L 176.00,192.00 Z"  />
-<glyph unicode="&#xe001;" d="M 96.00,416.00L 416.00,224.00L 96.00,32.00 z"  />
-<glyph unicode="&#xe002;" d="M 64.00,416.00L 224.00,416.00L 224.00,32.00L 64.00,32.00zM 288.00,416.00L 448.00,416.00L 448.00,32.00L 288.00,32.00z"  />
-<glyph unicode="&#xe003;" d="M 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z"  />
-<glyph unicode="&#xe004;" d="M 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941
-		c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00
-		c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z"  />
-<glyph unicode="&#xe005;" d="M 359.765,64.235c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0.00,33.941
-		c 65.503,65.503, 65.503,172.085,0.00,237.588c-9.372,9.373-9.372,24.569,0.00,33.941c 9.372,9.371, 24.569,9.372, 33.941,0.00
-		C 417.532,335.938, 440.00,281.696, 440.00,224.00c0.00-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941
-		c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00
-		c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z"  />
-<glyph unicode="&#xe006;" d="M 445.02,18.98c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.373-9.372,24.568,0.00,33.941
-		C 471.868,103.771, 496.001,162.03, 496.001,224.00c0.00,61.969-24.133,120.229-67.952,164.049c-9.372,9.373-9.372,24.569,0.00,33.941
-		c 9.372,9.372, 24.569,9.372, 33.941,0.00c 52.885-52.886, 82.011-123.20, 82.011-197.99c0.00-74.791-29.126-145.104-82.011-197.99
-		C 457.304,21.323, 451.162,18.98, 445.02,18.98zM 359.765,64.235c-6.143,0.00-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0.00,33.941
-		c 65.503,65.503, 65.503,172.085,0.00,237.588c-9.372,9.373-9.372,24.569,0.00,33.941c 9.372,9.371, 24.569,9.372, 33.941,0.00
-		C 417.532,335.938, 440.00,281.696, 440.00,224.00c0.00-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0.00-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0.00,33.941
-		c 40.55,40.55, 40.55,106.529,0.00,147.078c-9.373,9.373-9.373,24.569,0.00,33.941c 9.373,9.372, 24.568,9.372, 33.941,0.00
-		c 59.265-59.265, 59.265-155.696,0.00-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.50,453.50 224.00,449.15 224.00,431.00 L 224.00,17.00 C 224.00-1.15 213.50-5.499 200.666,7.335 L 80.00,128.00 L 0.00,128.00 L 0.00,320.00 L 80.00,320.00 L 200.666,440.666 Z" horiz-adv-x="544"  />
-<glyph unicode="&#xe007;" d="M 256.00,480.00L 96.00,224.00L 256.00-32.00L 416.00,224.00 z"  />
-<glyph unicode="&#xe008;" d="M 0.00,480.00 L 687.158,480.00 L 687.158-35.207 L 0.00-35.207 L 0.00,480.00 z M 622.731,224.638 C 621.878,314.664 618.46,353.922 597.131,381.656 C 593.291,387.629 586.038,391.042 580.065,395.304 C 559.158,410.669 460.593,416.211 346.247,416.211 C 231.896,416.211 128.642,410.669 108.162,395.304 C 101.762,391.042 94.504,387.629 90.242,381.656 C 69.331,353.922 66.349,314.664 65.069,224.638 C 66.349,134.607 69.331,95.353 90.242,67.62 C 94.504,61.22 101.762,58.233 108.162,53.967 C 128.642,38.18 231.896,33.06 346.247,32.207 C 460.593,33.06 559.158,38.18 580.065,53.967 C 586.038,58.233 593.291,61.22 597.131,67.62 C 618.46,95.353 621.878,134.607 622.731,224.638 z M 331.179,247.952 C 325.389,318.401 287.924,359.905 220.901,359.905 C 159.672,359.905 111.54,304.689 111.54,215.965 C 111.54,126.859 155.405,71.267 227.907,71.267 C 285.79,71.267 326.306,113.916 332.701,184.742 L 263.55,184.742 C 260.81,158.468 249.843,138.285 226.69,138.285 C 190.136,138.285 183.435,174.462 183.435,212.92 C 183.435,265.854 198.665,292.886 223.951,292.886 C 246.492,292.886 260.81,276.511 262.939,247.952 L 331.179,247.952 z M 570.013,247.952 C 564.228,318.401 526.758,359.905 459.74,359.905 C 398.507,359.905 350.379,304.689 350.379,215.965 C 350.379,126.859 394.244,71.267 466.746,71.267 C 524.625,71.267 565.14,113.916 571.536,184.742 L 502.384,184.742 C 499.649,158.468 488.682,138.285 465.529,138.285 C 428.971,138.285 422.27,174.462 422.27,212.92 C 422.27,265.854 437.504,292.886 462.785,292.886 C 485.327,292.886 499.649,276.511 501.778,247.952 L 570.013,247.952 z " horiz-adv-x="687.1578947368421"  />
-<glyph unicode="&#xe009;" d="M 64.00,416.00L 448.00,416.00L 448.00,32.00L 64.00,32.00z"  />
-<glyph unicode="&#xe00a;" d="M 192.00,416.00A64.00,64.00 12780.00 1 1 320.00,416A64.00,64.00 12780.00 1 1 192.00,416zM 327.765,359.765A64.00,64.00 12780.00 1 1 455.765,359.765A64.00,64.00 12780.00 1 1 327.765,359.765zM 416.00,224.00A32.00,32.00 12780.00 1 1 480.00,224A32.00,32.00 12780.00 1 1 416.00,224zM 359.765,88.235A32.00,32.00 12780.00 1 1 423.765,88.23500000000001A32.00,32.00 12780.00 1 1 359.765,88.23500000000001zM 224.001,32.00A32.00,32.00 12780.00 1 1 288.001,32A32.00,32.00 12780.00 1 1 224.001,32zM 88.236,88.235A32.00,32.00 12780.00 1 1 152.236,88.23500000000001A32.00,32.00 12780.00 1 1 88.236,88.23500000000001zM 72.236,359.765A48.00,48.00 12780.00 1 1 168.236,359.765A48.00,48.00 12780.00 1 1 72.236,359.765zM 28.00,224.00A36.00,36.00 12780.00 1 1 100.00,224A36.00,36.00 12780.00 1 1 28.00,224z"  />
-<glyph unicode="&#xe00b;" d="M 224.00,192.00 L 224.00-16.00 L 144.00,64.00 L 48.00-32.00 L 0.00,16.00 L 96.00,112.00 L 16.00,192.00 ZM 512.00,432.00 L 416.00,336.00 L 496.00,256.00 L 288.00,256.00 L 288.00,464.00 L 368.00,384.00 L 464.00,480.00 Z"  />
-<glyph unicode="&#xe00c;" d="M 256.00,448.00 C 397.385,448.00 512.00,354.875 512.00,240.00 C 512.00,125.124 397.385,32.00 256.00,32.00 C 242.422,32.00 229.095,32.867 216.088,34.522 C 161.099-20.467 95.463-30.328 32.00-31.776 L 32.00-18.318 C 66.268-1.529 96.00,29.052 96.00,64.00 C 96.00,68.877 95.621,73.665 94.918,78.348 C 37.02,116.48 0.00,174.725 0.00,240.00 C 0.00,354.875 114.615,448.00 256.00,448.00 Z"  />
-<glyph unicode="&#x20;" horiz-adv-x="256" />
-<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
-</font></defs></svg>
\ No newline at end of file
diff --git a/extlib/video-js/font/vjs.ttf b/extlib/video-js/font/vjs.ttf
deleted file mode 100644
index a5ad4685..00000000
--- a/extlib/video-js/font/vjs.ttf
+++ /dev/null
diff --git a/extlib/video-js/font/vjs.woff b/extlib/video-js/font/vjs.woff
deleted file mode 100644
index 375510e0..00000000
--- a/extlib/video-js/font/vjs.woff
+++ /dev/null
diff --git a/extlib/video-js/video-js.css b/extlib/video-js/video-js.css
deleted file mode 100644
index 11435c32..00000000
--- a/extlib/video-js/video-js.css
+++ /dev/null
@@ -1,757 +0,0 @@
-/*!
-Video.js Default Styles (http://videojs.com)
-Version 4.2.1
-Create your own skin at http://designer.videojs.com
-*/
-/* SKIN
-================================================================================
-The main class name for all skin-specific styles. To make your own skin,
-replace all occurances of 'vjs-default-skin' with a new name. Then add your new
-skin name to your video tag instead of the default skin.
-e.g. <video class="video-js my-skin-name">
-*/
-.vjs-default-skin {
-  color: #cccccc;
-}
-/* Custom Icon Font
---------------------------------------------------------------------------------
-The control icons are from a custom font. Each icon corresponds to a character
-(e.g. "\e001"). Font icons allow for easy scaling and coloring of icons.
-*/
-@font-face {
-  font-family: 'VideoJS';
-  src: url('font/vjs.eot');
-  src: url('font/vjs.eot?#iefix') format('embedded-opentype'), url('font/vjs.woff') format('woff'), url('font/vjs.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-/* Base UI Component Classes
---------------------------------------------------------------------------------
-*/
-/* Slider - used for Volume bar and Seek bar */
-.vjs-default-skin .vjs-slider {
-  /* Replace browser focus hightlight with handle highlight */
-  outline: 0;
-  position: relative;
-  cursor: pointer;
-  padding: 0;
-  /* background-color-with-alpha */
-  background-color: #333333;
-  background-color: rgba(51, 51, 51, 0.9);
-}
-.vjs-default-skin .vjs-slider:focus {
-  /* box-shadow */
-  -webkit-box-shadow: 0 0 2em #ffffff;
-  -moz-box-shadow: 0 0 2em #ffffff;
-  box-shadow: 0 0 2em #ffffff;
-}
-.vjs-default-skin .vjs-slider-handle {
-  position: absolute;
-  /* Needed for IE6 */
-  left: 0;
-  top: 0;
-}
-.vjs-default-skin .vjs-slider-handle:before {
-  content: "\e009";
-  font-family: VideoJS;
-  font-size: 1em;
-  line-height: 1;
-  text-align: center;
-  text-shadow: 0em 0em 1em #fff;
-  position: absolute;
-  top: 0;
-  left: 0;
-  /* Rotate the square icon to make a diamond */
-  /* transform */
-  -webkit-transform: rotate(-45deg);
-  -moz-transform: rotate(-45deg);
-  -ms-transform: rotate(-45deg);
-  -o-transform: rotate(-45deg);
-  transform: rotate(-45deg);
-}
-/* Control Bar
---------------------------------------------------------------------------------
-The default control bar that is a container for most of the controls.
-*/
-.vjs-default-skin .vjs-control-bar {
-  /* Start hidden */
-  display: none;
-  position: absolute;
-  /* Place control bar at the bottom of the player box/video.
-     If you want more margin below the control bar, add more height. */
-  bottom: 0;
-  /* Use left/right to stretch to 100% width of player div */
-  left: 0;
-  right: 0;
-  /* Height includes any margin you want above or below control items */
-  height: 3.0em;
-  /* background-color-with-alpha */
-  background-color: #07141e;
-  background-color: rgba(7, 20, 30, 0.7);
-}
-/* Show the control bar only once the video has started playing */
-.vjs-default-skin.vjs-has-started .vjs-control-bar {
-  display: block;
-  /* Visibility needed to make sure things hide in older browsers too. */
-
-  visibility: visible;
-  opacity: 1;
-  /* transition */
-  -webkit-transition: visibility 0.1s, opacity 0.1s;
-  -moz-transition: visibility 0.1s, opacity 0.1s;
-  -o-transition: visibility 0.1s, opacity 0.1s;
-  transition: visibility 0.1s, opacity 0.1s;
-}
-/* Hide the control bar when the video is playing and the user is inactive  */
-.vjs-default-skin.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
-  display: block;
-  visibility: hidden;
-  opacity: 0;
-  /* transition */
-  -webkit-transition: visibility 1s, opacity 1s;
-  -moz-transition: visibility 1s, opacity 1s;
-  -o-transition: visibility 1s, opacity 1s;
-  transition: visibility 1s, opacity 1s;
-}
-.vjs-default-skin.vjs-controls-disabled .vjs-control-bar {
-  display: none;
-}
-.vjs-default-skin.vjs-using-native-controls .vjs-control-bar {
-  display: none;
-}
-/* IE8 is flakey with fonts, and you have to change the actual content to force
-fonts to show/hide properly.
-  - "\9" IE8 hack didn't work for this
-  - Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9
-*/
-@media \0screen {
-  .vjs-default-skin.vjs-user-inactive.vjs-playing .vjs-control-bar :before {
-    content: "";
-  }
-}
-/* General styles for individual controls. */
-.vjs-default-skin .vjs-control {
-  outline: none;
-  position: relative;
-  float: left;
-  text-align: center;
-  margin: 0;
-  padding: 0;
-  height: 3.0em;
-  width: 4em;
-}
-/* FontAwsome button icons */
-.vjs-default-skin .vjs-control:before {
-  font-family: VideoJS;
-  font-size: 1.5em;
-  line-height: 2;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  text-align: center;
-  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
-}
-/* Replacement for focus outline */
-.vjs-default-skin .vjs-control:focus:before,
-.vjs-default-skin .vjs-control:hover:before {
-  text-shadow: 0em 0em 1em #ffffff;
-}
-.vjs-default-skin .vjs-control:focus {
-  /*  outline: 0; */
-  /* keyboard-only users cannot see the focus on several of the UI elements when
-  this is set to 0 */
-
-}
-/* Hide control text visually, but have it available for screenreaders */
-.vjs-default-skin .vjs-control-text {
-  /* hide-visually */
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-/* Play/Pause
---------------------------------------------------------------------------------
-*/
-.vjs-default-skin .vjs-play-control {
-  width: 5em;
-  cursor: pointer;
-}
-.vjs-default-skin .vjs-play-control:before {
-  content: "\e001";
-}
-.vjs-default-skin.vjs-playing .vjs-play-control:before {
-  content: "\e002";
-}
-/* Volume/Mute
--------------------------------------------------------------------------------- */
-.vjs-default-skin .vjs-mute-control,
-.vjs-default-skin .vjs-volume-menu-button {
-  cursor: pointer;
-  float: right;
-}
-.vjs-default-skin .vjs-mute-control:before,
-.vjs-default-skin .vjs-volume-menu-button:before {
-  content: "\e006";
-}
-.vjs-default-skin .vjs-mute-control.vjs-vol-0:before,
-.vjs-default-skin .vjs-volume-menu-button.vjs-vol-0:before {
-  content: "\e003";
-}
-.vjs-default-skin .vjs-mute-control.vjs-vol-1:before,
-.vjs-default-skin .vjs-volume-menu-button.vjs-vol-1:before {
-  content: "\e004";
-}
-.vjs-default-skin .vjs-mute-control.vjs-vol-2:before,
-.vjs-default-skin .vjs-volume-menu-button.vjs-vol-2:before {
-  content: "\e005";
-}
-.vjs-default-skin .vjs-volume-control {
-  width: 5em;
-  float: right;
-}
-.vjs-default-skin .vjs-volume-bar {
-  width: 5em;
-  height: 0.6em;
-  margin: 1.1em auto 0;
-}
-.vjs-default-skin .vjs-volume-menu-button .vjs-menu-content {
-  height: 2.9em;
-}
-.vjs-default-skin .vjs-volume-level {
-  position: absolute;
-  top: 0;
-  left: 0;
-  height: 0.5em;
-  background: #66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat;
-}
-.vjs-default-skin .vjs-volume-bar .vjs-volume-handle {
-  width: 0.5em;
-  height: 0.5em;
-}
-.vjs-default-skin .vjs-volume-handle:before {
-  font-size: 0.9em;
-  top: -0.2em;
-  left: -0.2em;
-  width: 1em;
-  height: 1em;
-}
-.vjs-default-skin .vjs-volume-menu-button .vjs-menu .vjs-menu-content {
-  width: 6em;
-  left: -4em;
-}
-/* Progress
---------------------------------------------------------------------------------
-*/
-.vjs-default-skin .vjs-progress-control {
-  position: absolute;
-  left: 0;
-  right: 0;
-  width: auto;
-  font-size: 0.3em;
-  height: 1em;
-  /* Set above the rest of the controls. */
-  top: -1em;
-  /* Shrink the bar slower than it grows. */
-  /* transition */
-  -webkit-transition: all 0.4s;
-  -moz-transition: all 0.4s;
-  -o-transition: all 0.4s;
-  transition: all 0.4s;
-}
-/* On hover, make the progress bar grow to something that's more clickable.
-    This simply changes the overall font for the progress bar, and this
-    updates both the em-based widths and heights, as wells as the icon font */
-.vjs-default-skin:hover .vjs-progress-control {
-  font-size: .9em;
-  /* Even though we're not changing the top/height, we need to include them in
-      the transition so they're handled correctly. */
-
-  /* transition */
-  -webkit-transition: all 0.2s;
-  -moz-transition: all 0.2s;
-  -o-transition: all 0.2s;
-  transition: all 0.2s;
-}
-/* Box containing play and load progresses. Also acts as seek scrubber. */
-.vjs-default-skin .vjs-progress-holder {
-  height: 100%;
-}
-/* Progress Bars */
-.vjs-default-skin .vjs-progress-holder .vjs-play-progress,
-.vjs-default-skin .vjs-progress-holder .vjs-load-progress {
-  position: absolute;
-  display: block;
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  /* Needed for IE6 */
-  left: 0;
-  top: 0;
-}
-.vjs-default-skin .vjs-play-progress {
-  /*
-    Using a data URI to create the white diagonal lines with a transparent
-      background. Surprisingly works in IE8.
-      Created using http://www.patternify.com
-    Changing the first color value will change the bar color.
-    Also using a paralax effect to make the lines move backwards.
-      The -50% left position makes that happen.
-  */
-
-  background: #66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat;
-}
-.vjs-default-skin .vjs-load-progress {
-  background: #646464 /* IE8- Fallback */;
-  background: rgba(255, 255, 255, 0.4);
-}
-.vjs-default-skin .vjs-seek-handle {
-  width: 1.5em;
-  height: 100%;
-}
-.vjs-default-skin .vjs-seek-handle:before {
-  padding-top: 0.1em /* Minor adjustment */;
-}
-/* Time Display
---------------------------------------------------------------------------------
-*/
-.vjs-default-skin .vjs-time-controls {
-  font-size: 1em;
-  /* Align vertically by making the line height the same as the control bar */
-  line-height: 3em;
-}
-.vjs-default-skin .vjs-current-time {
-  float: left;
-}
-.vjs-default-skin .vjs-duration {
-  float: left;
-}
-/* Remaining time is in the HTML, but not included in default design */
-.vjs-default-skin .vjs-remaining-time {
-  display: none;
-  float: left;
-}
-.vjs-time-divider {
-  float: left;
-  line-height: 3em;
-}
-/* Fullscreen
---------------------------------------------------------------------------------
-*/
-.vjs-default-skin .vjs-fullscreen-control {
-  width: 3.8em;
-  cursor: pointer;
-  float: right;
-}
-.vjs-default-skin .vjs-fullscreen-control:before {
-  content: "\e000";
-}
-/* Switch to the exit icon when the player is in fullscreen */
-.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control:before {
-  content: "\e00b";
-}
-/* Big Play Button (play button at start)
---------------------------------------------------------------------------------
-Positioning of the play button in the center or other corners can be done more
-easily in the skin designer. http://designer.videojs.com/
-*/
-.vjs-default-skin .vjs-big-play-button {
-  left: 0.5em;
-  top: 0.5em;
-  font-size: 3em;
-  display: block;
-  z-index: 2;
-  position: absolute;
-  width: 4em;
-  height: 2.6em;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  opacity: 1;
-  /* Need a slightly gray bg so it can be seen on black backgrounds */
-  /* background-color-with-alpha */
-  background-color: #07141e;
-  background-color: rgba(7, 20, 30, 0.7);
-  border: 0.1em solid #3b4249;
-  /* border-radius */
-  -webkit-border-radius: 0.8em;
-  -moz-border-radius: 0.8em;
-  border-radius: 0.8em;
-  /* box-shadow */
-  -webkit-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
-  -moz-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
-  box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
-  /* transition */
-  -webkit-transition: all 0.4s;
-  -moz-transition: all 0.4s;
-  -o-transition: all 0.4s;
-  transition: all 0.4s;
-}
-/* Hide if controls are disabled */
-.vjs-default-skin.vjs-controls-disabled .vjs-big-play-button {
-  display: none;
-}
-/* Hide when video starts playing */
-.vjs-default-skin.vjs-has-started .vjs-big-play-button {
-  display: none;
-}
-/* Hide on mobile devices. Remove when we stop using native controls
-    by default on mobile  */
-.vjs-default-skin.vjs-using-native-controls .vjs-big-play-button {
-  display: none;
-}
-.vjs-default-skin:hover .vjs-big-play-button,
-.vjs-default-skin .vjs-big-play-button:focus {
-  outline: 0;
-  border-color: #fff;
-  /* IE8 needs a non-glow hover state */
-  background-color: #505050;
-  background-color: rgba(50, 50, 50, 0.75);
-  /* box-shadow */
-  -webkit-box-shadow: 0 0 3em #ffffff;
-  -moz-box-shadow: 0 0 3em #ffffff;
-  box-shadow: 0 0 3em #ffffff;
-  /* transition */
-  -webkit-transition: all 0s;
-  -moz-transition: all 0s;
-  -o-transition: all 0s;
-  transition: all 0s;
-}
-.vjs-default-skin .vjs-big-play-button:before {
-  content: "\e001";
-  font-family: VideoJS;
-  /* In order to center the play icon vertically we need to set the line height
-     to the same as the button height */
-
-  line-height: 2.6em;
-  text-shadow: 0.05em 0.05em 0.1em #000;
-  text-align: center /* Needed for IE8 */;
-  position: absolute;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-/* Loading Spinner
---------------------------------------------------------------------------------
-*/
-.vjs-loading-spinner {
-  display: none;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  font-size: 5em;
-  line-height: 1;
-  width: 1em;
-  height: 1em;
-  margin-left: -0.5em;
-  margin-top: -0.5em;
-  opacity: 0.75;
-  /* animation */
-  -webkit-animation: spin 1.5s infinite linear;
-  -moz-animation: spin 1.5s infinite linear;
-  -o-animation: spin 1.5s infinite linear;
-  animation: spin 1.5s infinite linear;
-}
-.vjs-default-skin .vjs-loading-spinner:before {
-  content: "\e00a";
-  font-family: VideoJS;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 1em;
-  height: 1em;
-  text-align: center;
-  text-shadow: 0em 0em 0.1em #000;
-}
-@-moz-keyframes spin {
-  0% {
-    -moz-transform: rotate(0deg);
-  }
-  100% {
-    -moz-transform: rotate(359deg);
-  }
-}
-@-webkit-keyframes spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(359deg);
-  }
-}
-@-o-keyframes spin {
-  0% {
-    -o-transform: rotate(0deg);
-  }
-  100% {
-    -o-transform: rotate(359deg);
-  }
-}
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(359deg);
-  }
-}
-/* Menu Buttons (Captions/Subtitles/etc.)
---------------------------------------------------------------------------------
-*/
-.vjs-default-skin .vjs-menu-button {
-  float: right;
-  cursor: pointer;
-}
-.vjs-default-skin .vjs-menu {
-  display: none;
-  position: absolute;
-  bottom: 0;
-  left: 0em;
-  /* (Width of vjs-menu - width of button) / 2 */
-
-  width: 0em;
-  height: 0em;
-  margin-bottom: 3em;
-  border-left: 2em solid transparent;
-  border-right: 2em solid transparent;
-  border-top: 1.55em solid #000000;
-  /* Same width top as ul bottom */
-
-  border-top-color: rgba(7, 40, 50, 0.5);
-  /* Same as ul background */
-
-}
-/* Button Pop-up Menu */
-.vjs-default-skin .vjs-menu-button .vjs-menu .vjs-menu-content {
-  display: block;
-  padding: 0;
-  margin: 0;
-  position: absolute;
-  width: 10em;
-  bottom: 1.5em;
-  /* Same bottom as vjs-menu border-top */
-
-  max-height: 15em;
-  overflow: auto;
-  left: -5em;
-  /* Width of menu - width of button / 2 */
-
-  /* background-color-with-alpha */
-  background-color: #07141e;
-  background-color: rgba(7, 20, 30, 0.7);
-  /* box-shadow */
-  -webkit-box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2);
-  -moz-box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2);
-  box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2);
-}
-.vjs-default-skin .vjs-menu-button:hover .vjs-menu {
-  display: block;
-}
-.vjs-default-skin .vjs-menu-button ul li {
-  list-style: none;
-  margin: 0;
-  padding: 0.3em 0 0.3em 0;
-  line-height: 1.4em;
-  font-size: 1.2em;
-  text-align: center;
-  text-transform: lowercase;
-}
-.vjs-default-skin .vjs-menu-button ul li.vjs-selected {
-  background-color: #000;
-}
-.vjs-default-skin .vjs-menu-button ul li:focus,
-.vjs-default-skin .vjs-menu-button ul li:hover,
-.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,
-.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover {
-  outline: 0;
-  color: #111;
-  /* background-color-with-alpha */
-  background-color: #ffffff;
-  background-color: rgba(255, 255, 255, 0.75);
-  /* box-shadow */
-  -webkit-box-shadow: 0 0 1em #ffffff;
-  -moz-box-shadow: 0 0 1em #ffffff;
-  box-shadow: 0 0 1em #ffffff;
-}
-.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title {
-  text-align: center;
-  text-transform: uppercase;
-  font-size: 1em;
-  line-height: 2em;
-  padding: 0;
-  margin: 0 0 0.3em 0;
-  font-weight: bold;
-  cursor: default;
-}
-/* Subtitles Button */
-.vjs-default-skin .vjs-subtitles-button:before {
-  content: "\e00c";
-}
-/* Captions Button */
-.vjs-default-skin .vjs-captions-button:before {
-  content: "\e008";
-}
-/* Replacement for focus outline */
-.vjs-default-skin .vjs-captions-button:focus .vjs-control-content:before,
-.vjs-default-skin .vjs-captions-button:hover .vjs-control-content:before {
-  /* box-shadow */
-  -webkit-box-shadow: 0 0 1em #ffffff;
-  -moz-box-shadow: 0 0 1em #ffffff;
-  box-shadow: 0 0 1em #ffffff;
-}
-/*
-REQUIRED STYLES (be careful overriding)
-================================================================================
-When loading the player, the video tag is replaced with a DIV,
-that will hold the video tag or object tag for other playback methods.
-The div contains the video playback element (Flash or HTML5) and controls,
-and sets the width and height of the video.
-
-** If you want to add some kind of border/padding (e.g. a frame), or special
-positioning, use another containing element. Otherwise you risk messing up
-control positioning and full window mode. **
-*/
-.video-js {
-  background-color: #000;
-  position: relative;
-  padding: 0;
-  /* Start with 10px for base font size so other dimensions can be em based and
-     easily calculable. */
-
-  font-size: 10px;
-  /* Allow poster to be vertially aligned. */
-
-  vertical-align: middle;
-  /*  display: table-cell; */
-  /*This works in Safari but not Firefox.*/
-
-  /* Provide some basic defaults for fonts */
-
-  font-weight: normal;
-  font-style: normal;
-  /* Avoiding helvetica: issue #376 */
-
-  font-family: Arial, sans-serif;
-  /* Turn off user selection (text highlighting) by default.
-     The majority of player components will not be text blocks.
-     Text areas will need to turn user selection back on. */
-
-  /* user-select */
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-/* Playback technology elements expand to the width/height of the containing div
-    <video> or <object> */
-.video-js .vjs-tech {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-/* Fix for Firefox 9 fullscreen (only if it is enabled). Not needed when
-   checking fullScreenEnabled. */
-.video-js:-moz-full-screen {
-  position: absolute;
-}
-/* Fullscreen Styles */
-body.vjs-full-window {
-  padding: 0;
-  margin: 0;
-  height: 100%;
-  /* Fix for IE6 full-window. http://www.cssplay.co.uk/layouts/fixed.html */
-  overflow-y: auto;
-}
-.video-js.vjs-fullscreen {
-  position: fixed;
-  overflow: hidden;
-  z-index: 1000;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  width: 100% !important;
-  height: 100% !important;
-  /* IE6 full-window (underscore hack) */
-  _position: absolute;
-}
-.video-js:-webkit-full-screen {
-  width: 100% !important;
-  height: 100% !important;
-}
-.video-js.vjs-fullscreen.vjs-user-inactive {
-  cursor: none;
-}
-/* Poster Styles */
-.vjs-poster {
-  background-repeat: no-repeat;
-  background-position: 50% 50%;
-  background-size: contain;
-  cursor: pointer;
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  position: relative;
-  width: 100%;
-}
-.vjs-poster img {
-  display: block;
-  margin: 0 auto;
-  max-height: 100%;
-  padding: 0;
-  width: 100%;
-}
-/* Hide the poster when native controls are used otherwise it covers them */
-.video-js.vjs-using-native-controls .vjs-poster {
-  display: none;
-}
-/* Text Track Styles */
-/* Overall track holder for both captions and subtitles */
-.video-js .vjs-text-track-display {
-  text-align: center;
-  position: absolute;
-  bottom: 4em;
-  /* Leave padding on left and right */
-  left: 1em;
-  right: 1em;
-}
-/* Individual tracks */
-.video-js .vjs-text-track {
-  display: none;
-  font-size: 1.4em;
-  text-align: center;
-  margin-bottom: 0.1em;
-  /* Transparent black background, or fallback to all black (oldIE) */
-  /* background-color-with-alpha */
-  background-color: #000000;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-.video-js .vjs-subtitles {
-  color: #ffffff /* Subtitles are white */;
-}
-.video-js .vjs-captions {
-  color: #ffcc66 /* Captions are yellow */;
-}
-.vjs-tt-cue {
-  display: block;
-}
-/* Hide disabled or unsupported controls */
-.vjs-default-skin .vjs-hidden {
-  display: none;
-}
-.vjs-lock-showing {
-  display: block !important;
-  opacity: 1;
-  visibility: visible;
-}
-/* -----------------------------------------------------------------------------
-The original source of this file lives at
-https://github.com/videojs/video.js/blob/master/src/css/video-js.less */
diff --git a/extlib/video-js/video-js.min.css b/extlib/video-js/video-js.min.css
deleted file mode 100644
index 07bde6ee..00000000
--- a/extlib/video-js/video-js.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
-Video.js Default Styles (http://videojs.com)
-Version 4.2.1
-Create your own skin at http://designer.videojs.com
-*/.vjs-default-skin{color:#ccc}@font-face{font-family:VideoJS;src:url(font/vjs.eot);src:url(font/vjs.eot?#iefix) format('embedded-opentype'),url(font/vjs.woff) format('woff'),url(font/vjs.ttf) format('truetype');font-weight:400;font-style:normal}.vjs-default-skin .vjs-slider{outline:0;position:relative;cursor:pointer;padding:0;background-color:#333;background-color:rgba(51,51,51,.9)}.vjs-default-skin .vjs-slider:focus{-webkit-box-shadow:0 0 2em #fff;-moz-box-shadow:0 0 2em #fff;box-shadow:0 0 2em #fff}.vjs-default-skin .vjs-slider-handle{position:absolute;left:0;top:0}.vjs-default-skin .vjs-slider-handle:before{content:"\e009";font-family:VideoJS;font-size:1em;line-height:1;text-align:center;text-shadow:0 0 1em #fff;position:absolute;top:0;left:0;-webkit-transform:rotate(-45deg);-moz-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-o-transform:rotate(-45deg);transform:rotate(-45deg)}.vjs-default-skin .vjs-control-bar{display:none;position:absolute;bottom:0;left:0;right:0;height:3em;background-color:#07141e;background-color:rgba(7,20,30,.7)}.vjs-default-skin.vjs-has-started .vjs-control-bar{display:block;visibility:visible;opacity:1;-webkit-transition:visibility .1s,opacity .1s;-moz-transition:visibility .1s,opacity .1s;-o-transition:visibility .1s,opacity .1s;transition:visibility .1s,opacity .1s}.vjs-default-skin.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar{display:block;visibility:hidden;opacity:0;-webkit-transition:visibility 1s,opacity 1s;-moz-transition:visibility 1s,opacity 1s;-o-transition:visibility 1s,opacity 1s;transition:visibility 1s,opacity 1s}.vjs-default-skin.vjs-controls-disabled .vjs-control-bar{display:none}.vjs-default-skin.vjs-using-native-controls .vjs-control-bar{display:none}@media \0screen{.vjs-default-skin.vjs-user-inactive.vjs-playing .vjs-control-bar :before{content:""}}.vjs-default-skin .vjs-control{outline:0;position:relative;float:left;text-align:center;margin:0;padding:0;height:3em;width:4em}.vjs-default-skin .vjs-control:before{font-family:VideoJS;font-size:1.5em;line-height:2;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;text-shadow:1px 1px 1px rgba(0,0,0,.5)}.vjs-default-skin .vjs-control:focus:before,.vjs-default-skin .vjs-control:hover:before{text-shadow:0 0 1em #fff}.vjs-default-skin .vjs-control:focus{}.vjs-default-skin .vjs-control-text{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.vjs-default-skin .vjs-play-control{width:5em;cursor:pointer}.vjs-default-skin .vjs-play-control:before{content:"\e001"}.vjs-default-skin.vjs-playing .vjs-play-control:before{content:"\e002"}.vjs-default-skin .vjs-mute-control,.vjs-default-skin .vjs-volume-menu-button{cursor:pointer;float:right}.vjs-default-skin .vjs-mute-control:before,.vjs-default-skin .vjs-volume-menu-button:before{content:"\e006"}.vjs-default-skin .vjs-mute-control.vjs-vol-0:before,.vjs-default-skin .vjs-volume-menu-button.vjs-vol-0:before{content:"\e003"}.vjs-default-skin .vjs-mute-control.vjs-vol-1:before,.vjs-default-skin .vjs-volume-menu-button.vjs-vol-1:before{content:"\e004"}.vjs-default-skin .vjs-mute-control.vjs-vol-2:before,.vjs-default-skin .vjs-volume-menu-button.vjs-vol-2:before{content:"\e005"}.vjs-default-skin .vjs-volume-control{width:5em;float:right}.vjs-default-skin .vjs-volume-bar{width:5em;height:.6em;margin:1.1em auto 0}.vjs-default-skin .vjs-volume-menu-button .vjs-menu-content{height:2.9em}.vjs-default-skin .vjs-volume-level{position:absolute;top:0;left:0;height:.5em;background:#66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat}.vjs-default-skin .vjs-volume-bar .vjs-volume-handle{width:.5em;height:.5em}.vjs-default-skin .vjs-volume-handle:before{font-size:.9em;top:-.2em;left:-.2em;width:1em;height:1em}.vjs-default-skin .vjs-volume-menu-button .vjs-menu .vjs-menu-content{width:6em;left:-4em}.vjs-default-skin .vjs-progress-control{position:absolute;left:0;right:0;width:auto;font-size:.3em;height:1em;top:-1em;-webkit-transition:all .4s;-moz-transition:all .4s;-o-transition:all .4s;transition:all .4s}.vjs-default-skin:hover .vjs-progress-control{font-size:.9em;-webkit-transition:all .2s;-moz-transition:all .2s;-o-transition:all .2s;transition:all .2s}.vjs-default-skin .vjs-progress-holder{height:100%}.vjs-default-skin .vjs-progress-holder .vjs-play-progress,.vjs-default-skin .vjs-progress-holder .vjs-load-progress{position:absolute;display:block;height:100%;margin:0;padding:0;left:0;top:0}.vjs-default-skin .vjs-play-progress{background:#66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat}.vjs-default-skin .vjs-load-progress{background:#646464;background:rgba(255,255,255,.4)}.vjs-default-skin .vjs-seek-handle{width:1.5em;height:100%}.vjs-default-skin .vjs-seek-handle:before{padding-top:.1em}.vjs-default-skin .vjs-time-controls{font-size:1em;line-height:3em}.vjs-default-skin .vjs-current-time{float:left}.vjs-default-skin .vjs-duration{float:left}.vjs-default-skin .vjs-remaining-time{display:none;float:left}.vjs-time-divider{float:left;line-height:3em}.vjs-default-skin .vjs-fullscreen-control{width:3.8em;cursor:pointer;float:right}.vjs-default-skin .vjs-fullscreen-control:before{content:"\e000"}.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control:before{content:"\e00b"}.vjs-default-skin .vjs-big-play-button{left:.5em;top:.5em;font-size:3em;display:block;z-index:2;position:absolute;width:4em;height:2.6em;text-align:center;vertical-align:middle;cursor:pointer;opacity:1;background-color:#07141e;background-color:rgba(7,20,30,.7);border:.1em solid #3b4249;-webkit-border-radius:.8em;-moz-border-radius:.8em;border-radius:.8em;-webkit-box-shadow:0 0 1em rgba(255,255,255,.25);-moz-box-shadow:0 0 1em rgba(255,255,255,.25);box-shadow:0 0 1em rgba(255,255,255,.25);-webkit-transition:all .4s;-moz-transition:all .4s;-o-transition:all .4s;transition:all .4s}.vjs-default-skin.vjs-controls-disabled .vjs-big-play-button{display:none}.vjs-default-skin.vjs-has-started .vjs-big-play-button{display:none}.vjs-default-skin.vjs-using-native-controls .vjs-big-play-button{display:none}.vjs-default-skin:hover .vjs-big-play-button,.vjs-default-skin .vjs-big-play-button:focus{outline:0;border-color:#fff;background-color:#505050;background-color:rgba(50,50,50,.75);-webkit-box-shadow:0 0 3em #fff;-moz-box-shadow:0 0 3em #fff;box-shadow:0 0 3em #fff;-webkit-transition:all 0s;-moz-transition:all 0s;-o-transition:all 0s;transition:all 0s}.vjs-default-skin .vjs-big-play-button:before{content:"\e001";font-family:VideoJS;line-height:2.6em;text-shadow:.05em .05em .1em #000;text-align:center;position:absolute;left:0;width:100%;height:100%}.vjs-loading-spinner{display:none;position:absolute;top:50%;left:50%;font-size:5em;line-height:1;width:1em;height:1em;margin-left:-.5em;margin-top:-.5em;opacity:.75;-webkit-animation:spin 1.5s infinite linear;-moz-animation:spin 1.5s infinite linear;-o-animation:spin 1.5s infinite linear;animation:spin 1.5s infinite linear}.vjs-default-skin .vjs-loading-spinner:before{content:"\e00a";font-family:VideoJS;position:absolute;top:0;left:0;width:1em;height:1em;text-align:center;text-shadow:0 0 .1em #000}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.vjs-default-skin .vjs-menu-button{float:right;cursor:pointer}.vjs-default-skin .vjs-menu{display:none;position:absolute;bottom:0;left:0;width:0;height:0;margin-bottom:3em;border-left:2em solid transparent;border-right:2em solid transparent;border-top:1.55em solid #000;border-top-color:rgba(7,40,50,.5)}.vjs-default-skin .vjs-menu-button .vjs-menu .vjs-menu-content{display:block;padding:0;margin:0;position:absolute;width:10em;bottom:1.5em;max-height:15em;overflow:auto;left:-5em;background-color:#07141e;background-color:rgba(7,20,30,.7);-webkit-box-shadow:-.2em -.2em .3em rgba(255,255,255,.2);-moz-box-shadow:-.2em -.2em .3em rgba(255,255,255,.2);box-shadow:-.2em -.2em .3em rgba(255,255,255,.2)}.vjs-default-skin .vjs-menu-button:hover .vjs-menu{display:block}.vjs-default-skin .vjs-menu-button ul li{list-style:none;margin:0;padding:.3em 0;line-height:1.4em;font-size:1.2em;text-align:center;text-transform:lowercase}.vjs-default-skin .vjs-menu-button ul li.vjs-selected{background-color:#000}.vjs-default-skin .vjs-menu-button ul li:focus,.vjs-default-skin .vjs-menu-button ul li:hover,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover{outline:0;color:#111;background-color:#fff;background-color:rgba(255,255,255,.75);-webkit-box-shadow:0 0 1em #fff;-moz-box-shadow:0 0 1em #fff;box-shadow:0 0 1em #fff}.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title{text-align:center;text-transform:uppercase;font-size:1em;line-height:2em;padding:0;margin:0 0 .3em;font-weight:700;cursor:default}.vjs-default-skin .vjs-subtitles-button:before{content:"\e00c"}.vjs-default-skin .vjs-captions-button:before{content:"\e008"}.vjs-default-skin .vjs-captions-button:focus .vjs-control-content:before,.vjs-default-skin .vjs-captions-button:hover .vjs-control-content:before{-webkit-box-shadow:0 0 1em #fff;-moz-box-shadow:0 0 1em #fff;box-shadow:0 0 1em #fff}.video-js{background-color:#000;position:relative;padding:0;font-size:10px;vertical-align:middle;font-weight:400;font-style:normal;font-family:Arial,sans-serif;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.video-js .vjs-tech{position:absolute;top:0;left:0;width:100%;height:100%}.video-js:-moz-full-screen{position:absolute}body.vjs-full-window{padding:0;margin:0;height:100%;overflow-y:auto}.video-js.vjs-fullscreen{position:fixed;overflow:hidden;z-index:1000;left:0;top:0;bottom:0;right:0;width:100%!important;height:100%!important;_position:absolute}.video-js:-webkit-full-screen{width:100%!important;height:100%!important}.video-js.vjs-fullscreen.vjs-user-inactive{cursor:none}.vjs-poster{background-repeat:no-repeat;background-position:50% 50%;background-size:contain;cursor:pointer;height:100%;margin:0;padding:0;position:relative;width:100%}.vjs-poster img{display:block;margin:0 auto;max-height:100%;padding:0;width:100%}.video-js.vjs-using-native-controls .vjs-poster{display:none}.video-js .vjs-text-track-display{text-align:center;position:absolute;bottom:4em;left:1em;right:1em}.video-js .vjs-text-track{display:none;font-size:1.4em;text-align:center;margin-bottom:.1em;background-color:#000;background-color:rgba(0,0,0,.5)}.video-js .vjs-subtitles{color:#fff}.video-js .vjs-captions{color:#fc6}.vjs-tt-cue{display:block}.vjs-default-skin .vjs-hidden{display:none}.vjs-lock-showing{display:block!important;opacity:1;visibility:visible}
\ No newline at end of file
diff --git a/extlib/video-js/video-js.swf b/extlib/video-js/video-js.swf
deleted file mode 100644
index d15fbc3f..00000000
--- a/extlib/video-js/video-js.swf
+++ /dev/null
diff --git a/extlib/video-js/video.dev.js b/extlib/video-js/video.dev.js
deleted file mode 100644
index 2ff69a8c..00000000
--- a/extlib/video-js/video.dev.js
+++ /dev/null
@@ -1,6457 +0,0 @@
-/**
- * @fileoverview Main function src.
- */
-
-// HTML5 Shiv. Must be in <head> to support older browsers.
-document.createElement('video');
-document.createElement('audio');
-document.createElement('track');
-
-/**
- * Doubles as the main function for users to create a player instance and also
- * the main library object.
- *
- * @param  {String|Element} id      Video element or video element ID
- * @param  {Object=} options        Optional options object for config/settings
- * @param  {Function=} ready        Optional ready callback
- * @return {vjs.Player}             A player instance
- */
-var vjs = function(id, options, ready){
-  var tag; // Element of ID
-
-  // Allow for element or ID to be passed in
-  // String ID
-  if (typeof id === 'string') {
-
-    // Adjust for jQuery ID syntax
-    if (id.indexOf('#') === 0) {
-      id = id.slice(1);
-    }
-
-    // If a player instance has already been created for this ID return it.
-    if (vjs.players[id]) {
-      return vjs.players[id];
-
-    // Otherwise get element for ID
-    } else {
-      tag = vjs.el(id);
-    }
-
-  // ID is a media element
-  } else {
-    tag = id;
-  }
-
-  // Check for a useable element
-  if (!tag || !tag.nodeName) { // re: nodeName, could be a box div also
-    throw new TypeError('The element or ID supplied is not valid. (videojs)'); // Returns
-  }
-
-  // Element may have a player attr referring to an already created player instance.
-  // If not, set up a new player and return the instance.
-  return tag['player'] || new vjs.Player(tag, options, ready);
-};
-
-// Extended name, also available externally, window.videojs
-var videojs = vjs;
-window.videojs = window.vjs = vjs;
-
-// CDN Version. Used to target right flash swf.
-vjs.CDN_VERSION = '4.2';
-vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'http://');
-
-/**
- * Global Player instance options, surfaced from vjs.Player.prototype.options_
- * vjs.options = vjs.Player.prototype.options_
- * All options should use string keys so they avoid
- * renaming by closure compiler
- * @type {Object}
- */
-vjs.options = {
-  // Default order of fallback technology
-  'techOrder': ['html5','flash'],
-  // techOrder: ['flash','html5'],
-
-  'html5': {},
-  'flash': {},
-
-  // Default of web browser is 300x150. Should rely on source width/height.
-  'width': 300,
-  'height': 150,
-  // defaultVolume: 0.85,
-  'defaultVolume': 0.00, // The freakin seaguls are driving me crazy!
-
-  // Included control sets
-  'children': {
-    'mediaLoader': {},
-    'posterImage': {},
-    'textTrackDisplay': {},
-    'loadingSpinner': {},
-    'bigPlayButton': {},
-    'controlBar': {}
-  },
-
-  // Default message to show when a video cannot be played.
-  'notSupportedMessage': 'Sorry, no compatible source and playback ' +
-      'technology were found for this video. Try using another browser ' +
-      'like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the ' +
-      'latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'
-};
-
-// Set CDN Version of swf
-// The added (+) blocks the replace from changing this 4.2 string
-if (vjs.CDN_VERSION !== 'GENERATED'+'_CDN_VSN') {
-  videojs.options['flash']['swf'] = vjs.ACCESS_PROTOCOL + 'vjs.zencdn.net/'+vjs.CDN_VERSION+'/video-js.swf';
-}
-
-/**
- * Global player list
- * @type {Object}
- */
-vjs.players = {};
-/**
- * Core Object/Class for objects that use inheritance + contstructors
- * @constructor
- */
-vjs.CoreObject = vjs['CoreObject'] = function(){};
-// Manually exporting vjs['CoreObject'] here for Closure Compiler
-// because of the use of the extend/create class methods
-// If we didn't do this, those functions would get flattend to something like
-// `a = ...` and `this.prototype` would refer to the global object instead of
-// CoreObject
-
-/**
- * Create a new object that inherits from this Object
- * @param {Object} props Functions and properties to be applied to the
- *                       new object's prototype
- * @return {vjs.CoreObject} Returns an object that inherits from CoreObject
- * @this {*}
- */
-vjs.CoreObject.extend = function(props){
-  var init, subObj;
-
-  props = props || {};
-  // Set up the constructor using the supplied init method
-  // or using the init of the parent object
-  // Make sure to check the unobfuscated version for external libs
-  init = props['init'] || props.init || this.prototype['init'] || this.prototype.init || function(){};
-  // In Resig's simple class inheritance (previously used) the constructor
-  //  is a function that calls `this.init.apply(arguments)`
-  // However that would prevent us from using `ParentObject.call(this);`
-  //  in a Child constuctor because the `this` in `this.init`
-  //  would still refer to the Child and cause an inifinite loop.
-  // We would instead have to do
-  //    `ParentObject.prototype.init.apply(this, argumnents);`
-  //  Bleh. We're not creating a _super() function, so it's good to keep
-  //  the parent constructor reference simple.
-  subObj = function(){
-    init.apply(this, arguments);
-  };
-
-  // Inherit from this object's prototype
-  subObj.prototype = vjs.obj.create(this.prototype);
-  // Reset the constructor property for subObj otherwise
-  // instances of subObj would have the constructor of the parent Object
-  subObj.prototype.constructor = subObj;
-
-  // Make the class extendable
-  subObj.extend = vjs.CoreObject.extend;
-  // Make a function for creating instances
-  subObj.create = vjs.CoreObject.create;
-
-  // Extend subObj's prototype with functions and other properties from props
-  for (var name in props) {
-    if (props.hasOwnProperty(name)) {
-      subObj.prototype[name] = props[name];
-    }
-  }
-
-  return subObj;
-};
-
-/**
- * Create a new instace of this Object class
- * @return {vjs.CoreObject} Returns an instance of a CoreObject subclass
- * @this {*}
- */
-vjs.CoreObject.create = function(){
-  // Create a new object that inherits from this object's prototype
-  var inst = vjs.obj.create(this.prototype);
-
-  // Apply this constructor function to the new object
-  this.apply(inst, arguments);
-
-  // Return the new object
-  return inst;
-};
-/**
- * @fileoverview Event System (John Resig - Secrets of a JS Ninja http://jsninja.com/)
- * (Original book version wasn't completely usable, so fixed some things and made Closure Compiler compatible)
- * This should work very similarly to jQuery's events, however it's based off the book version which isn't as
- * robust as jquery's, so there's probably some differences.
- */
-
-/**
- * Add an event listener to element
- * It stores the handler function in a separate cache object
- * and adds a generic handler to the element's event,
- * along with a unique id (guid) to the element.
- * @param  {Element|Object}   elem Element or object to bind listeners to
- * @param  {String}   type Type of event to bind to.
- * @param  {Function} fn   Event listener.
- */
-vjs.on = function(elem, type, fn){
-  var data = vjs.getData(elem);
-
-  // We need a place to store all our handler data
-  if (!data.handlers) data.handlers = {};
-
-  if (!data.handlers[type]) data.handlers[type] = [];
-
-  if (!fn.guid) fn.guid = vjs.guid++;
-
-  data.handlers[type].push(fn);
-
-  if (!data.dispatcher) {
-    data.disabled = false;
-
-    data.dispatcher = function (event){
-
-      if (data.disabled) return;
-      event = vjs.fixEvent(event);
-
-      var handlers = data.handlers[event.type];
-
-      if (handlers) {
-        // Copy handlers so if handlers are added/removed during the process it doesn't throw everything off.
-        var handlersCopy = handlers.slice(0);
-
-        for (var m = 0, n = handlersCopy.length; m < n; m++) {
-          if (event.isImmediatePropagationStopped()) {
-            break;
-          } else {
-            handlersCopy[m].call(elem, event);
-          }
-        }
-      }
-    };
-  }
-
-  if (data.handlers[type].length == 1) {
-    if (document.addEventListener) {
-      elem.addEventListener(type, data.dispatcher, false);
-    } else if (document.attachEvent) {
-      elem.attachEvent('on' + type, data.dispatcher);
-    }
-  }
-};
-
-/**
- * Removes event listeners from an element
- * @param  {Element|Object}   elem Object to remove listeners from
- * @param  {String=}   type Type of listener to remove. Don't include to remove all events from element.
- * @param  {Function} fn   Specific listener to remove. Don't incldue to remove listeners for an event type.
- */
-vjs.off = function(elem, type, fn) {
-  // Don't want to add a cache object through getData if not needed
-  if (!vjs.hasData(elem)) return;
-
-  var data = vjs.getData(elem);
-
-  // If no events exist, nothing to unbind
-  if (!data.handlers) { return; }
-
-  // Utility function
-  var removeType = function(t){
-     data.handlers[t] = [];
-     vjs.cleanUpEvents(elem,t);
-  };
-
-  // Are we removing all bound events?
-  if (!type) {
-    for (var t in data.handlers) removeType(t);
-    return;
-  }
-
-  var handlers = data.handlers[type];
-
-  // If no handlers exist, nothing to unbind
-  if (!handlers) return;
-
-  // If no listener was provided, remove all listeners for type
-  if (!fn) {
-    removeType(type);
-    return;
-  }
-
-  // We're only removing a single handler
-  if (fn.guid) {
-    for (var n = 0; n < handlers.length; n++) {
-      if (handlers[n].guid === fn.guid) {
-        handlers.splice(n--, 1);
-      }
-    }
-  }
-
-  vjs.cleanUpEvents(elem, type);
-};
-
-/**
- * Clean up the listener cache and dispatchers
- * @param  {Element|Object} elem Element to clean up
- * @param  {String} type Type of event to clean up
- */
-vjs.cleanUpEvents = function(elem, type) {
-  var data = vjs.getData(elem);
-
-  // Remove the events of a particular type if there are none left
-  if (data.handlers[type].length === 0) {
-    delete data.handlers[type];
-    // data.handlers[type] = null;
-    // Setting to null was causing an error with data.handlers
-
-    // Remove the meta-handler from the element
-    if (document.removeEventListener) {
-      elem.removeEventListener(type, data.dispatcher, false);
-    } else if (document.detachEvent) {
-      elem.detachEvent('on' + type, data.dispatcher);
-    }
-  }
-
-  // Remove the events object if there are no types left
-  if (vjs.isEmpty(data.handlers)) {
-    delete data.handlers;
-    delete data.dispatcher;
-    delete data.disabled;
-
-    // data.handlers = null;
-    // data.dispatcher = null;
-    // data.disabled = null;
-  }
-
-  // Finally remove the expando if there is no data left
-  if (vjs.isEmpty(data)) {
-    vjs.removeData(elem);
-  }
-};
-
-/**
- * Fix a native event to have standard property values
- * @param  {Object} event Event object to fix
- * @return {Object}
- */
-vjs.fixEvent = function(event) {
-
-  function returnTrue() { return true; }
-  function returnFalse() { return false; }
-
-  // Test if fixing up is needed
-  // Used to check if !event.stopPropagation instead of isPropagationStopped
-  // But native events return true for stopPropagation, but don't have
-  // other expected methods like isPropagationStopped. Seems to be a problem
-  // with the Javascript Ninja code. So we're just overriding all events now.
-  if (!event || !event.isPropagationStopped) {
-    var old = event || window.event;
-
-    event = {};
-    // Clone the old object so that we can modify the values event = {};
-    // IE8 Doesn't like when you mess with native event properties
-    // Firefox returns false for event.hasOwnProperty('type') and other props
-    //  which makes copying more difficult.
-    // TODO: Probably best to create a whitelist of event props
-    for (var key in old) {
-      // Safari 6.0.3 warns you if you try to copy deprecated layerX/Y
-      if (key !== 'layerX' && key !== 'layerY') {
-        event[key] = old[key];
-      }
-    }
-
-    // The event occurred on this element
-    if (!event.target) {
-      event.target = event.srcElement || document;
-    }
-
-    // Handle which other element the event is related to
-    event.relatedTarget = event.fromElement === event.target ?
-      event.toElement :
-      event.fromElement;
-
-    // Stop the default browser action
-    event.preventDefault = function () {
-      if (old.preventDefault) {
-        old.preventDefault();
-      }
-      event.returnValue = false;
-      event.isDefaultPrevented = returnTrue;
-    };
-
-    event.isDefaultPrevented = returnFalse;
-
-    // Stop the event from bubbling
-    event.stopPropagation = function () {
-      if (old.stopPropagation) {
-        old.stopPropagation();
-      }
-      event.cancelBubble = true;
-      event.isPropagationStopped = returnTrue;
-    };
-
-    event.isPropagationStopped = returnFalse;
-
-    // Stop the event from bubbling and executing other handlers
-    event.stopImmediatePropagation = function () {
-      if (old.stopImmediatePropagation) {
-        old.stopImmediatePropagation();
-      }
-      event.isImmediatePropagationStopped = returnTrue;
-      event.stopPropagation();
-    };
-
-    event.isImmediatePropagationStopped = returnFalse;
-
-    // Handle mouse position
-    if (event.clientX != null) {
-      var doc = document.documentElement, body = document.body;
-
-      event.pageX = event.clientX +
-        (doc && doc.scrollLeft || body && body.scrollLeft || 0) -
-        (doc && doc.clientLeft || body && body.clientLeft || 0);
-      event.pageY = event.clientY +
-        (doc && doc.scrollTop || body && body.scrollTop || 0) -
-        (doc && doc.clientTop || body && body.clientTop || 0);
-    }
-
-    // Handle key presses
-    event.which = event.charCode || event.keyCode;
-
-    // Fix button for mouse clicks:
-    // 0 == left; 1 == middle; 2 == right
-    if (event.button != null) {
-      event.button = (event.button & 1 ? 0 :
-        (event.button & 4 ? 1 :
-          (event.button & 2 ? 2 : 0)));
-    }
-  }
-
-  // Returns fixed-up instance
-  return event;
-};
-
-/**
- * Trigger an event for an element
- * @param  {Element|Object} elem  Element to trigger an event on
- * @param  {String} event Type of event to trigger
- */
-vjs.trigger = function(elem, event) {
-  // Fetches element data and a reference to the parent (for bubbling).
-  // Don't want to add a data object to cache for every parent,
-  // so checking hasData first.
-  var elemData = (vjs.hasData(elem)) ? vjs.getData(elem) : {};
-  var parent = elem.parentNode || elem.ownerDocument;
-      // type = event.type || event,
-      // handler;
-
-  // If an event name was passed as a string, creates an event out of it
-  if (typeof event === 'string') {
-    event = { type:event, target:elem };
-  }
-  // Normalizes the event properties.
-  event = vjs.fixEvent(event);
-
-  // If the passed element has a dispatcher, executes the established handlers.
-  if (elemData.dispatcher) {
-    elemData.dispatcher.call(elem, event);
-  }
-
-  // Unless explicitly stopped or the event does not bubble (e.g. media events)
-    // recursively calls this function to bubble the event up the DOM.
-    if (parent && !event.isPropagationStopped() && event.bubbles !== false) {
-    vjs.trigger(parent, event);
-
-  // If at the top of the DOM, triggers the default action unless disabled.
-  } else if (!parent && !event.isDefaultPrevented()) {
-    var targetData = vjs.getData(event.target);
-
-    // Checks if the target has a default action for this event.
-    if (event.target[event.type]) {
-      // Temporarily disables event dispatching on the target as we have already executed the handler.
-      targetData.disabled = true;
-      // Executes the default action.
-      if (typeof event.target[event.type] === 'function') {
-        event.target[event.type]();
-      }
-      // Re-enables event dispatching.
-      targetData.disabled = false;
-    }
-  }
-
-  // Inform the triggerer if the default was prevented by returning false
-  return !event.isDefaultPrevented();
-  /* Original version of js ninja events wasn't complete.
-   * We've since updated to the latest version, but keeping this around
-   * for now just in case.
-   */
-  // // Added in attion to book. Book code was broke.
-  // event = typeof event === 'object' ?
-  //   event[vjs.expando] ?
-  //     event :
-  //     new vjs.Event(type, event) :
-  //   new vjs.Event(type);
-
-  // event.type = type;
-  // if (handler) {
-  //   handler.call(elem, event);
-  // }
-
-  // // Clean up the event in case it is being reused
-  // event.result = undefined;
-  // event.target = elem;
-};
-
-/**
- * Trigger a listener only once for an event
- * @param  {Element|Object}   elem Element or object to
- * @param  {[type]}   type [description]
- * @param  {Function} fn   [description]
- * @return {[type]}
- */
-vjs.one = function(elem, type, fn) {
-  var func = function(){
-    vjs.off(elem, type, func);
-    fn.apply(this, arguments);
-  };
-  func.guid = fn.guid = fn.guid || vjs.guid++;
-  vjs.on(elem, type, func);
-};
-var hasOwnProp = Object.prototype.hasOwnProperty;
-
-/**
- * Creates an element and applies properties.
- * @param  {String=} tagName    Name of tag to be created.
- * @param  {Object=} properties Element properties to be applied.
- * @return {Element}
- */
-vjs.createEl = function(tagName, properties){
-  var el, propName;
-
-  el = document.createElement(tagName || 'div');
-
-  for (propName in properties){
-    if (hasOwnProp.call(properties, propName)) {
-      //el[propName] = properties[propName];
-      // Not remembering why we were checking for dash
-      // but using setAttribute means you have to use getAttribute
-
-      // The check for dash checks for the aria-* attributes, like aria-label, aria-valuemin.
-      // The additional check for "role" is because the default method for adding attributes does not
-      // add the attribute "role". My guess is because it's not a valid attribute in some namespaces, although
-      // browsers handle the attribute just fine. The W3C allows for aria-* attributes to be used in pre-HTML5 docs.
-      // http://www.w3.org/TR/wai-aria-primer/#ariahtml. Using setAttribute gets around this problem.
-
-       if (propName.indexOf('aria-') !== -1 || propName=='role') {
-         el.setAttribute(propName, properties[propName]);
-       } else {
-         el[propName] = properties[propName];
-       }
-    }
-  }
-  return el;
-};
-
-/**
- * Uppercase the first letter of a string
- * @param  {String} string String to be uppercased
- * @return {String}
- */
-vjs.capitalize = function(string){
-  return string.charAt(0).toUpperCase() + string.slice(1);
-};
-
-/**
- * Object functions container
- * @type {Object}
- */
-vjs.obj = {};
-
-/**
- * Object.create shim for prototypal inheritance.
- * https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object/create
- * @param  {Object}   obj Object to use as prototype
- */
- vjs.obj.create = Object.create || function(obj){
-  //Create a new function called 'F' which is just an empty object.
-  function F() {}
-
-  //the prototype of the 'F' function should point to the
-  //parameter of the anonymous function.
-  F.prototype = obj;
-
-  //create a new constructor function based off of the 'F' function.
-  return new F();
-};
-
-/**
- * Loop through each property in an object and call a function
- * whose arguments are (key,value)
- * @param  {Object}   obj Object of properties
- * @param  {Function} fn  Function to be called on each property.
- * @this {*}
- */
-vjs.obj.each = function(obj, fn, context){
-  for (var key in obj) {
-    if (hasOwnProp.call(obj, key)) {
-      fn.call(context || this, key, obj[key]);
-    }
-  }
-};
-
-/**
- * Merge two objects together and return the original.
- * @param  {Object} obj1
- * @param  {Object} obj2
- * @return {Object}
- */
-vjs.obj.merge = function(obj1, obj2){
-  if (!obj2) { return obj1; }
-  for (var key in obj2){
-    if (hasOwnProp.call(obj2, key)) {
-      obj1[key] = obj2[key];
-    }
-  }
-  return obj1;
-};
-
-/**
- * Merge two objects, and merge any properties that are objects
- * instead of just overwriting one. Uses to merge options hashes
- * where deeper default settings are important.
- * @param  {Object} obj1 Object to override
- * @param  {Object} obj2 Overriding object
- * @return {Object}      New object. Obj1 and Obj2 will be untouched.
- */
-vjs.obj.deepMerge = function(obj1, obj2){
-  var key, val1, val2;
-
-  // make a copy of obj1 so we're not ovewriting original values.
-  // like prototype.options_ and all sub options objects
-  obj1 = vjs.obj.copy(obj1);
-
-  for (key in obj2){
-    if (hasOwnProp.call(obj2, key)) {
-      val1 = obj1[key];
-      val2 = obj2[key];
-
-      // Check if both properties are pure objects and do a deep merge if so
-      if (vjs.obj.isPlain(val1) && vjs.obj.isPlain(val2)) {
-        obj1[key] = vjs.obj.deepMerge(val1, val2);
-      } else {
-        obj1[key] = obj2[key];
-      }
-    }
-  }
-  return obj1;
-};
-
-/**
- * Make a copy of the supplied object
- * @param  {Object} obj Object to copy
- * @return {Object}     Copy of object
- */
-vjs.obj.copy = function(obj){
-  return vjs.obj.merge({}, obj);
-};
-
-/**
- * Check if an object is plain, and not a dom node or any object sub-instance
- * @param  {Object} obj Object to check
- * @return {Boolean}     True if plain, false otherwise
- */
-vjs.obj.isPlain = function(obj){
-  return !!obj
-    && typeof obj === 'object'
-    && obj.toString() === '[object Object]'
-    && obj.constructor === Object;
-};
-
-/**
- * Bind (a.k.a proxy or Context). A simple method for changing the context of a function
-   It also stores a unique id on the function so it can be easily removed from events
- * @param  {*}   context The object to bind as scope
- * @param  {Function} fn      The function to be bound to a scope
- * @param  {Number=}   uid     An optional unique ID for the function to be set
- * @return {Function}
- */
-vjs.bind = function(context, fn, uid) {
-  // Make sure the function has a unique ID
-  if (!fn.guid) { fn.guid = vjs.guid++; }
-
-  // Create the new function that changes the context
-  var ret = function() {
-    return fn.apply(context, arguments);
-  };
-
-  // Allow for the ability to individualize this function
-  // Needed in the case where multiple objects might share the same prototype
-  // IF both items add an event listener with the same function, then you try to remove just one
-  // it will remove both because they both have the same guid.
-  // when using this, you need to use the bind method when you remove the listener as well.
-  // currently used in text tracks
-  ret.guid = (uid) ? uid + '_' + fn.guid : fn.guid;
-
-  return ret;
-};
-
-/**
- * Element Data Store. Allows for binding data to an element without putting it directly on the element.
- * Ex. Event listneres are stored here.
- * (also from jsninja.com, slightly modified and updated for closure compiler)
- * @type {Object}
- */
-vjs.cache = {};
-
-/**
- * Unique ID for an element or function
- * @type {Number}
- */
-vjs.guid = 1;
-
-/**
- * Unique attribute name to store an element's guid in
- * @type {String}
- * @constant
- */
-vjs.expando = 'vdata' + (new Date()).getTime();
-
-/**
- * Returns the cache object where data for an element is stored
- * @param  {Element} el Element to store data for.
- * @return {Object}
- */
-vjs.getData = function(el){
-  var id = el[vjs.expando];
-  if (!id) {
-    id = el[vjs.expando] = vjs.guid++;
-    vjs.cache[id] = {};
-  }
-  return vjs.cache[id];
-};
-
-/**
- * Returns the cache object where data for an element is stored
- * @param  {Element} el Element to store data for.
- * @return {Object}
- */
-vjs.hasData = function(el){
-  var id = el[vjs.expando];
-  return !(!id || vjs.isEmpty(vjs.cache[id]));
-};
-
-/**
- * Delete data for the element from the cache and the guid attr from getElementById
- * @param  {Element} el Remove data for an element
- */
-vjs.removeData = function(el){
-  var id = el[vjs.expando];
-  if (!id) { return; }
-  // Remove all stored data
-  // Changed to = null
-  // http://coding.smashingmagazine.com/2012/11/05/writing-fast-memory-efficient-javascript/
-  // vjs.cache[id] = null;
-  delete vjs.cache[id];
-
-  // Remove the expando property from the DOM node
-  try {
-    delete el[vjs.expando];
-  } catch(e) {
-    if (el.removeAttribute) {
-      el.removeAttribute(vjs.expando);
-    } else {
-      // IE doesn't appear to support removeAttribute on the document element
-      el[vjs.expando] = null;
-    }
-  }
-};
-
-vjs.isEmpty = function(obj) {
-  for (var prop in obj) {
-    // Inlude null properties as empty.
-    if (obj[prop] !== null) {
-      return false;
-    }
-  }
-  return true;
-};
-
-/**
- * Add a CSS class name to an element
- * @param {Element} element    Element to add class name to
- * @param {String} classToAdd Classname to add
- */
-vjs.addClass = function(element, classToAdd){
-  if ((' '+element.className+' ').indexOf(' '+classToAdd+' ') == -1) {
-    element.className = element.className === '' ? classToAdd : element.className + ' ' + classToAdd;
-  }
-};
-
-/**
- * Remove a CSS class name from an element
- * @param {Element} element    Element to remove from class name
- * @param {String} classToAdd Classname to remove
- */
-vjs.removeClass = function(element, classToRemove){
-  var classNames, i;
-
-  if (element.className.indexOf(classToRemove) == -1) { return; }
-
-  classNames = element.className.split(' ');
-
-  // no arr.indexOf in ie8, and we don't want to add a big shim
-  for (i = classNames.length - 1; i >= 0; i--) {
-    if (classNames[i] === classToRemove) {
-      classNames.splice(i,1);
-    }
-  }
-
-  element.className = classNames.join(' ');
-};
-
-/**
- * Element for testing browser HTML5 video capabilities
- * @type {Element}
- * @constant
- */
-vjs.TEST_VID = vjs.createEl('video');
-
-/**
- * Useragent for browser testing.
- * @type {String}
- * @constant
- */
-vjs.USER_AGENT = navigator.userAgent;
-
-/**
- * Device is an iPhone
- * @type {Boolean}
- * @constant
- */
-vjs.IS_IPHONE = (/iPhone/i).test(vjs.USER_AGENT);
-vjs.IS_IPAD = (/iPad/i).test(vjs.USER_AGENT);
-vjs.IS_IPOD = (/iPod/i).test(vjs.USER_AGENT);
-vjs.IS_IOS = vjs.IS_IPHONE || vjs.IS_IPAD || vjs.IS_IPOD;
-
-vjs.IOS_VERSION = (function(){
-  var match = vjs.USER_AGENT.match(/OS (\d+)_/i);
-  if (match && match[1]) { return match[1]; }
-})();
-
-vjs.IS_ANDROID = (/Android/i).test(vjs.USER_AGENT);
-vjs.ANDROID_VERSION = (function() {
-  // This matches Android Major.Minor.Patch versions
-  // ANDROID_VERSION is Major.Minor as a Number, if Minor isn't available, then only Major is returned
-  var match = vjs.USER_AGENT.match(/Android (\d+)(?:\.(\d+))?(?:\.(\d+))*/i),
-    major,
-    minor;
-
-  if (!match) {
-    return null;
-  }
-
-  major = match[1] && parseFloat(match[1]);
-  minor = match[2] && parseFloat(match[2]);
-
-  if (major && minor) {
-    return parseFloat(match[1] + '.' + match[2]);
-  } else if (major) {
-    return major;
-  } else {
-    return null;
-  }
-})();
-// Old Android is defined as Version older than 2.3, and requiring a webkit version of the android browser
-vjs.IS_OLD_ANDROID = vjs.IS_ANDROID && (/webkit/i).test(vjs.USER_AGENT) && vjs.ANDROID_VERSION < 2.3;
-
-vjs.IS_FIREFOX = (/Firefox/i).test(vjs.USER_AGENT);
-vjs.IS_CHROME = (/Chrome/i).test(vjs.USER_AGENT);
-
-vjs.TOUCH_ENABLED = ('ontouchstart' in window);
-
-/**
- * Get an element's attribute values, as defined on the HTML tag
- * Attributs are not the same as properties. They're defined on the tag
- * or with setAttribute (which shouldn't be used with HTML)
- * This will return true or false for boolean attributes.
- * @param  {Element} tag Element from which to get tag attributes
- * @return {Object}
- */
-vjs.getAttributeValues = function(tag){
-  var obj, knownBooleans, attrs, attrName, attrVal;
-
-  obj = {};
-
-  // known boolean attributes
-  // we can check for matching boolean properties, but older browsers
-  // won't know about HTML5 boolean attributes that we still read from
-  knownBooleans = ','+'autoplay,controls,loop,muted,default'+',';
-
-  if (tag && tag.attributes && tag.attributes.length > 0) {
-    attrs = tag.attributes;
-
-    for (var i = attrs.length - 1; i >= 0; i--) {
-      attrName = attrs[i].name;
-      attrVal = attrs[i].value;
-
-      // check for known booleans
-      // the matching element property will return a value for typeof
-      if (typeof tag[attrName] === 'boolean' || knownBooleans.indexOf(','+attrName+',') !== -1) {
-        // the value of an included boolean attribute is typically an empty
-        // string ('') which would equal false if we just check for a false value.
-        // we also don't want support bad code like autoplay='false'
-        attrVal = (attrVal !== null) ? true : false;
-      }
-
-      obj[attrName] = attrVal;
-    }
-  }
-
-  return obj;
-};
-
-/**
- * Get the computed style value for an element
- * From http://robertnyman.com/2006/04/24/get-the-rendered-style-of-an-element/
- * @param  {Element} el        Element to get style value for
- * @param  {String} strCssRule Style name
- * @return {String}            Style value
- */
-vjs.getComputedDimension = function(el, strCssRule){
-  var strValue = '';
-  if(document.defaultView && document.defaultView.getComputedStyle){
-    strValue = document.defaultView.getComputedStyle(el, '').getPropertyValue(strCssRule);
-
-  } else if(el.currentStyle){
-    // IE8 Width/Height support
-    strValue = el['client'+strCssRule.substr(0,1).toUpperCase() + strCssRule.substr(1)] + 'px';
-  }
-  return strValue;
-};
-
-/**
- * Insert an element as the first child node of another
- * @param  {Element} child   Element to insert
- * @param  {[type]} parent Element to insert child into
- */
-vjs.insertFirst = function(child, parent){
-  if (parent.firstChild) {
-    parent.insertBefore(child, parent.firstChild);
-  } else {
-    parent.appendChild(child);
-  }
-};
-
-/**
- * Object to hold browser support information
- * @type {Object}
- */
-vjs.support = {};
-
-/**
- * Shorthand for document.getElementById()
- * Also allows for CSS (jQuery) ID syntax. But nothing other than IDs.
- * @param  {String} id  Element ID
- * @return {Element}    Element with supplied ID
- */
-vjs.el = function(id){
-  if (id.indexOf('#') === 0) {
-    id = id.slice(1);
-  }
-
-  return document.getElementById(id);
-};
-
-/**
- * Format seconds as a time string, H:MM:SS or M:SS
- * Supplying a guide (in seconds) will force a number of leading zeros
- * to cover the length of the guide
- * @param  {Number} seconds Number of seconds to be turned into a string
- * @param  {Number} guide   Number (in seconds) to model the string after
- * @return {String}         Time formatted as H:MM:SS or M:SS
- */
-vjs.formatTime = function(seconds, guide) {
-  // Default to using seconds as guide
-  guide = guide || seconds;
-  var s = Math.floor(seconds % 60),
-      m = Math.floor(seconds / 60 % 60),
-      h = Math.floor(seconds / 3600),
-      gm = Math.floor(guide / 60 % 60),
-      gh = Math.floor(guide / 3600);
-
-  // handle invalid times
-  if (isNaN(seconds) || seconds === Infinity) {
-    // '-' is false for all relational operators (e.g. <, >=) so this setting
-    // will add the minimum number of fields specified by the guide
-    h = m = s = '-';
-  }
-
-  // Check if we need to show hours
-  h = (h > 0 || gh > 0) ? h + ':' : '';
-
-  // If hours are showing, we may need to add a leading zero.
-  // Always show at least one digit of minutes.
-  m = (((h || gm >= 10) && m < 10) ? '0' + m : m) + ':';
-
-  // Check if leading zero is need for seconds
-  s = (s < 10) ? '0' + s : s;
-
-  return h + m + s;
-};
-
-// Attempt to block the ability to select text while dragging controls
-vjs.blockTextSelection = function(){
-  document.body.focus();
-  document.onselectstart = function () { return false; };
-};
-// Turn off text selection blocking
-vjs.unblockTextSelection = function(){ document.onselectstart = function () { return true; }; };
-
-/**
- * Trim whitespace from the ends of a string.
- * @param  {String} string String to trim
- * @return {String}        Trimmed string
- */
-vjs.trim = function(str){
-  return (str+'').replace(/^\s+|\s+$/g, '');
-};
-
-/**
- * Should round off a number to a decimal place
- * @param  {Number} num Number to round
- * @param  {Number} dec Number of decimal places to round to
- * @return {Number}     Rounded number
- */
-vjs.round = function(num, dec) {
-  if (!dec) { dec = 0; }
-  return Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
-};
-
-/**
- * Should create a fake TimeRange object
- * Mimics an HTML5 time range instance, which has functions that
- * return the start and end times for a range
- * TimeRanges are returned by the buffered() method
- * @param  {Number} start Start time in seconds
- * @param  {Number} end   End time in seconds
- * @return {Object}       Fake TimeRange object
- */
-vjs.createTimeRange = function(start, end){
-  return {
-    length: 1,
-    start: function() { return start; },
-    end: function() { return end; }
-  };
-};
-
-/**
- * Simple http request for retrieving external files (e.g. text tracks)
- * @param  {String} url           URL of resource
- * @param  {Function=} onSuccess  Success callback
- * @param  {Function=} onError    Error callback
- */
-vjs.get = function(url, onSuccess, onError){
-  var local, request;
-
-  if (typeof XMLHttpRequest === 'undefined') {
-    window.XMLHttpRequest = function () {
-      try { return new window.ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch (e) {}
-      try { return new window.ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch (f) {}
-      try { return new window.ActiveXObject('Msxml2.XMLHTTP'); } catch (g) {}
-      throw new Error('This browser does not support XMLHttpRequest.');
-    };
-  }
-
-  request = new XMLHttpRequest();
-  try {
-    request.open('GET', url);
-  } catch(e) {
-    onError(e);
-  }
-
-  local = (url.indexOf('file:') === 0 || (window.location.href.indexOf('file:') === 0 && url.indexOf('http') === -1));
-
-  request.onreadystatechange = function() {
-    if (request.readyState === 4) {
-      if (request.status === 200 || local && request.status === 0) {
-        onSuccess(request.responseText);
-      } else {
-        if (onError) {
-          onError();
-        }
-      }
-    }
-  };
-
-  try {
-    request.send();
-  } catch(e) {
-    if (onError) {
-      onError(e);
-    }
-  }
-};
-
-/* Local Storage
-================================================================================ */
-vjs.setLocalStorage = function(key, value){
-  try {
-    // IE was throwing errors referencing the var anywhere without this
-    var localStorage = window.localStorage || false;
-    if (!localStorage) { return; }
-    localStorage[key] = value;
-  } catch(e) {
-    if (e.code == 22 || e.code == 1014) { // Webkit == 22 / Firefox == 1014
-      vjs.log('LocalStorage Full (VideoJS)', e);
-    } else {
-      if (e.code == 18) {
-        vjs.log('LocalStorage not allowed (VideoJS)', e);
-      } else {
-        vjs.log('LocalStorage Error (VideoJS)', e);
-      }
-    }
-  }
-};
-
-/**
- * Get abosolute version of relative URL. Used to tell flash correct URL.
- * http://stackoverflow.com/questions/470832/getting-an-absolute-url-from-a-relative-one-ie6-issue
- * @param  {String} url URL to make absolute
- * @return {String}     Absolute URL
- */
-vjs.getAbsoluteURL = function(url){
-
-  // Check if absolute URL
-  if (!url.match(/^https?:\/\//)) {
-    // Convert to absolute URL. Flash hosted off-site needs an absolute URL.
-    url = vjs.createEl('div', {
-      innerHTML: '<a href="'+url+'">x</a>'
-    }).firstChild.href;
-  }
-
-  return url;
-};
-
-// usage: log('inside coolFunc',this,arguments);
-// http://paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/
-vjs.log = function(){
-  vjs.log.history = vjs.log.history || [];   // store logs to an array for reference
-  vjs.log.history.push(arguments);
-  if(window.console){
-    window.console.log(Array.prototype.slice.call(arguments));
-  }
-};
-
-// Offset Left
-// getBoundingClientRect technique from John Resig http://ejohn.org/blog/getboundingclientrect-is-awesome/
-vjs.findPosition = function(el) {
-    var box, docEl, body, clientLeft, scrollLeft, left, clientTop, scrollTop, top;
-
-    if (el.getBoundingClientRect && el.parentNode) {
-      box = el.getBoundingClientRect();
-    }
-
-    if (!box) {
-      return {
-        left: 0,
-        top: 0
-      };
-    }
-
-    docEl = document.documentElement;
-    body = document.body;
-
-    clientLeft = docEl.clientLeft || body.clientLeft || 0;
-    scrollLeft = window.pageXOffset || body.scrollLeft;
-    left = box.left + scrollLeft - clientLeft;
-
-    clientTop = docEl.clientTop || body.clientTop || 0;
-    scrollTop = window.pageYOffset || body.scrollTop;
-    top = box.top + scrollTop - clientTop;
-
-    return {
-      left: left,
-      top: top
-    };
-};
-/**
- * @fileoverview Player Component - Base class for all UI objects
- *
- */
-
-/**
- * Base UI Component class
- * @param {Object} player  Main Player
- * @param {Object=} options
- * @constructor
- */
-vjs.Component = vjs.CoreObject.extend({
-  /** @constructor */
-  init: function(player, options, ready){
-    this.player_ = player;
-
-    // Make a copy of prototype.options_ to protect against overriding global defaults
-    this.options_ = vjs.obj.copy(this.options_);
-
-    // Updated options with supplied options
-    options = this.options(options);
-
-    // Get ID from options, element, or create using player ID and unique ID
-    this.id_ = options['id'] || ((options['el'] && options['el']['id']) ? options['el']['id'] : player.id() + '_component_' + vjs.guid++ );
-
-    this.name_ = options['name'] || null;
-
-    // Create element if one wasn't provided in options
-    this.el_ = options['el'] || this.createEl();
-
-    this.children_ = [];
-    this.childIndex_ = {};
-    this.childNameIndex_ = {};
-
-    // Add any child components in options
-    this.initChildren();
-
-    this.ready(ready);
-    // Don't want to trigger ready here or it will before init is actually
-    // finished for all children that run this constructor
-  }
-});
-
-/**
- * Dispose of the component and all child components.
- */
-vjs.Component.prototype.dispose = function(){
-  this.trigger('dispose');
-
-  // Dispose all children.
-  if (this.children_) {
-    for (var i = this.children_.length - 1; i >= 0; i--) {
-      if (this.children_[i].dispose) {
-        this.children_[i].dispose();
-      }
-    }
-  }
-
-  // Delete child references
-  this.children_ = null;
-  this.childIndex_ = null;
-  this.childNameIndex_ = null;
-
-  // Remove all event listeners.
-  this.off();
-
-  // Remove element from DOM
-  if (this.el_.parentNode) {
-    this.el_.parentNode.removeChild(this.el_);
-  }
-
-  vjs.removeData(this.el_);
-  this.el_ = null;
-};
-
-/**
- * Reference to main player instance.
- * @type {vjs.Player}
- * @private
- */
-vjs.Component.prototype.player_;
-
-/**
- * Return the component's player.
- * @return {vjs.Player}
- */
-vjs.Component.prototype.player = function(){
-  return this.player_;
-};
-
-/**
- * Component options object.
- * @type {Object}
- * @private
- */
-vjs.Component.prototype.options_;
-
-/**
- * Deep merge of options objects
- * Whenever a property is an object on both options objects
- * the two properties will be merged using vjs.obj.deepMerge.
- *
- * This is used for merging options for child components. We
- * want it to be easy to override individual options on a child
- * component without having to rewrite all the other default options.
- *
- * Parent.prototype.options_ = {
- *   children: {
- *     'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
- *     'childTwo': {},
- *     'childThree': {}
- *   }
- * }
- * newOptions = {
- *   children: {
- *     'childOne': { 'foo': 'baz', 'abc': '123' }
- *     'childTwo': null,
- *     'childFour': {}
- *   }
- * }
- *
- * this.options(newOptions);
- *
- * RESULT
- *
- * {
- *   children: {
- *     'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
- *     'childTwo': null, // Disabled. Won't be initialized.
- *     'childThree': {},
- *     'childFour': {}
- *   }
- * }
- *
- * @param  {Object} obj Object whose values will be overwritten
- * @return {Object}      NEW merged object. Does not return obj1.
- */
-vjs.Component.prototype.options = function(obj){
-  if (obj === undefined) return this.options_;
-
-  return this.options_ = vjs.obj.deepMerge(this.options_, obj);
-};
-
-/**
- * The DOM element for the component.
- * @type {Element}
- * @private
- */
-vjs.Component.prototype.el_;
-
-/**
- * Create the component's DOM element.
- * @param  {String=} tagName  Element's node type. e.g. 'div'
- * @param  {Object=} attributes An object of element attributes that should be set on the element.
- * @return {Element}
- */
-vjs.Component.prototype.createEl = function(tagName, attributes){
-  return vjs.createEl(tagName, attributes);
-};
-
-/**
- * Return the component's DOM element.
- * @return {Element}
- */
-vjs.Component.prototype.el = function(){
-  return this.el_;
-};
-
-/**
- * An optional element where, if defined, children will be inserted
- *   instead of directly in el_
- * @type {Element}
- * @private
- */
-vjs.Component.prototype.contentEl_;
-
-/**
- * Return the component's DOM element for embedding content.
- *   will either be el_ or a new element defined in createEl
- * @return {Element}
- */
-vjs.Component.prototype.contentEl = function(){
-  return this.contentEl_ || this.el_;
-};
-
-/**
- * The ID for the component.
- * @type {String}
- * @private
- */
-vjs.Component.prototype.id_;
-
-/**
- * Return the component's ID.
- * @return {String}
- */
-vjs.Component.prototype.id = function(){
-  return this.id_;
-};
-
-/**
- * The name for the component. Often used to reference the component.
- * @type {String}
- * @private
- */
-vjs.Component.prototype.name_;
-
-/**
- * Return the component's ID.
- * @return {String}
- */
-vjs.Component.prototype.name = function(){
-  return this.name_;
-};
-
-/**
- * Array of child components
- * @type {Array}
- * @private
- */
-vjs.Component.prototype.children_;
-
-/**
- * Returns array of all child components.
- * @return {Array}
- */
-vjs.Component.prototype.children = function(){
-  return this.children_;
-};
-
-/**
- * Object of child components by ID
- * @type {Object}
- * @private
- */
-vjs.Component.prototype.childIndex_;
-
-/**
- * Returns a child component with the provided ID.
- * @return {Array}
- */
-vjs.Component.prototype.getChildById = function(id){
-  return this.childIndex_[id];
-};
-
-/**
- * Object of child components by Name
- * @type {Object}
- * @private
- */
-vjs.Component.prototype.childNameIndex_;
-
-/**
- * Returns a child component with the provided ID.
- * @return {Array}
- */
-vjs.Component.prototype.getChild = function(name){
-  return this.childNameIndex_[name];
-};
-
-/**
- * Adds a child component inside this component.
- * @param {String|vjs.Component} child The class name or instance of a child to add.
- * @param {Object=} options Optional options, including options to be passed to
- *  children of the child.
- * @return {vjs.Component} The child component, because it might be created in this process.
- * @suppress {accessControls|checkRegExp|checkTypes|checkVars|const|constantProperty|deprecated|duplicate|es5Strict|fileoverviewTags|globalThis|invalidCasts|missingProperties|nonStandardJsDocs|strictModuleDepCheck|undefinedNames|undefinedVars|unknownDefines|uselessCode|visibility}
- */
-vjs.Component.prototype.addChild = function(child, options){
-  var component, componentClass, componentName, componentId;
-
-  // If string, create new component with options
-  if (typeof child === 'string') {
-
-    componentName = child;
-
-    // Make sure options is at least an empty object to protect against errors
-    options = options || {};
-
-    // Assume name of set is a lowercased name of the UI Class (PlayButton, etc.)
-    componentClass = options['componentClass'] || vjs.capitalize(componentName);
-
-    // Set name through options
-    options['name'] = componentName;
-
-    // Create a new object & element for this controls set
-    // If there's no .player_, this is a player
-    // Closure Compiler throws an 'incomplete alias' warning if we use the vjs variable directly.
-    // Every class should be exported, so this should never be a problem here.
-    component = new window['videojs'][componentClass](this.player_ || this, options);
-
-  // child is a component instance
-  } else {
-    component = child;
-  }
-
-  this.children_.push(component);
-
-  if (typeof component.id === 'function') {
-    this.childIndex_[component.id()] = component;
-  }
-
-  // If a name wasn't used to create the component, check if we can use the
-  // name function of the component
-  componentName = componentName || (component.name && component.name());
-
-  if (componentName) {
-    this.childNameIndex_[componentName] = component;
-  }
-
-  // Add the UI object's element to the container div (box)
-  // Having an element is not required
-  if (typeof component['el'] === 'function' && component['el']()) {
-    this.contentEl().appendChild(component['el']());
-  }
-
-  // Return so it can stored on parent object if desired.
-  return component;
-};
-
-vjs.Component.prototype.removeChild = function(component){
-  if (typeof component === 'string') {
-    component = this.getChild(component);
-  }
-
-  if (!component || !this.children_) return;
-
-  var childFound = false;
-  for (var i = this.children_.length - 1; i >= 0; i--) {
-    if (this.children_[i] === component) {
-      childFound = true;
-      this.children_.splice(i,1);
-      break;
-    }
-  }
-
-  if (!childFound) return;
-
-  this.childIndex_[component.id] = null;
-  this.childNameIndex_[component.name] = null;
-
-  var compEl = component.el();
-  if (compEl && compEl.parentNode === this.contentEl()) {
-    this.contentEl().removeChild(component.el());
-  }
-};
-
-/**
- * Initialize default child components from options
- */
-vjs.Component.prototype.initChildren = function(){
-  var options = this.options_;
-
-  if (options && options['children']) {
-    var self = this;
-
-    // Loop through components and add them to the player
-    vjs.obj.each(options['children'], function(name, opts){
-      // Allow for disabling default components
-      // e.g. vjs.options['children']['posterImage'] = false
-      if (opts === false) return;
-
-      // Allow waiting to add components until a specific event is called
-      var tempAdd = function(){
-        // Set property name on player. Could cause conflicts with other prop names, but it's worth making refs easy.
-        self[name] = self.addChild(name, opts);
-      };
-
-      if (opts['loadEvent']) {
-        // this.one(opts.loadEvent, tempAdd)
-      } else {
-        tempAdd();
-      }
-    });
-  }
-};
-
-vjs.Component.prototype.buildCSSClass = function(){
-    // Child classes can include a function that does:
-    // return 'CLASS NAME' + this._super();
-    return '';
-};
-
-/* Events
-============================================================================= */
-
-/**
- * Add an event listener to this component's element. Context will be the component.
- * @param  {String}   type Event type e.g. 'click'
- * @param  {Function} fn   Event listener
- * @return {vjs.Component}
- */
-vjs.Component.prototype.on = function(type, fn){
-  vjs.on(this.el_, type, vjs.bind(this, fn));
-  return this;
-};
-
-/**
- * Remove an event listener from the component's element
- * @param  {String=}   type Optional event type. Without type it will remove all listeners.
- * @param  {Function=} fn   Optional event listener. Without fn it will remove all listeners for a type.
- * @return {vjs.Component}
- */
-vjs.Component.prototype.off = function(type, fn){
-  vjs.off(this.el_, type, fn);
-  return this;
-};
-
-/**
- * Add an event listener to be triggered only once and then removed
- * @param  {String}   type Event type
- * @param  {Function} fn   Event listener
- * @return {vjs.Component}
- */
-vjs.Component.prototype.one = function(type, fn) {
-  vjs.one(this.el_, type, vjs.bind(this, fn));
-  return this;
-};
-
-/**
- * Trigger an event on an element
- * @param  {String} type  Event type to trigger
- * @param  {Event|Object} event Event object to be passed to the listener
- * @return {vjs.Component}
- */
-vjs.Component.prototype.trigger = function(type, event){
-  vjs.trigger(this.el_, type, event);
-  return this;
-};
-
-/* Ready
-================================================================================ */
-/**
- * Is the component loaded.
- * @type {Boolean}
- * @private
- */
-vjs.Component.prototype.isReady_;
-
-/**
- * Trigger ready as soon as initialization is finished.
- *   Allows for delaying ready. Override on a sub class prototype.
- *   If you set this.isReadyOnInitFinish_ it will affect all components.
- *   Specially used when waiting for the Flash player to asynchrnously load.
- *   @type {Boolean}
- *   @private
- */
-vjs.Component.prototype.isReadyOnInitFinish_ = true;
-
-/**
- * List of ready listeners
- * @type {Array}
- * @private
- */
-vjs.Component.prototype.readyQueue_;
-
-/**
- * Bind a listener to the component's ready state.
- *   Different from event listeners in that if the ready event has already happend
- *   it will trigger the function immediately.
- * @param  {Function} fn Ready listener
- * @return {vjs.Component}
- */
-vjs.Component.prototype.ready = function(fn){
-  if (fn) {
-    if (this.isReady_) {
-      fn.call(this);
-    } else {
-      if (this.readyQueue_ === undefined) {
-        this.readyQueue_ = [];
-      }
-      this.readyQueue_.push(fn);
-    }
-  }
-  return this;
-};
-
-/**
- * Trigger the ready listeners
- * @return {vjs.Component}
- */
-vjs.Component.prototype.triggerReady = function(){
-  this.isReady_ = true;
-
-  var readyQueue = this.readyQueue_;
-
-  if (readyQueue && readyQueue.length > 0) {
-
-    for (var i = 0, j = readyQueue.length; i < j; i++) {
-      readyQueue[i].call(this);
-    }
-
-    // Reset Ready Queue
-    this.readyQueue_ = [];
-
-    // Allow for using event listeners also, in case you want to do something everytime a source is ready.
-    this.trigger('ready');
-  }
-};
-
-/* Display
-============================================================================= */
-
-/**
- * Add a CSS class name to the component's element
- * @param {String} classToAdd Classname to add
- * @return {vjs.Component}
- */
-vjs.Component.prototype.addClass = function(classToAdd){
-  vjs.addClass(this.el_, classToAdd);
-  return this;
-};
-
-/**
- * Remove a CSS class name from the component's element
- * @param {String} classToRemove Classname to remove
- * @return {vjs.Component}
- */
-vjs.Component.prototype.removeClass = function(classToRemove){
-  vjs.removeClass(this.el_, classToRemove);
-  return this;
-};
-
-/**
- * Show the component element if hidden
- * @return {vjs.Component}
- */
-vjs.Component.prototype.show = function(){
-  this.el_.style.display = 'block';
-  return this;
-};
-
-/**
- * Hide the component element if hidden
- * @return {vjs.Component}
- */
-vjs.Component.prototype.hide = function(){
-  this.el_.style.display = 'none';
-  return this;
-};
-
-/**
- * Lock an item in its visible state. To be used with fadeIn/fadeOut.
- * @return {vjs.Component}
- */
-vjs.Component.prototype.lockShowing = function(){
-  this.addClass('vjs-lock-showing');
-  return this;
-};
-
-/**
- * Unlock an item to be hidden. To be used with fadeIn/fadeOut.
- * @return {vjs.Component}
- */
-vjs.Component.prototype.unlockShowing = function(){
-  this.removeClass('vjs-lock-showing');
-  return this;
-};
-
-/**
- * Disable component by making it unshowable
- */
-vjs.Component.prototype.disable = function(){
-  this.hide();
-  this.show = function(){};
-};
-
-/**
- * If a value is provided it will change the width of the player to that value
- * otherwise the width is returned
- * http://dev.w3.org/html5/spec/dimension-attributes.html#attr-dim-height
- * Video tag width/height only work in pixels. No percents.
- * But allowing limited percents use. e.g. width() will return number+%, not computed width
- * @param  {Number|String=} num   Optional width number
- * @param  {[type]} skipListeners Skip the 'resize' event trigger
- * @return {vjs.Component|Number|String} Returns 'this' if dimension was set.
- *   Otherwise it returns the dimension.
- */
-vjs.Component.prototype.width = function(num, skipListeners){
-  return this.dimension('width', num, skipListeners);
-};
-
-/**
- * Get or set the height of the player
- * @param  {Number|String=} num     Optional new player height
- * @param  {Boolean=} skipListeners Optional skip resize event trigger
- * @return {vjs.Component|Number|String} The player, or the dimension
- */
-vjs.Component.prototype.height = function(num, skipListeners){
-  return this.dimension('height', num, skipListeners);
-};
-
-/**
- * Set both width and height at the same time.
- * @param  {Number|String} width
- * @param  {Number|String} height
- * @return {vjs.Component}   The player.
- */
-vjs.Component.prototype.dimensions = function(width, height){
-  // Skip resize listeners on width for optimization
-  return this.width(width, true).height(height);
-};
-
-/**
- * Get or set width or height.
- * All for an integer, integer + 'px' or integer + '%';
- * Known issue: hidden elements. Hidden elements officially have a width of 0.
- * So we're defaulting to the style.width value and falling back to computedStyle
- * which has the hidden element issue.
- * Info, but probably not an efficient fix:
- * http://www.foliotek.com/devblog/getting-the-width-of-a-hidden-element-with-jquery-using-width/
- * @param  {String=} widthOrHeight 'width' or 'height'
- * @param  {Number|String=} num           New dimension
- * @param  {Boolean=} skipListeners Skip resize event trigger
- * @return {vjs.Component|Number|String} Return the player if setting a dimension.
- *                                         Otherwise it returns the dimension.
- */
-vjs.Component.prototype.dimension = function(widthOrHeight, num, skipListeners){
-  if (num !== undefined) {
-
-    // Check if using css width/height (% or px) and adjust
-    if ((''+num).indexOf('%') !== -1 || (''+num).indexOf('px') !== -1) {
-      this.el_.style[widthOrHeight] = num;
-    } else if (num === 'auto') {
-      this.el_.style[widthOrHeight] = '';
-    } else {
-      this.el_.style[widthOrHeight] = num+'px';
-    }
-
-    // skipListeners allows us to avoid triggering the resize event when setting both width and height
-    if (!skipListeners) { this.trigger('resize'); }
-
-    // Return component
-    return this;
-  }
-
-  // Not setting a value, so getting it
-  // Make sure element exists
-  if (!this.el_) return 0;
-
-  // Get dimension value from style
-  var val = this.el_.style[widthOrHeight];
-  var pxIndex = val.indexOf('px');
-  if (pxIndex !== -1) {
-    // Return the pixel value with no 'px'
-    return parseInt(val.slice(0,pxIndex), 10);
-
-  // No px so using % or no style was set, so falling back to offsetWidth/height
-  // If component has display:none, offset will return 0
-  // TODO: handle display:none and no dimension style using px
-  } else {
-
-    return parseInt(this.el_['offset'+vjs.capitalize(widthOrHeight)], 10);
-
-    // ComputedStyle version.
-    // Only difference is if the element is hidden it will return
-    // the percent value (e.g. '100%'')
-    // instead of zero like offsetWidth returns.
-    // var val = vjs.getComputedStyleValue(this.el_, widthOrHeight);
-    // var pxIndex = val.indexOf('px');
-
-    // if (pxIndex !== -1) {
-    //   return val.slice(0, pxIndex);
-    // } else {
-    //   return val;
-    // }
-  }
-};
-
-/**
- * Emit 'tap' events when touch events are supported. We're requireing them to
- * be enabled because otherwise every component would have this extra overhead
- * unnecessarily, on mobile devices where extra overhead is especially bad.
- *
- * This is being implemented so we can support taps on the video element
- * toggling the controls.
- */
-vjs.Component.prototype.emitTapEvents = function(){
-  var touchStart, touchTime, couldBeTap, noTap;
-
-  // Track the start time so we can determine how long the touch lasted
-  touchStart = 0;
-
-  this.on('touchstart', function(event) {
-    // Record start time so we can detect a tap vs. "touch and hold"
-    touchStart = new Date().getTime();
-    // Reset couldBeTap tracking
-    couldBeTap = true;
-  });
-
-  noTap = function(){
-    couldBeTap = false;
-  };
-  // TODO: Listen to the original target. http://youtu.be/DujfpXOKUp8?t=13m8s
-  this.on('touchmove', noTap);
-  this.on('touchleave', noTap);
-  this.on('touchcancel', noTap);
-
-  // When the touch ends, measure how long it took and trigger the appropriate
-  // event
-  this.on('touchend', function() {
-    // Proceed only if the touchmove/leave/cancel event didn't happen
-    if (couldBeTap === true) {
-      // Measure how long the touch lasted
-      touchTime = new Date().getTime() - touchStart;
-      // The touch needs to be quick in order to consider it a tap
-      if (touchTime < 250) {
-        this.trigger('tap');
-        // It may be good to copy the touchend event object and change the
-        // type to tap, if the other event properties aren't exact after
-        // vjs.fixEvent runs (e.g. event.target)
-      }
-    }
-  });
-};
-/* Button - Base class for all buttons
-================================================================================ */
-/**
- * Base class for all buttons
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.Button = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-
-    var touchstart = false;
-    this.on('touchstart', function(event) {
-      // Stop click and other mouse events from triggering also
-      event.preventDefault();
-      touchstart = true;
-    });
-    this.on('touchmove', function() {
-      touchstart = false;
-    });
-    var self = this;
-    this.on('touchend', function(event) {
-      if (touchstart) {
-        self.onClick(event);
-      }
-      event.preventDefault();
-    });
-
-    this.on('click', this.onClick);
-    this.on('focus', this.onFocus);
-    this.on('blur', this.onBlur);
-  }
-});
-
-vjs.Button.prototype.createEl = function(type, props){
-  // Add standard Aria and Tabindex info
-  props = vjs.obj.merge({
-    className: this.buildCSSClass(),
-    innerHTML: '<div class="vjs-control-content"><span class="vjs-control-text">' + (this.buttonText || 'Need Text') + '</span></div>',
-    role: 'button',
-    'aria-live': 'polite', // let the screen reader user know that the text of the button may change
-    tabIndex: 0
-  }, props);
-
-  return vjs.Component.prototype.createEl.call(this, type, props);
-};
-
-vjs.Button.prototype.buildCSSClass = function(){
-  // TODO: Change vjs-control to vjs-button?
-  return 'vjs-control ' + vjs.Component.prototype.buildCSSClass.call(this);
-};
-
-  // Click - Override with specific functionality for button
-vjs.Button.prototype.onClick = function(){};
-
-  // Focus - Add keyboard functionality to element
-vjs.Button.prototype.onFocus = function(){
-  vjs.on(document, 'keyup', vjs.bind(this, this.onKeyPress));
-};
-
-  // KeyPress (document level) - Trigger click when keys are pressed
-vjs.Button.prototype.onKeyPress = function(event){
-  // Check for space bar (32) or enter (13) keys
-  if (event.which == 32 || event.which == 13) {
-    event.preventDefault();
-    this.onClick();
-  }
-};
-
-// Blur - Remove keyboard triggers
-vjs.Button.prototype.onBlur = function(){
-  vjs.off(document, 'keyup', vjs.bind(this, this.onKeyPress));
-};
-/* Slider
-================================================================================ */
-/**
- * Parent for seek bar and volume slider
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.Slider = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-
-    // Set property names to bar and handle to match with the child Slider class is looking for
-    this.bar = this.getChild(this.options_['barName']);
-    this.handle = this.getChild(this.options_['handleName']);
-
-    player.on(this.playerEvent, vjs.bind(this, this.update));
-
-    this.on('mousedown', this.onMouseDown);
-    this.on('touchstart', this.onMouseDown);
-    this.on('focus', this.onFocus);
-    this.on('blur', this.onBlur);
-    this.on('click', this.onClick);
-
-    this.player_.on('controlsvisible', vjs.bind(this, this.update));
-
-    // This is actually to fix the volume handle position. http://twitter.com/#!/gerritvanaaken/status/159046254519787520
-    // this.player_.one('timeupdate', vjs.bind(this, this.update));
-
-    player.ready(vjs.bind(this, this.update));
-
-    this.boundEvents = {};
-  }
-});
-
-vjs.Slider.prototype.createEl = function(type, props) {
-  props = props || {};
-  // Add the slider element class to all sub classes
-  props.className = props.className + ' vjs-slider';
-  props = vjs.obj.merge({
-    role: 'slider',
-    'aria-valuenow': 0,
-    'aria-valuemin': 0,
-    'aria-valuemax': 100,
-    tabIndex: 0
-  }, props);
-
-  return vjs.Component.prototype.createEl.call(this, type, props);
-};
-
-vjs.Slider.prototype.onMouseDown = function(event){
-  event.preventDefault();
-  vjs.blockTextSelection();
-
-  this.boundEvents.move = vjs.bind(this, this.onMouseMove);
-  this.boundEvents.end = vjs.bind(this, this.onMouseUp);
-
-  vjs.on(document, 'mousemove', this.boundEvents.move);
-  vjs.on(document, 'mouseup', this.boundEvents.end);
-  vjs.on(document, 'touchmove', this.boundEvents.move);
-  vjs.on(document, 'touchend', this.boundEvents.end);
-
-  this.onMouseMove(event);
-};
-
-vjs.Slider.prototype.onMouseUp = function() {
-  vjs.unblockTextSelection();
-  vjs.off(document, 'mousemove', this.boundEvents.move, false);
-  vjs.off(document, 'mouseup', this.boundEvents.end, false);
-  vjs.off(document, 'touchmove', this.boundEvents.move, false);
-  vjs.off(document, 'touchend', this.boundEvents.end, false);
-
-  this.update();
-};
-
-vjs.Slider.prototype.update = function(){
-  // In VolumeBar init we have a setTimeout for update that pops and update to the end of the
-  // execution stack. The player is destroyed before then update will cause an error
-  if (!this.el_) return;
-
-  // If scrubbing, we could use a cached value to make the handle keep up with the user's mouse.
-  // On HTML5 browsers scrubbing is really smooth, but some flash players are slow, so we might want to utilize this later.
-  // var progress =  (this.player_.scrubbing) ? this.player_.getCache().currentTime / this.player_.duration() : this.player_.currentTime() / this.player_.duration();
-
-  var barProgress,
-      progress = this.getPercent(),
-      handle = this.handle,
-      bar = this.bar;
-
-  // Protect against no duration and other division issues
-  if (isNaN(progress)) { progress = 0; }
-
-  barProgress = progress;
-
-  // If there is a handle, we need to account for the handle in our calculation for progress bar
-  // so that it doesn't fall short of or extend past the handle.
-  if (handle) {
-
-    var box = this.el_,
-        boxWidth = box.offsetWidth,
-
-        handleWidth = handle.el().offsetWidth,
-
-        // The width of the handle in percent of the containing box
-        // In IE, widths may not be ready yet causing NaN
-        handlePercent = (handleWidth) ? handleWidth / boxWidth : 0,
-
-        // Get the adjusted size of the box, considering that the handle's center never touches the left or right side.
-        // There is a margin of half the handle's width on both sides.
-        boxAdjustedPercent = 1 - handlePercent,
-
-        // Adjust the progress that we'll use to set widths to the new adjusted box width
-        adjustedProgress = progress * boxAdjustedPercent;
-
-    // The bar does reach the left side, so we need to account for this in the bar's width
-    barProgress = adjustedProgress + (handlePercent / 2);
-
-    // Move the handle from the left based on the adjected progress
-    handle.el().style.left = vjs.round(adjustedProgress * 100, 2) + '%';
-  }
-
-  // Set the new bar width
-  bar.el().style.width = vjs.round(barProgress * 100, 2) + '%';
-};
-
-vjs.Slider.prototype.calculateDistance = function(event){
-  var el, box, boxX, boxY, boxW, boxH, handle, pageX, pageY;
-
-  el = this.el_;
-  box = vjs.findPosition(el);
-  boxW = boxH = el.offsetWidth;
-  handle = this.handle;
-
-  if (this.options_.vertical) {
-    boxY = box.top;
-
-    if (event.changedTouches) {
-      pageY = event.changedTouches[0].pageY;
-    } else {
-      pageY = event.pageY;
-    }
-
-    if (handle) {
-      var handleH = handle.el().offsetHeight;
-      // Adjusted X and Width, so handle doesn't go outside the bar
-      boxY = boxY + (handleH / 2);
-      boxH = boxH - handleH;
-    }
-
-    // Percent that the click is through the adjusted area
-    return Math.max(0, Math.min(1, ((boxY - pageY) + boxH) / boxH));
-
-  } else {
-    boxX = box.left;
-
-    if (event.changedTouches) {
-      pageX = event.changedTouches[0].pageX;
-    } else {
-      pageX = event.pageX;
-    }
-
-    if (handle) {
-      var handleW = handle.el().offsetWidth;
-
-      // Adjusted X and Width, so handle doesn't go outside the bar
-      boxX = boxX + (handleW / 2);
-      boxW = boxW - handleW;
-    }
-
-    // Percent that the click is through the adjusted area
-    return Math.max(0, Math.min(1, (pageX - boxX) / boxW));
-  }
-};
-
-vjs.Slider.prototype.onFocus = function(){
-  vjs.on(document, 'keyup', vjs.bind(this, this.onKeyPress));
-};
-
-vjs.Slider.prototype.onKeyPress = function(event){
-  if (event.which == 37) { // Left Arrow
-    event.preventDefault();
-    this.stepBack();
-  } else if (event.which == 39) { // Right Arrow
-    event.preventDefault();
-    this.stepForward();
-  }
-};
-
-vjs.Slider.prototype.onBlur = function(){
-  vjs.off(document, 'keyup', vjs.bind(this, this.onKeyPress));
-};
-
-/**
- * Listener for click events on slider, used to prevent clicks
- *   from bubbling up to parent elements like button menus.
- * @param  {Object} event Event object
- */
-vjs.Slider.prototype.onClick = function(event){
-  event.stopImmediatePropagation();
-  event.preventDefault();
-};
-
-/**
- * SeekBar Behavior includes play progress bar, and seek handle
- * Needed so it can determine seek position based on handle position/size
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.SliderHandle = vjs.Component.extend();
-
-/**
- * Default value of the slider
- * @type {Number}
- */
-vjs.SliderHandle.prototype.defaultValue = 0;
-
-/** @inheritDoc */
-vjs.SliderHandle.prototype.createEl = function(type, props) {
-  props = props || {};
-  // Add the slider element class to all sub classes
-  props.className = props.className + ' vjs-slider-handle';
-  props = vjs.obj.merge({
-    innerHTML: '<span class="vjs-control-text">'+this.defaultValue+'</span>'
-  }, props);
-
-  return vjs.Component.prototype.createEl.call(this, 'div', props);
-};
-/* Menu
-================================================================================ */
-/**
- * The base for text track and settings menu buttons.
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.Menu = vjs.Component.extend();
-
-/**
- * Add a menu item to the menu
- * @param {Object|String} component Component or component type to add
- */
-vjs.Menu.prototype.addItem = function(component){
-  this.addChild(component);
-  component.on('click', vjs.bind(this, function(){
-    this.unlockShowing();
-  }));
-};
-
-/** @inheritDoc */
-vjs.Menu.prototype.createEl = function(){
-  var contentElType = this.options().contentElType || 'ul';
-  this.contentEl_ = vjs.createEl(contentElType, {
-    className: 'vjs-menu-content'
-  });
-  var el = vjs.Component.prototype.createEl.call(this, 'div', {
-    append: this.contentEl_,
-    className: 'vjs-menu'
-  });
-  el.appendChild(this.contentEl_);
-
-  // Prevent clicks from bubbling up. Needed for Menu Buttons,
-  // where a click on the parent is significant
-  vjs.on(el, 'click', function(event){
-    event.preventDefault();
-    event.stopImmediatePropagation();
-  });
-
-  return el;
-};
-
-/**
- * Menu item
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.MenuItem = vjs.Button.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Button.call(this, player, options);
-    this.selected(options['selected']);
-  }
-});
-
-/** @inheritDoc */
-vjs.MenuItem.prototype.createEl = function(type, props){
-  return vjs.Button.prototype.createEl.call(this, 'li', vjs.obj.merge({
-    className: 'vjs-menu-item',
-    innerHTML: this.options_['label']
-  }, props));
-};
-
-/** @inheritDoc */
-vjs.MenuItem.prototype.onClick = function(){
-  this.selected(true);
-};
-
-/**
- * Set this menu item as selected or not
- * @param  {Boolean} selected
- */
-vjs.MenuItem.prototype.selected = function(selected){
-  if (selected) {
-    this.addClass('vjs-selected');
-    this.el_.setAttribute('aria-selected',true);
-  } else {
-    this.removeClass('vjs-selected');
-    this.el_.setAttribute('aria-selected',false);
-  }
-};
-
-
-/**
- * A button class with a popup menu
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.MenuButton = vjs.Button.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Button.call(this, player, options);
-
-    this.menu = this.createMenu();
-
-    // Add list to element
-    this.addChild(this.menu);
-
-    // Automatically hide empty menu buttons
-    if (this.items && this.items.length === 0) {
-      this.hide();
-    }
-
-    this.on('keyup', this.onKeyPress);
-    this.el_.setAttribute('aria-haspopup', true);
-    this.el_.setAttribute('role', 'button');
-  }
-});
-
-/**
- * Track the state of the menu button
- * @type {Boolean}
- */
-vjs.MenuButton.prototype.buttonPressed_ = false;
-
-vjs.MenuButton.prototype.createMenu = function(){
-  var menu = new vjs.Menu(this.player_);
-
-  // Add a title list item to the top
-  if (this.options().title) {
-    menu.el().appendChild(vjs.createEl('li', {
-      className: 'vjs-menu-title',
-      innerHTML: vjs.capitalize(this.kind_),
-      tabindex: -1
-    }));
-  }
-
-  this.items = this['createItems']();
-
-  if (this.items) {
-    // Add menu items to the menu
-    for (var i = 0; i < this.items.length; i++) {
-      menu.addItem(this.items[i]);
-    }
-  }
-
-  return menu;
-};
-
-/**
- * Create the list of menu items. Specific to each subclass.
- */
-vjs.MenuButton.prototype.createItems = function(){};
-
-/** @inheritDoc */
-vjs.MenuButton.prototype.buildCSSClass = function(){
-  return this.className + ' vjs-menu-button ' + vjs.Button.prototype.buildCSSClass.call(this);
-};
-
-// Focus - Add keyboard functionality to element
-// This function is not needed anymore. Instead, the keyboard functionality is handled by
-// treating the button as triggering a submenu. When the button is pressed, the submenu
-// appears. Pressing the button again makes the submenu disappear.
-vjs.MenuButton.prototype.onFocus = function(){};
-// Can't turn off list display that we turned on with focus, because list would go away.
-vjs.MenuButton.prototype.onBlur = function(){};
-
-vjs.MenuButton.prototype.onClick = function(){
-  // When you click the button it adds focus, which will show the menu indefinitely.
-  // So we'll remove focus when the mouse leaves the button.
-  // Focus is needed for tab navigation.
-  this.one('mouseout', vjs.bind(this, function(){
-    this.menu.unlockShowing();
-    this.el_.blur();
-  }));
-  if (this.buttonPressed_){
-    this.unpressButton();
-  } else {
-    this.pressButton();
-  }
-};
-
-vjs.MenuButton.prototype.onKeyPress = function(event){
-  event.preventDefault();
-
-  // Check for space bar (32) or enter (13) keys
-  if (event.which == 32 || event.which == 13) {
-    if (this.buttonPressed_){
-      this.unpressButton();
-    } else {
-      this.pressButton();
-    }
-  // Check for escape (27) key
-  } else if (event.which == 27){
-    if (this.buttonPressed_){
-      this.unpressButton();
-    }
-  }
-};
-
-vjs.MenuButton.prototype.pressButton = function(){
-  this.buttonPressed_ = true;
-  this.menu.lockShowing();
-  this.el_.setAttribute('aria-pressed', true);
-  if (this.items && this.items.length > 0) {
-    this.items[0].el().focus(); // set the focus to the title of the submenu
-  }
-};
-
-vjs.MenuButton.prototype.unpressButton = function(){
-  this.buttonPressed_ = false;
-  this.menu.unlockShowing();
-  this.el_.setAttribute('aria-pressed', false);
-};
-
-/**
- * Main player class. A player instance is returned by _V_(id);
- * @param {Element} tag        The original video tag used for configuring options
- * @param {Object=} options    Player options
- * @param {Function=} ready    Ready callback function
- * @constructor
- */
-vjs.Player = vjs.Component.extend({
-  /** @constructor */
-  init: function(tag, options, ready){
-    this.tag = tag; // Store the original tag used to set options
-
-    // Set Options
-    // The options argument overrides options set in the video tag
-    // which overrides globally set options.
-    // This latter part coincides with the load order
-    // (tag must exist before Player)
-    options = vjs.obj.merge(this.getTagSettings(tag), options);
-
-    // Cache for video property values.
-    this.cache_ = {};
-
-    // Set poster
-    this.poster_ = options['poster'];
-    // Set controls
-    this.controls_ = options['controls'];
-    // Original tag settings stored in options
-    // now remove immediately so native controls don't flash.
-    // May be turned back on by HTML5 tech if nativeControlsForTouch is true
-    tag.controls = false;
-
-    // Run base component initializing with new options.
-    // Builds the element through createEl()
-    // Inits and embeds any child components in opts
-    vjs.Component.call(this, this, options, ready);
-
-    // Update controls className. Can't do this when the controls are initially
-    // set because the element doesn't exist yet.
-    if (this.controls()) {
-      this.addClass('vjs-controls-enabled');
-    } else {
-      this.addClass('vjs-controls-disabled');
-    }
-
-    // TODO: Make this smarter. Toggle user state between touching/mousing
-    // using events, since devices can have both touch and mouse events.
-    // if (vjs.TOUCH_ENABLED) {
-    //   this.addClass('vjs-touch-enabled');
-    // }
-
-    // Firstplay event implimentation. Not sold on the event yet.
-    // Could probably just check currentTime==0?
-    this.one('play', function(e){
-      var fpEvent = { type: 'firstplay', target: this.el_ };
-      // Using vjs.trigger so we can check if default was prevented
-      var keepGoing = vjs.trigger(this.el_, fpEvent);
-
-      if (!keepGoing) {
-        e.preventDefault();
-        e.stopPropagation();
-        e.stopImmediatePropagation();
-      }
-    });
-
-    this.on('ended', this.onEnded);
-    this.on('play', this.onPlay);
-    this.on('firstplay', this.onFirstPlay);
-    this.on('pause', this.onPause);
-    this.on('progress', this.onProgress);
-    this.on('durationchange', this.onDurationChange);
-    this.on('error', this.onError);
-    this.on('fullscreenchange', this.onFullscreenChange);
-
-    // Make player easily findable by ID
-    vjs.players[this.id_] = this;
-
-    if (options['plugins']) {
-      vjs.obj.each(options['plugins'], function(key, val){
-        this[key](val);
-      }, this);
-    }
-
-    this.listenForUserActivity();
-  }
-});
-
-/**
- * Player instance options, surfaced using vjs.options
- * vjs.options = vjs.Player.prototype.options_
- * Make changes in vjs.options, not here.
- * All options should use string keys so they avoid
- * renaming by closure compiler
- * @type {Object}
- * @private
- */
-vjs.Player.prototype.options_ = vjs.options;
-
-vjs.Player.prototype.dispose = function(){
-  this.trigger('dispose');
-  // prevent dispose from being called twice
-  this.off('dispose');
-
-  // Kill reference to this player
-  vjs.players[this.id_] = null;
-  if (this.tag && this.tag['player']) { this.tag['player'] = null; }
-  if (this.el_ && this.el_['player']) { this.el_['player'] = null; }
-
-  // Ensure that tracking progress and time progress will stop and plater deleted
-  this.stopTrackingProgress();
-  this.stopTrackingCurrentTime();
-
-  if (this.tech) { this.tech.dispose(); }
-
-  // Component dispose
-  vjs.Component.prototype.dispose.call(this);
-};
-
-vjs.Player.prototype.getTagSettings = function(tag){
-  var options = {
-    'sources': [],
-    'tracks': []
-  };
-
-  vjs.obj.merge(options, vjs.getAttributeValues(tag));
-
-  // Get tag children settings
-  if (tag.hasChildNodes()) {
-    var children, child, childName, i, j;
-
-    children = tag.childNodes;
-
-    for (i=0,j=children.length; i<j; i++) {
-      child = children[i];
-      // Change case needed: http://ejohn.org/blog/nodename-case-sensitivity/
-      childName = child.nodeName.toLowerCase();
-      if (childName === 'source') {
-        options['sources'].push(vjs.getAttributeValues(child));
-      } else if (childName === 'track') {
-        options['tracks'].push(vjs.getAttributeValues(child));
-      }
-    }
-  }
-
-  return options;
-};
-
-vjs.Player.prototype.createEl = function(){
-  var el = this.el_ = vjs.Component.prototype.createEl.call(this, 'div');
-  var tag = this.tag;
-
-  // Remove width/height attrs from tag so CSS can make it 100% width/height
-  tag.removeAttribute('width');
-  tag.removeAttribute('height');
-  // Empty video tag sources and tracks so the built-in player doesn't use them also.
-  // This may not be fast enough to stop HTML5 browsers from reading the tags
-  // so we'll need to turn off any default tracks if we're manually doing
-  // captions and subtitles. videoElement.textTracks
-  if (tag.hasChildNodes()) {
-    var nodes, nodesLength, i, node, nodeName, removeNodes;
-
-    nodes = tag.childNodes;
-    nodesLength = nodes.length;
-    removeNodes = [];
-
-    while (nodesLength--) {
-      node = nodes[nodesLength];
-      nodeName = node.nodeName.toLowerCase();
-      if (nodeName === 'source' || nodeName === 'track') {
-        removeNodes.push(node);
-      }
-    }
-
-    for (i=0; i<removeNodes.length; i++) {
-      tag.removeChild(removeNodes[i]);
-    }
-  }
-
-  // Make sure tag ID exists
-  tag.id = tag.id || 'vjs_video_' + vjs.guid++;
-
-  // Give video tag ID and class to player div
-  // ID will now reference player box, not the video tag
-  el.id = tag.id;
-  el.className = tag.className;
-
-  // Update tag id/class for use as HTML5 playback tech
-  // Might think we should do this after embedding in container so .vjs-tech class
-  // doesn't flash 100% width/height, but class only applies with .video-js parent
-  tag.id += '_html5_api';
-  tag.className = 'vjs-tech';
-
-  // Make player findable on elements
-  tag['player'] = el['player'] = this;
-  // Default state of video is paused
-  this.addClass('vjs-paused');
-
-  // Make box use width/height of tag, or rely on default implementation
-  // Enforce with CSS since width/height attrs don't work on divs
-  this.width(this.options_['width'], true); // (true) Skip resize listener on load
-  this.height(this.options_['height'], true);
-
-  // Wrap video tag in div (el/box) container
-  if (tag.parentNode) {
-    tag.parentNode.insertBefore(el, tag);
-  }
-  vjs.insertFirst(tag, el); // Breaks iPhone, fixed in HTML5 setup.
-
-  return el;
-};
-
-// /* Media Technology (tech)
-// ================================================================================ */
-// Load/Create an instance of playback technlogy including element and API methods
-// And append playback element in player div.
-vjs.Player.prototype.loadTech = function(techName, source){
-
-  // Pause and remove current playback technology
-  if (this.tech) {
-    this.unloadTech();
-
-  // If the first time loading, HTML5 tag will exist but won't be initialized
-  // So we need to remove it if we're not loading HTML5
-  } else if (techName !== 'Html5' && this.tag) {
-    this.el_.removeChild(this.tag);
-    this.tag['player'] = null;
-    this.tag = null;
-  }
-
-  this.techName = techName;
-
-  // Turn off API access because we're loading a new tech that might load asynchronously
-  this.isReady_ = false;
-
-  var techReady = function(){
-    this.player_.triggerReady();
-
-    // Manually track progress in cases where the browser/flash player doesn't report it.
-    if (!this.features['progressEvents']) {
-      this.player_.manualProgressOn();
-    }
-
-    // Manually track timeudpates in cases where the browser/flash player doesn't report it.
-    if (!this.features['timeupdateEvents']) {
-      this.player_.manualTimeUpdatesOn();
-    }
-  };
-
-  // Grab tech-specific options from player options and add source and parent element to use.
-  var techOptions = vjs.obj.merge({ 'source': source, 'parentEl': this.el_ }, this.options_[techName.toLowerCase()]);
-
-  if (source) {
-    if (source.src == this.cache_.src && this.cache_.currentTime > 0) {
-      techOptions['startTime'] = this.cache_.currentTime;
-    }
-
-    this.cache_.src = source.src;
-  }
-
-  // Initialize tech instance
-  this.tech = new window['videojs'][techName](this, techOptions);
-
-  this.tech.ready(techReady);
-};
-
-vjs.Player.prototype.unloadTech = function(){
-  this.isReady_ = false;
-  this.tech.dispose();
-
-  // Turn off any manual progress or timeupdate tracking
-  if (this.manualProgress) { this.manualProgressOff(); }
-
-  if (this.manualTimeUpdates) { this.manualTimeUpdatesOff(); }
-
-  this.tech = false;
-};
-
-// There's many issues around changing the size of a Flash (or other plugin) object.
-// First is a plugin reload issue in Firefox that has been around for 11 years: https://bugzilla.mozilla.org/show_bug.cgi?id=90268
-// Then with the new fullscreen API, Mozilla and webkit browsers will reload the flash object after going to fullscreen.
-// To get around this, we're unloading the tech, caching source and currentTime values, and reloading the tech once the plugin is resized.
-// reloadTech: function(betweenFn){
-//   vjs.log('unloadingTech')
-//   this.unloadTech();
-//   vjs.log('unloadedTech')
-//   if (betweenFn) { betweenFn.call(); }
-//   vjs.log('LoadingTech')
-//   this.loadTech(this.techName, { src: this.cache_.src })
-//   vjs.log('loadedTech')
-// },
-
-/* Fallbacks for unsupported event types
-================================================================================ */
-// Manually trigger progress events based on changes to the buffered amount
-// Many flash players and older HTML5 browsers don't send progress or progress-like events
-vjs.Player.prototype.manualProgressOn = function(){
-  this.manualProgress = true;
-
-  // Trigger progress watching when a source begins loading
-  this.trackProgress();
-
-  // Watch for a native progress event call on the tech element
-  // In HTML5, some older versions don't support the progress event
-  // So we're assuming they don't, and turning off manual progress if they do.
-  // As opposed to doing user agent detection
-  this.tech.one('progress', function(){
-
-    // Update known progress support for this playback technology
-    this.features['progressEvents'] = true;
-
-    // Turn off manual progress tracking
-    this.player_.manualProgressOff();
-  });
-};
-
-vjs.Player.prototype.manualProgressOff = function(){
-  this.manualProgress = false;
-  this.stopTrackingProgress();
-};
-
-vjs.Player.prototype.trackProgress = function(){
-
-  this.progressInterval = setInterval(vjs.bind(this, function(){
-    // Don't trigger unless buffered amount is greater than last time
-    // log(this.cache_.bufferEnd, this.buffered().end(0), this.duration())
-    /* TODO: update for multiple buffered regions */
-    if (this.cache_.bufferEnd < this.buffered().end(0)) {
-      this.trigger('progress');
-    } else if (this.bufferedPercent() == 1) {
-      this.stopTrackingProgress();
-      this.trigger('progress'); // Last update
-    }
-  }), 500);
-};
-vjs.Player.prototype.stopTrackingProgress = function(){ clearInterval(this.progressInterval); };
-
-/* Time Tracking -------------------------------------------------------------- */
-vjs.Player.prototype.manualTimeUpdatesOn = function(){
-  this.manualTimeUpdates = true;
-
-  this.on('play', this.trackCurrentTime);
-  this.on('pause', this.stopTrackingCurrentTime);
-  // timeupdate is also called by .currentTime whenever current time is set
-
-  // Watch for native timeupdate event
-  this.tech.one('timeupdate', function(){
-    // Update known progress support for this playback technology
-    this.features['timeupdateEvents'] = true;
-    // Turn off manual progress tracking
-    this.player_.manualTimeUpdatesOff();
-  });
-};
-
-vjs.Player.prototype.manualTimeUpdatesOff = function(){
-  this.manualTimeUpdates = false;
-  this.stopTrackingCurrentTime();
-  this.off('play', this.trackCurrentTime);
-  this.off('pause', this.stopTrackingCurrentTime);
-};
-
-vjs.Player.prototype.trackCurrentTime = function(){
-  if (this.currentTimeInterval) { this.stopTrackingCurrentTime(); }
-  this.currentTimeInterval = setInterval(vjs.bind(this, function(){
-    this.trigger('timeupdate');
-  }), 250); // 42 = 24 fps // 250 is what Webkit uses // FF uses 15
-};
-
-// Turn off play progress tracking (when paused or dragging)
-vjs.Player.prototype.stopTrackingCurrentTime = function(){ clearInterval(this.currentTimeInterval); };
-
-// /* Player event handlers (how the player reacts to certain events)
-// ================================================================================ */
-vjs.Player.prototype.onEnded = function(){
-  if (this.options_['loop']) {
-    this.currentTime(0);
-    this.play();
-  }
-};
-
-vjs.Player.prototype.onPlay = function(){
-  vjs.removeClass(this.el_, 'vjs-paused');
-  vjs.addClass(this.el_, 'vjs-playing');
-};
-
-vjs.Player.prototype.onFirstPlay = function(){
-    //If the first starttime attribute is specified
-    //then we will start at the given offset in seconds
-    if(this.options_['starttime']){
-      this.currentTime(this.options_['starttime']);
-    }
-
-    this.addClass('vjs-has-started');
-};
-
-vjs.Player.prototype.onPause = function(){
-  vjs.removeClass(this.el_, 'vjs-playing');
-  vjs.addClass(this.el_, 'vjs-paused');
-};
-
-vjs.Player.prototype.onProgress = function(){
-  // Add custom event for when source is finished downloading.
-  if (this.bufferedPercent() == 1) {
-    this.trigger('loadedalldata');
-  }
-};
-
-// Update duration with durationchange event
-// Allows for cacheing value instead of asking player each time.
-vjs.Player.prototype.onDurationChange = function(){
-  this.duration(this.techGet('duration'));
-};
-
-vjs.Player.prototype.onError = function(e) {
-  vjs.log('Video Error', e);
-};
-
-vjs.Player.prototype.onFullscreenChange = function() {
-  if (this.isFullScreen) {
-    this.addClass('vjs-fullscreen');
-  } else {
-    this.removeClass('vjs-fullscreen');
-  }
-};
-
-// /* Player API
-// ================================================================================ */
-
-/**
- * Object for cached values.
- * @private
- */
-vjs.Player.prototype.cache_;
-
-vjs.Player.prototype.getCache = function(){
-  return this.cache_;
-};
-
-// Pass values to the playback tech
-vjs.Player.prototype.techCall = function(method, arg){
-  // If it's not ready yet, call method when it is
-  if (this.tech && !this.tech.isReady_) {
-    this.tech.ready(function(){
-      this[method](arg);
-    });
-
-  // Otherwise call method now
-  } else {
-    try {
-      this.tech[method](arg);
-    } catch(e) {
-      vjs.log(e);
-      throw e;
-    }
-  }
-};
-
-// Get calls can't wait for the tech, and sometimes don't need to.
-vjs.Player.prototype.techGet = function(method){
-
-  if (this.tech && this.tech.isReady_) {
-
-    // Flash likes to die and reload when you hide or reposition it.
-    // In these cases the object methods go away and we get errors.
-    // When that happens we'll catch the errors and inform tech that it's not ready any more.
-    try {
-      return this.tech[method]();
-    } catch(e) {
-      // When building additional tech libs, an expected method may not be defined yet
-      if (this.tech[method] === undefined) {
-        vjs.log('Video.js: ' + method + ' method not defined for '+this.techName+' playback technology.', e);
-      } else {
-        // When a method isn't available on the object it throws a TypeError
-        if (e.name == 'TypeError') {
-          vjs.log('Video.js: ' + method + ' unavailable on '+this.techName+' playback technology element.', e);
-          this.tech.isReady_ = false;
-        } else {
-          vjs.log(e);
-        }
-      }
-      throw e;
-    }
-  }
-
-  return;
-};
-
-/**
- * Start media playback
- * http://dev.w3.org/html5/spec/video.html#dom-media-play
- * We're triggering the 'play' event here instead of relying on the
- * media element to allow using event.preventDefault() to stop
- * play from happening if desired. Usecase: preroll ads.
- */
-vjs.Player.prototype.play = function(){
-  this.techCall('play');
-  return this;
-};
-
-// http://dev.w3.org/html5/spec/video.html#dom-media-pause
-vjs.Player.prototype.pause = function(){
-  this.techCall('pause');
-  return this;
-};
-
-// http://dev.w3.org/html5/spec/video.html#dom-media-paused
-// The initial state of paused should be true (in Safari it's actually false)
-vjs.Player.prototype.paused = function(){
-  return (this.techGet('paused') === false) ? false : true;
-};
-
-// http://dev.w3.org/html5/spec/video.html#dom-media-currenttime
-vjs.Player.prototype.currentTime = function(seconds){
-  if (seconds !== undefined) {
-
-    // Cache the last set value for smoother scrubbing.
-    this.cache_.lastSetCurrentTime = seconds;
-
-    this.techCall('setCurrentTime', seconds);
-
-    // Improve the accuracy of manual timeupdates
-    if (this.manualTimeUpdates) { this.trigger('timeupdate'); }
-
-    return this;
-  }
-
-  // Cache last currentTime and return
-  // Default to 0 seconds
-  return this.cache_.currentTime = (this.techGet('currentTime') || 0);
-};
-
-// http://dev.w3.org/html5/spec/video.html#dom-media-duration
-// Duration should return NaN if not available. ParseFloat will turn false-ish values to NaN.
-vjs.Player.prototype.duration = function(seconds){
-  if (seconds !== undefined) {
-
-    // Cache the last set value for optimiized scrubbing (esp. Flash)
-    this.cache_.duration = parseFloat(seconds);
-
-    return this;
-  }
-
-  return this.cache_.duration;
-};
-
-// Calculates how much time is left. Not in spec, but useful.
-vjs.Player.prototype.remainingTime = function(){
-  return this.duration() - this.currentTime();
-};
-
-// http://dev.w3.org/html5/spec/video.html#dom-media-buffered
-// Buffered returns a timerange object.
-// Kind of like an array of portions of the video that have been downloaded.
-// So far no browsers return more than one range (portion)
-vjs.Player.prototype.buffered = function(){
-  var buffered = this.techGet('buffered'),
-      start = 0,
-      buflast = buffered.length - 1,
-      // Default end to 0 and store in values
-      end = this.cache_.bufferEnd = this.cache_.bufferEnd || 0;
-
-  if (buffered && buflast >= 0 && buffered.end(buflast) !== end) {
-    end = buffered.end(buflast);
-    // Storing values allows them be overridden by setBufferedFromProgress
-    this.cache_.bufferEnd = end;
-  }
-
-  return vjs.createTimeRange(start, end);
-};
-
-// Calculates amount of buffer is full. Not in spec but useful.
-vjs.Player.prototype.bufferedPercent = function(){
-  return (this.duration()) ? this.buffered().end(0) / this.duration() : 0;
-};
-
-// http://dev.w3.org/html5/spec/video.html#dom-media-volume
-vjs.Player.prototype.volume = function(percentAsDecimal){
-  var vol;
-
-  if (percentAsDecimal !== undefined) {
-    vol = Math.max(0, Math.min(1, parseFloat(percentAsDecimal))); // Force value to between 0 and 1
-    this.cache_.volume = vol;
-    this.techCall('setVolume', vol);
-    vjs.setLocalStorage('volume', vol);
-    return this;
-  }
-
-  // Default to 1 when returning current volume.
-  vol = parseFloat(this.techGet('volume'));
-  return (isNaN(vol)) ? 1 : vol;
-};
-
-// http://dev.w3.org/html5/spec/video.html#attr-media-muted
-vjs.Player.prototype.muted = function(muted){
-  if (muted !== undefined) {
-    this.techCall('setMuted', muted);
-    return this;
-  }
-  return this.techGet('muted') || false; // Default to false
-};
-
-// Check if current tech can support native fullscreen (e.g. with built in controls lik iOS, so not our flash swf)
-vjs.Player.prototype.supportsFullScreen = function(){ return this.techGet('supportsFullScreen') || false; };
-
-// Turn on fullscreen (or window) mode
-vjs.Player.prototype.requestFullScreen = function(){
-  var requestFullScreen = vjs.support.requestFullScreen;
-  this.isFullScreen = true;
-
-  if (requestFullScreen) {
-    // the browser supports going fullscreen at the element level so we can
-    // take the controls fullscreen as well as the video
-
-    // Trigger fullscreenchange event after change
-    // We have to specifically add this each time, and remove
-    // when cancelling fullscreen. Otherwise if there's multiple
-    // players on a page, they would all be reacting to the same fullscreen
-    // events
-    vjs.on(document, requestFullScreen.eventName, vjs.bind(this, function(e){
-      this.isFullScreen = document[requestFullScreen.isFullScreen];
-
-      // If cancelling fullscreen, remove event listener.
-      if (this.isFullScreen === false) {
-        vjs.off(document, requestFullScreen.eventName, arguments.callee);
-      }
-
-      this.trigger('fullscreenchange');
-    }));
-
-    this.el_[requestFullScreen.requestFn]();
-
-  } else if (this.tech.supportsFullScreen()) {
-    // we can't take the video.js controls fullscreen but we can go fullscreen
-    // with native controls
-    this.techCall('enterFullScreen');
-  } else {
-    // fullscreen isn't supported so we'll just stretch the video element to
-    // fill the viewport
-    this.enterFullWindow();
-    this.trigger('fullscreenchange');
-  }
-
-  return this;
-};
-
-vjs.Player.prototype.cancelFullScreen = function(){
-  var requestFullScreen = vjs.support.requestFullScreen;
-  this.isFullScreen = false;
-
-  // Check for browser element fullscreen support
-  if (requestFullScreen) {
-    document[requestFullScreen.cancelFn]();
-  } else if (this.tech.supportsFullScreen()) {
-   this.techCall('exitFullScreen');
-  } else {
-   this.exitFullWindow();
-   this.trigger('fullscreenchange');
-  }
-
-  return this;
-};
-
-// When fullscreen isn't supported we can stretch the video container to as wide as the browser will let us.
-vjs.Player.prototype.enterFullWindow = function(){
-  this.isFullWindow = true;
-
-  // Storing original doc overflow value to return to when fullscreen is off
-  this.docOrigOverflow = document.documentElement.style.overflow;
-
-  // Add listener for esc key to exit fullscreen
-  vjs.on(document, 'keydown', vjs.bind(this, this.fullWindowOnEscKey));
-
-  // Hide any scroll bars
-  document.documentElement.style.overflow = 'hidden';
-
-  // Apply fullscreen styles
-  vjs.addClass(document.body, 'vjs-full-window');
-
-  this.trigger('enterFullWindow');
-};
-vjs.Player.prototype.fullWindowOnEscKey = function(event){
-  if (event.keyCode === 27) {
-    if (this.isFullScreen === true) {
-      this.cancelFullScreen();
-    } else {
-      this.exitFullWindow();
-    }
-  }
-};
-
-vjs.Player.prototype.exitFullWindow = function(){
-  this.isFullWindow = false;
-  vjs.off(document, 'keydown', this.fullWindowOnEscKey);
-
-  // Unhide scroll bars.
-  document.documentElement.style.overflow = this.docOrigOverflow;
-
-  // Remove fullscreen styles
-  vjs.removeClass(document.body, 'vjs-full-window');
-
-  // Resize the box, controller, and poster to original sizes
-  // this.positionAll();
-  this.trigger('exitFullWindow');
-};
-
-vjs.Player.prototype.selectSource = function(sources){
-
-  // Loop through each playback technology in the options order
-  for (var i=0,j=this.options_['techOrder'];i<j.length;i++) {
-    var techName = vjs.capitalize(j[i]),
-        tech = window['videojs'][techName];
-
-    // Check if the browser supports this technology
-    if (tech.isSupported()) {
-      // Loop through each source object
-      for (var a=0,b=sources;a<b.length;a++) {
-        var source = b[a];
-
-        // Check if source can be played with this technology
-        if (tech['canPlaySource'](source)) {
-          return { source: source, tech: techName };
-        }
-      }
-    }
-  }
-
-  return false;
-};
-
-// src is a pretty powerful function
-// If you pass it an array of source objects, it will find the best source to play and use that object.src
-//   If the new source requires a new playback technology, it will switch to that.
-// If you pass it an object, it will set the source to object.src
-// If you pass it anything else (url string) it will set the video source to that
-vjs.Player.prototype.src = function(source){
-  // Case: Array of source objects to choose from and pick the best to play
-  if (source instanceof Array) {
-
-    var sourceTech = this.selectSource(source),
-        techName;
-
-    if (sourceTech) {
-        source = sourceTech.source;
-        techName = sourceTech.tech;
-
-      // If this technology is already loaded, set source
-      if (techName == this.techName) {
-        this.src(source); // Passing the source object
-      // Otherwise load this technology with chosen source
-      } else {
-        this.loadTech(techName, source);
-      }
-    } else {
-      this.el_.appendChild(vjs.createEl('p', {
-        innerHTML: this.options()['notSupportedMessage']
-      }));
-    }
-
-  // Case: Source object { src: '', type: '' ... }
-  } else if (source instanceof Object) {
-
-    if (window['videojs'][this.techName]['canPlaySource'](source)) {
-      this.src(source.src);
-    } else {
-      // Send through tech loop to check for a compatible technology.
-      this.src([source]);
-    }
-
-  // Case: URL String (http://myvideo...)
-  } else {
-    // Cache for getting last set source
-    this.cache_.src = source;
-
-    if (!this.isReady_) {
-      this.ready(function(){
-        this.src(source);
-      });
-    } else {
-      this.techCall('src', source);
-      if (this.options_['preload'] == 'auto') {
-        this.load();
-      }
-      if (this.options_['autoplay']) {
-        this.play();
-      }
-    }
-  }
-  return this;
-};
-
-// Begin loading the src data
-// http://dev.w3.org/html5/spec/video.html#dom-media-load
-vjs.Player.prototype.load = function(){
-  this.techCall('load');
-  return this;
-};
-
-// http://dev.w3.org/html5/spec/video.html#dom-media-currentsrc
-vjs.Player.prototype.currentSrc = function(){
-  return this.techGet('currentSrc') || this.cache_.src || '';
-};
-
-// Attributes/Options
-vjs.Player.prototype.preload = function(value){
-  if (value !== undefined) {
-    this.techCall('setPreload', value);
-    this.options_['preload'] = value;
-    return this;
-  }
-  return this.techGet('preload');
-};
-vjs.Player.prototype.autoplay = function(value){
-  if (value !== undefined) {
-    this.techCall('setAutoplay', value);
-    this.options_['autoplay'] = value;
-    return this;
-  }
-  return this.techGet('autoplay', value);
-};
-vjs.Player.prototype.loop = function(value){
-  if (value !== undefined) {
-    this.techCall('setLoop', value);
-    this.options_['loop'] = value;
-    return this;
-  }
-  return this.techGet('loop');
-};
-
-/**
- * The url of the poster image source.
- * @type {String}
- * @private
- */
-vjs.Player.prototype.poster_;
-
-/**
- * Get or set the poster image source url.
- * @param  {String} src Poster image source URL
- * @return {String}    Poster image source URL or null
- */
-vjs.Player.prototype.poster = function(src){
-  if (src !== undefined) {
-    this.poster_ = src;
-  }
-  return this.poster_;
-};
-
-/**
- * Whether or not the controls are showing
- * @type {Boolean}
- * @private
- */
-vjs.Player.prototype.controls_;
-
-/**
- * Get or set whether or not the controls are showing.
- * @param  {Boolean} controls Set controls to showing or not
- * @return {Boolean}    Controls are showing
- */
-vjs.Player.prototype.controls = function(bool){
-  if (bool !== undefined) {
-    bool = !!bool; // force boolean
-    // Don't trigger a change event unless it actually changed
-    if (this.controls_ !== bool) {
-      this.controls_ = bool;
-      if (bool) {
-        this.removeClass('vjs-controls-disabled');
-        this.addClass('vjs-controls-enabled');
-        this.trigger('controlsenabled');
-      } else {
-        this.removeClass('vjs-controls-enabled');
-        this.addClass('vjs-controls-disabled');
-        this.trigger('controlsdisabled');
-      }
-    }
-    return this;
-  }
-  return this.controls_;
-};
-
-vjs.Player.prototype.usingNativeControls_;
-
-/**
- * Toggle native controls on/off. Native controls are the controls built into
- * devices (e.g. default iPhone controls), Flash, or other techs
- * (e.g. Vimeo Controls)
- *
- * **This should only be set by the current tech, because only the tech knows
- * if it can support native controls**
- *
- * @param  {Boolean} bool    True signals that native controls are on
- * @return {vjs.Player}      Returns the player
- */
-vjs.Player.prototype.usingNativeControls = function(bool){
-  if (bool !== undefined) {
-    bool = !!bool; // force boolean
-    // Don't trigger a change event unless it actually changed
-    if (this.usingNativeControls_ !== bool) {
-      this.usingNativeControls_ = bool;
-      if (bool) {
-        this.addClass('vjs-using-native-controls');
-        this.trigger('usingnativecontrols');
-      } else {
-        this.removeClass('vjs-using-native-controls');
-        this.trigger('usingcustomcontrols');
-      }
-    }
-    return this;
-  }
-  return this.usingNativeControls_;
-};
-
-vjs.Player.prototype.error = function(){ return this.techGet('error'); };
-vjs.Player.prototype.ended = function(){ return this.techGet('ended'); };
-vjs.Player.prototype.seeking = function(){ return this.techGet('seeking'); };
-
-// When the player is first initialized, trigger activity so components
-// like the control bar show themselves if needed
-vjs.Player.prototype.userActivity_ = true;
-vjs.Player.prototype.reportUserActivity = function(event){
-  this.userActivity_ = true;
-};
-
-vjs.Player.prototype.userActive_ = true;
-vjs.Player.prototype.userActive = function(bool){
-  if (bool !== undefined) {
-    bool = !!bool;
-    if (bool !== this.userActive_) {
-      this.userActive_ = bool;
-      if (bool) {
-        // If the user was inactive and is now active we want to reset the
-        // inactivity timer
-        this.userActivity_ = true;
-        this.removeClass('vjs-user-inactive');
-        this.addClass('vjs-user-active');
-        this.trigger('useractive');
-      } else {
-        // We're switching the state to inactive manually, so erase any other
-        // activity
-        this.userActivity_ = false;
-
-        // Chrome/Safari/IE have bugs where when you change the cursor it can
-        // trigger a mousemove event. This causes an issue when you're hiding
-        // the cursor when the user is inactive, and a mousemove signals user
-        // activity. Making it impossible to go into inactive mode. Specifically
-        // this happens in fullscreen when we really need to hide the cursor.
-        //
-        // When this gets resolved in ALL browsers it can be removed
-        // https://code.google.com/p/chromium/issues/detail?id=103041
-        this.tech.one('mousemove', function(e){
-          e.stopPropagation();
-          e.preventDefault();
-        });
-        this.removeClass('vjs-user-active');
-        this.addClass('vjs-user-inactive');
-        this.trigger('userinactive');
-      }
-    }
-    return this;
-  }
-  return this.userActive_;
-};
-
-vjs.Player.prototype.listenForUserActivity = function(){
-  var onMouseActivity, onMouseDown, mouseInProgress, onMouseUp,
-      activityCheck, inactivityTimeout;
-
-  onMouseActivity = this.reportUserActivity;
-
-  onMouseDown = function() {
-    onMouseActivity();
-    // For as long as the they are touching the device or have their mouse down,
-    // we consider them active even if they're not moving their finger or mouse.
-    // So we want to continue to update that they are active
-    clearInterval(mouseInProgress);
-    // Setting userActivity=true now and setting the interval to the same time
-    // as the activityCheck interval (250) should ensure we never miss the
-    // next activityCheck
-    mouseInProgress = setInterval(vjs.bind(this, onMouseActivity), 250);
-  };
-
-  onMouseUp = function(event) {
-    onMouseActivity();
-    // Stop the interval that maintains activity if the mouse/touch is down
-    clearInterval(mouseInProgress);
-  };
-
-  // Any mouse movement will be considered user activity
-  this.on('mousedown', onMouseDown);
-  this.on('mousemove', onMouseActivity);
-  this.on('mouseup', onMouseUp);
-
-  // Listen for keyboard navigation
-  // Shouldn't need to use inProgress interval because of key repeat
-  this.on('keydown', onMouseActivity);
-  this.on('keyup', onMouseActivity);
-
-  // Consider any touch events that bubble up to be activity
-  // Certain touches on the tech will be blocked from bubbling because they
-  // toggle controls
-  this.on('touchstart', onMouseDown);
-  this.on('touchmove', onMouseActivity);
-  this.on('touchend', onMouseUp);
-  this.on('touchcancel', onMouseUp);
-
-  // Run an interval every 250 milliseconds instead of stuffing everything into
-  // the mousemove/touchmove function itself, to prevent performance degradation.
-  // `this.reportUserActivity` simply sets this.userActivity_ to true, which
-  // then gets picked up by this loop
-  // http://ejohn.org/blog/learning-from-twitter/
-  activityCheck = setInterval(vjs.bind(this, function() {
-    // Check to see if mouse/touch activity has happened
-    if (this.userActivity_) {
-      // Reset the activity tracker
-      this.userActivity_ = false;
-
-      // If the user state was inactive, set the state to active
-      this.userActive(true);
-
-      // Clear any existing inactivity timeout to start the timer over
-      clearTimeout(inactivityTimeout);
-
-      // In X seconds, if no more activity has occurred the user will be
-      // considered inactive
-      inactivityTimeout = setTimeout(vjs.bind(this, function() {
-        // Protect against the case where the inactivityTimeout can trigger just
-        // before the next user activity is picked up by the activityCheck loop
-        // causing a flicker
-        if (!this.userActivity_) {
-          this.userActive(false);
-        }
-      }), 2000);
-    }
-  }), 250);
-
-  // Clean up the intervals when we kill the player
-  this.on('dispose', function(){
-    clearInterval(activityCheck);
-    clearTimeout(inactivityTimeout);
-  });
-};
-
-// Methods to add support for
-// networkState: function(){ return this.techCall('networkState'); },
-// readyState: function(){ return this.techCall('readyState'); },
-// seeking: function(){ return this.techCall('seeking'); },
-// initialTime: function(){ return this.techCall('initialTime'); },
-// startOffsetTime: function(){ return this.techCall('startOffsetTime'); },
-// played: function(){ return this.techCall('played'); },
-// seekable: function(){ return this.techCall('seekable'); },
-// videoTracks: function(){ return this.techCall('videoTracks'); },
-// audioTracks: function(){ return this.techCall('audioTracks'); },
-// videoWidth: function(){ return this.techCall('videoWidth'); },
-// videoHeight: function(){ return this.techCall('videoHeight'); },
-// defaultPlaybackRate: function(){ return this.techCall('defaultPlaybackRate'); },
-// playbackRate: function(){ return this.techCall('playbackRate'); },
-// mediaGroup: function(){ return this.techCall('mediaGroup'); },
-// controller: function(){ return this.techCall('controller'); },
-// defaultMuted: function(){ return this.techCall('defaultMuted'); }
-
-// TODO
-// currentSrcList: the array of sources including other formats and bitrates
-// playList: array of source lists in order of playback
-
-// RequestFullscreen API
-(function(){
-  var prefix, requestFS, div;
-
-  div = document.createElement('div');
-
-  requestFS = {};
-
-  // Current W3C Spec
-  // http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html#api
-  // Mozilla Draft: https://wiki.mozilla.org/Gecko:FullScreenAPI#fullscreenchange_event
-  // New: https://dvcs.w3.org/hg/fullscreen/raw-file/529a67b8d9f3/Overview.html
-  if (div.cancelFullscreen !== undefined) {
-    requestFS.requestFn = 'requestFullscreen';
-    requestFS.cancelFn = 'exitFullscreen';
-    requestFS.eventName = 'fullscreenchange';
-    requestFS.isFullScreen = 'fullScreen';
-
-  // Webkit (Chrome/Safari) and Mozilla (Firefox) have working implementations
-  // that use prefixes and vary slightly from the new W3C spec. Specifically,
-  // using 'exit' instead of 'cancel', and lowercasing the 'S' in Fullscreen.
-  // Other browsers don't have any hints of which version they might follow yet,
-  // so not going to try to predict by looping through all prefixes.
-  } else {
-
-    if (document.mozCancelFullScreen) {
-      prefix = 'moz';
-      requestFS.isFullScreen = prefix + 'FullScreen';
-    } else {
-      prefix = 'webkit';
-      requestFS.isFullScreen = prefix + 'IsFullScreen';
-    }
-
-    if (div[prefix + 'RequestFullScreen']) {
-      requestFS.requestFn = prefix + 'RequestFullScreen';
-      requestFS.cancelFn = prefix + 'CancelFullScreen';
-    }
-    requestFS.eventName = prefix + 'fullscreenchange';
-  }
-
-  if (document[requestFS.cancelFn]) {
-    vjs.support.requestFullScreen = requestFS;
-  }
-
-})();
-
-
-/**
- * Container of main controls
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.ControlBar = vjs.Component.extend();
-
-vjs.ControlBar.prototype.options_ = {
-  loadEvent: 'play',
-  children: {
-    'playToggle': {},
-    'currentTimeDisplay': {},
-    'timeDivider': {},
-    'durationDisplay': {},
-    'remainingTimeDisplay': {},
-    'progressControl': {},
-    'fullscreenToggle': {},
-    'volumeControl': {},
-    'muteToggle': {}
-    // 'volumeMenuButton': {}
-  }
-};
-
-vjs.ControlBar.prototype.createEl = function(){
-  return vjs.createEl('div', {
-    className: 'vjs-control-bar'
-  });
-};
-/**
- * Button to toggle between play and pause
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.PlayToggle = vjs.Button.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Button.call(this, player, options);
-
-    player.on('play', vjs.bind(this, this.onPlay));
-    player.on('pause', vjs.bind(this, this.onPause));
-  }
-});
-
-vjs.PlayToggle.prototype.buttonText = 'Play';
-
-vjs.PlayToggle.prototype.buildCSSClass = function(){
-  return 'vjs-play-control ' + vjs.Button.prototype.buildCSSClass.call(this);
-};
-
-  // OnClick - Toggle between play and pause
-vjs.PlayToggle.prototype.onClick = function(){
-  if (this.player_.paused()) {
-    this.player_.play();
-  } else {
-    this.player_.pause();
-  }
-};
-
-  // OnPlay - Add the vjs-playing class to the element so it can change appearance
-vjs.PlayToggle.prototype.onPlay = function(){
-  vjs.removeClass(this.el_, 'vjs-paused');
-  vjs.addClass(this.el_, 'vjs-playing');
-  this.el_.children[0].children[0].innerHTML = 'Pause'; // change the button text to "Pause"
-};
-
-  // OnPause - Add the vjs-paused class to the element so it can change appearance
-vjs.PlayToggle.prototype.onPause = function(){
-  vjs.removeClass(this.el_, 'vjs-playing');
-  vjs.addClass(this.el_, 'vjs-paused');
-  this.el_.children[0].children[0].innerHTML = 'Play'; // change the button text to "Play"
-};/**
- * Displays the current time
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.CurrentTimeDisplay = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-
-    player.on('timeupdate', vjs.bind(this, this.updateContent));
-  }
-});
-
-vjs.CurrentTimeDisplay.prototype.createEl = function(){
-  var el = vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-current-time vjs-time-controls vjs-control'
-  });
-
-  this.content = vjs.createEl('div', {
-    className: 'vjs-current-time-display',
-    innerHTML: '<span class="vjs-control-text">Current Time </span>' + '0:00', // label the current time for screen reader users
-    'aria-live': 'off' // tell screen readers not to automatically read the time as it changes
-  });
-
-  el.appendChild(vjs.createEl('div').appendChild(this.content));
-  return el;
-};
-
-vjs.CurrentTimeDisplay.prototype.updateContent = function(){
-  // Allows for smooth scrubbing, when player can't keep up.
-  var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
-  this.content.innerHTML = '<span class="vjs-control-text">Current Time </span>' + vjs.formatTime(time, this.player_.duration());
-};
-
-/**
- * Displays the duration
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.DurationDisplay = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-
-    player.on('timeupdate', vjs.bind(this, this.updateContent)); // this might need to be changes to 'durationchange' instead of 'timeupdate' eventually, however the durationchange event fires before this.player_.duration() is set, so the value cannot be written out using this method. Once the order of durationchange and this.player_.duration() being set is figured out, this can be updated.
-  }
-});
-
-vjs.DurationDisplay.prototype.createEl = function(){
-  var el = vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-duration vjs-time-controls vjs-control'
-  });
-
-  this.content = vjs.createEl('div', {
-    className: 'vjs-duration-display',
-    innerHTML: '<span class="vjs-control-text">Duration Time </span>' + '0:00', // label the duration time for screen reader users
-    'aria-live': 'off' // tell screen readers not to automatically read the time as it changes
-  });
-
-  el.appendChild(vjs.createEl('div').appendChild(this.content));
-  return el;
-};
-
-vjs.DurationDisplay.prototype.updateContent = function(){
-  var duration = this.player_.duration();
-  if (duration) {
-      this.content.innerHTML = '<span class="vjs-control-text">Duration Time </span>' + vjs.formatTime(duration); // label the duration time for screen reader users
-  }
-};
-
-/**
- * Time Separator (Not used in main skin, but still available, and could be used as a 'spare element')
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.TimeDivider = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-  }
-});
-
-vjs.TimeDivider.prototype.createEl = function(){
-  return vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-time-divider',
-    innerHTML: '<div><span>/</span></div>'
-  });
-};
-
-/**
- * Displays the time left in the video
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.RemainingTimeDisplay = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-
-    player.on('timeupdate', vjs.bind(this, this.updateContent));
-  }
-});
-
-vjs.RemainingTimeDisplay.prototype.createEl = function(){
-  var el = vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-remaining-time vjs-time-controls vjs-control'
-  });
-
-  this.content = vjs.createEl('div', {
-    className: 'vjs-remaining-time-display',
-    innerHTML: '<span class="vjs-control-text">Remaining Time </span>' + '-0:00', // label the remaining time for screen reader users
-    'aria-live': 'off' // tell screen readers not to automatically read the time as it changes
-  });
-
-  el.appendChild(vjs.createEl('div').appendChild(this.content));
-  return el;
-};
-
-vjs.RemainingTimeDisplay.prototype.updateContent = function(){
-  if (this.player_.duration()) {
-    this.content.innerHTML = '<span class="vjs-control-text">Remaining Time </span>' + '-'+ vjs.formatTime(this.player_.remainingTime());
-  }
-
-  // Allows for smooth scrubbing, when player can't keep up.
-  // var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
-  // this.content.innerHTML = vjs.formatTime(time, this.player_.duration());
-};
-/**
- * Toggle fullscreen video
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.FullscreenToggle = vjs.Button.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Button.call(this, player, options);
-  }
-});
-
-vjs.FullscreenToggle.prototype.buttonText = 'Fullscreen';
-
-vjs.FullscreenToggle.prototype.buildCSSClass = function(){
-  return 'vjs-fullscreen-control ' + vjs.Button.prototype.buildCSSClass.call(this);
-};
-
-vjs.FullscreenToggle.prototype.onClick = function(){
-  if (!this.player_.isFullScreen) {
-    this.player_.requestFullScreen();
-    this.el_.children[0].children[0].innerHTML = 'Non-Fullscreen'; // change the button text to "Non-Fullscreen"
-  } else {
-    this.player_.cancelFullScreen();
-    this.el_.children[0].children[0].innerHTML = 'Fullscreen'; // change the button to "Fullscreen"
-  }
-};/**
- * Seek, Load Progress, and Play Progress
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.ProgressControl = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-  }
-});
-
-vjs.ProgressControl.prototype.options_ = {
-  children: {
-    'seekBar': {}
-  }
-};
-
-vjs.ProgressControl.prototype.createEl = function(){
-  return vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-progress-control vjs-control'
-  });
-};
-
-/**
- * Seek Bar and holder for the progress bars
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.SeekBar = vjs.Slider.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Slider.call(this, player, options);
-    player.on('timeupdate', vjs.bind(this, this.updateARIAAttributes));
-    player.ready(vjs.bind(this, this.updateARIAAttributes));
-  }
-});
-
-vjs.SeekBar.prototype.options_ = {
-  children: {
-    'loadProgressBar': {},
-    'playProgressBar': {},
-    'seekHandle': {}
-  },
-  'barName': 'playProgressBar',
-  'handleName': 'seekHandle'
-};
-
-vjs.SeekBar.prototype.playerEvent = 'timeupdate';
-
-vjs.SeekBar.prototype.createEl = function(){
-  return vjs.Slider.prototype.createEl.call(this, 'div', {
-    className: 'vjs-progress-holder',
-    'aria-label': 'video progress bar'
-  });
-};
-
-vjs.SeekBar.prototype.updateARIAAttributes = function(){
-    // Allows for smooth scrubbing, when player can't keep up.
-    var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
-    this.el_.setAttribute('aria-valuenow',vjs.round(this.getPercent()*100, 2)); // machine readable value of progress bar (percentage complete)
-    this.el_.setAttribute('aria-valuetext',vjs.formatTime(time, this.player_.duration())); // human readable value of progress bar (time complete)
-};
-
-vjs.SeekBar.prototype.getPercent = function(){
-  var currentTime;
-  // Flash RTMP provider will not report the correct time
-  // immediately after a seek. This isn't noticeable if you're
-  // seeking while the video is playing, but it is if you seek
-  // while the video is paused.
-  if (this.player_.techName === 'Flash' && this.player_.seeking()) {
-    var cache = this.player_.getCache();
-    if (cache.lastSetCurrentTime) {
-      currentTime = cache.lastSetCurrentTime;
-    }
-    else {
-      currentTime = this.player_.currentTime();
-    }
-  }
-  else {
-    currentTime = this.player_.currentTime();
-  }
-
-  return currentTime / this.player_.duration();
-};
-
-vjs.SeekBar.prototype.onMouseDown = function(event){
-  vjs.Slider.prototype.onMouseDown.call(this, event);
-
-  this.player_.scrubbing = true;
-
-  this.videoWasPlaying = !this.player_.paused();
-  this.player_.pause();
-};
-
-vjs.SeekBar.prototype.onMouseMove = function(event){
-  var newTime = this.calculateDistance(event) * this.player_.duration();
-
-  // Don't let video end while scrubbing.
-  if (newTime == this.player_.duration()) { newTime = newTime - 0.1; }
-
-  // Set new time (tell player to seek to new time)
-  this.player_.currentTime(newTime);
-};
-
-vjs.SeekBar.prototype.onMouseUp = function(event){
-  vjs.Slider.prototype.onMouseUp.call(this, event);
-
-  this.player_.scrubbing = false;
-  if (this.videoWasPlaying) {
-    this.player_.play();
-  }
-};
-
-vjs.SeekBar.prototype.stepForward = function(){
-  this.player_.currentTime(this.player_.currentTime() + 5); // more quickly fast forward for keyboard-only users
-};
-
-vjs.SeekBar.prototype.stepBack = function(){
-  this.player_.currentTime(this.player_.currentTime() - 5); // more quickly rewind for keyboard-only users
-};
-
-
-/**
- * Shows load progres
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.LoadProgressBar = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-    player.on('progress', vjs.bind(this, this.update));
-  }
-});
-
-vjs.LoadProgressBar.prototype.createEl = function(){
-  return vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-load-progress',
-    innerHTML: '<span class="vjs-control-text">Loaded: 0%</span>'
-  });
-};
-
-vjs.LoadProgressBar.prototype.update = function(){
-  if (this.el_.style) { this.el_.style.width = vjs.round(this.player_.bufferedPercent() * 100, 2) + '%'; }
-};
-
-
-/**
- * Shows play progress
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.PlayProgressBar = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-  }
-});
-
-vjs.PlayProgressBar.prototype.createEl = function(){
-  return vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-play-progress',
-    innerHTML: '<span class="vjs-control-text">Progress: 0%</span>'
-  });
-};
-
-/**
- * SeekBar component includes play progress bar, and seek handle
- * Needed so it can determine seek position based on handle position/size
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.SeekHandle = vjs.SliderHandle.extend();
-
-/** @inheritDoc */
-vjs.SeekHandle.prototype.defaultValue = '00:00';
-
-/** @inheritDoc */
-vjs.SeekHandle.prototype.createEl = function(){
-  return vjs.SliderHandle.prototype.createEl.call(this, 'div', {
-    className: 'vjs-seek-handle'
-  });
-};/**
- * Control the volume
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.VolumeControl = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-
-    // hide volume controls when they're not supported by the current tech
-    if (player.tech && player.tech.features && player.tech.features['volumeControl'] === false) {
-      this.addClass('vjs-hidden');
-    }
-    player.on('loadstart', vjs.bind(this, function(){
-      if (player.tech.features && player.tech.features['volumeControl'] === false) {
-        this.addClass('vjs-hidden');
-      } else {
-        this.removeClass('vjs-hidden');
-      }
-    }));
-  }
-});
-
-vjs.VolumeControl.prototype.options_ = {
-  children: {
-    'volumeBar': {}
-  }
-};
-
-vjs.VolumeControl.prototype.createEl = function(){
-  return vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-volume-control vjs-control'
-  });
-};
-
-/**
- * Contains volume level
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.VolumeBar = vjs.Slider.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Slider.call(this, player, options);
-    player.on('volumechange', vjs.bind(this, this.updateARIAAttributes));
-    player.ready(vjs.bind(this, this.updateARIAAttributes));
-    setTimeout(vjs.bind(this, this.update), 0); // update when elements is in DOM
-  }
-});
-
-vjs.VolumeBar.prototype.updateARIAAttributes = function(){
-  // Current value of volume bar as a percentage
-  this.el_.setAttribute('aria-valuenow',vjs.round(this.player_.volume()*100, 2));
-  this.el_.setAttribute('aria-valuetext',vjs.round(this.player_.volume()*100, 2)+'%');
-};
-
-vjs.VolumeBar.prototype.options_ = {
-  children: {
-    'volumeLevel': {},
-    'volumeHandle': {}
-  },
-  'barName': 'volumeLevel',
-  'handleName': 'volumeHandle'
-};
-
-vjs.VolumeBar.prototype.playerEvent = 'volumechange';
-
-vjs.VolumeBar.prototype.createEl = function(){
-  return vjs.Slider.prototype.createEl.call(this, 'div', {
-    className: 'vjs-volume-bar',
-    'aria-label': 'volume level'
-  });
-};
-
-vjs.VolumeBar.prototype.onMouseMove = function(event) {
-  this.player_.volume(this.calculateDistance(event));
-};
-
-vjs.VolumeBar.prototype.getPercent = function(){
-  if (this.player_.muted()) {
-    return 0;
-  } else {
-    return this.player_.volume();
-  }
-};
-
-vjs.VolumeBar.prototype.stepForward = function(){
-  this.player_.volume(this.player_.volume() + 0.1);
-};
-
-vjs.VolumeBar.prototype.stepBack = function(){
-  this.player_.volume(this.player_.volume() - 0.1);
-};
-
-/**
- * Shows volume level
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.VolumeLevel = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-  }
-});
-
-vjs.VolumeLevel.prototype.createEl = function(){
-  return vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-volume-level',
-    innerHTML: '<span class="vjs-control-text"></span>'
-  });
-};
-
-/**
- * Change volume level
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
- vjs.VolumeHandle = vjs.SliderHandle.extend();
-
- /** @inheritDoc */
- vjs.VolumeHandle.prototype.defaultValue = '00:00';
-
- /** @inheritDoc */
- vjs.VolumeHandle.prototype.createEl = function(){
-   return vjs.SliderHandle.prototype.createEl.call(this, 'div', {
-     className: 'vjs-volume-handle'
-   });
- };
-/**
- * Mute the audio
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.MuteToggle = vjs.Button.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Button.call(this, player, options);
-
-    player.on('volumechange', vjs.bind(this, this.update));
-
-    // hide mute toggle if the current tech doesn't support volume control
-    if (player.tech && player.tech.features && player.tech.features['volumeControl'] === false) {
-      this.addClass('vjs-hidden');
-    }
-    player.on('loadstart', vjs.bind(this, function(){
-      if (player.tech.features && player.tech.features['volumeControl'] === false) {
-        this.addClass('vjs-hidden');
-      } else {
-        this.removeClass('vjs-hidden');
-      }
-    }));
-  }
-});
-
-vjs.MuteToggle.prototype.createEl = function(){
-  return vjs.Button.prototype.createEl.call(this, 'div', {
-    className: 'vjs-mute-control vjs-control',
-    innerHTML: '<div><span class="vjs-control-text">Mute</span></div>'
-  });
-};
-
-vjs.MuteToggle.prototype.onClick = function(){
-  this.player_.muted( this.player_.muted() ? false : true );
-};
-
-vjs.MuteToggle.prototype.update = function(){
-  var vol = this.player_.volume(),
-      level = 3;
-
-  if (vol === 0 || this.player_.muted()) {
-    level = 0;
-  } else if (vol < 0.33) {
-    level = 1;
-  } else if (vol < 0.67) {
-    level = 2;
-  }
-
-  // Don't rewrite the button text if the actual text doesn't change.
-  // This causes unnecessary and confusing information for screen reader users.
-  // This check is needed because this function gets called every time the volume level is changed.
-  if(this.player_.muted()){
-      if(this.el_.children[0].children[0].innerHTML!='Unmute'){
-          this.el_.children[0].children[0].innerHTML = 'Unmute'; // change the button text to "Unmute"
-      }
-  } else {
-      if(this.el_.children[0].children[0].innerHTML!='Mute'){
-          this.el_.children[0].children[0].innerHTML = 'Mute'; // change the button text to "Mute"
-      }
-  }
-
-  /* TODO improve muted icon classes */
-  for (var i = 0; i < 4; i++) {
-    vjs.removeClass(this.el_, 'vjs-vol-'+i);
-  }
-  vjs.addClass(this.el_, 'vjs-vol-'+level);
-};
-/**
- * Menu button with a popup for showing the volume slider.
- * @constructor
- */
-vjs.VolumeMenuButton = vjs.MenuButton.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.MenuButton.call(this, player, options);
-
-    // Same listeners as MuteToggle
-    player.on('volumechange', vjs.bind(this, this.update));
-
-    // hide mute toggle if the current tech doesn't support volume control
-    if (player.tech && player.tech.features && player.tech.features.volumeControl === false) {
-      this.addClass('vjs-hidden');
-    }
-    player.on('loadstart', vjs.bind(this, function(){
-      if (player.tech.features && player.tech.features.volumeControl === false) {
-        this.addClass('vjs-hidden');
-      } else {
-        this.removeClass('vjs-hidden');
-      }
-    }));
-    this.addClass('vjs-menu-button');
-  }
-});
-
-vjs.VolumeMenuButton.prototype.createMenu = function(){
-  var menu = new vjs.Menu(this.player_, {
-    contentElType: 'div'
-  });
-  var vc = new vjs.VolumeBar(this.player_, vjs.obj.merge({vertical: true}, this.options_.volumeBar));
-  menu.addChild(vc);
-  return menu;
-};
-
-vjs.VolumeMenuButton.prototype.onClick = function(){
-  vjs.MuteToggle.prototype.onClick.call(this);
-  vjs.MenuButton.prototype.onClick.call(this);
-};
-
-vjs.VolumeMenuButton.prototype.createEl = function(){
-  return vjs.Button.prototype.createEl.call(this, 'div', {
-    className: 'vjs-volume-menu-button vjs-menu-button vjs-control',
-    innerHTML: '<div><span class="vjs-control-text">Mute</span></div>'
-  });
-};
-vjs.VolumeMenuButton.prototype.update = vjs.MuteToggle.prototype.update;
-/* Poster Image
-================================================================================ */
-/**
- * Poster image. Shows before the video plays.
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.PosterImage = vjs.Button.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Button.call(this, player, options);
-
-    if (!player.poster() || !player.controls()) {
-      this.hide();
-    }
-
-    player.on('play', vjs.bind(this, this.hide));
-  }
-});
-
-vjs.PosterImage.prototype.createEl = function(){
-  var el = vjs.createEl('div', {
-        className: 'vjs-poster',
-
-        // Don't want poster to be tabbable.
-        tabIndex: -1
-      }),
-      poster = this.player_.poster();
-
-  if (poster) {
-    if ('backgroundSize' in el.style) {
-      el.style.backgroundImage = 'url("' + poster + '")';
-    } else {
-      el.appendChild(vjs.createEl('img', { src: poster }));
-    }
-  }
-
-  return el;
-};
-
-vjs.PosterImage.prototype.onClick = function(){
-  // Only accept clicks when controls are enabled
-  if (this.player().controls()) {
-    this.player_.play();
-  }
-};
-/* Loading Spinner
-================================================================================ */
-/**
- * Loading spinner for waiting events
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.LoadingSpinner = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-
-    player.on('canplay', vjs.bind(this, this.hide));
-    player.on('canplaythrough', vjs.bind(this, this.hide));
-    player.on('playing', vjs.bind(this, this.hide));
-    player.on('seeked', vjs.bind(this, this.hide));
-
-    player.on('seeking', vjs.bind(this, this.show));
-
-    // in some browsers seeking does not trigger the 'playing' event,
-    // so we also need to trap 'seeked' if we are going to set a
-    // 'seeking' event
-    player.on('seeked', vjs.bind(this, this.hide));
-
-    player.on('error', vjs.bind(this, this.show));
-
-    // Not showing spinner on stalled any more. Browsers may stall and then not trigger any events that would remove the spinner.
-    // Checked in Chrome 16 and Safari 5.1.2. http://help.videojs.com/discussions/problems/883-why-is-the-download-progress-showing
-    // player.on('stalled', vjs.bind(this, this.show));
-
-    player.on('waiting', vjs.bind(this, this.show));
-  }
-});
-
-vjs.LoadingSpinner.prototype.createEl = function(){
-  return vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-loading-spinner'
-  });
-};
-/* Big Play Button
-================================================================================ */
-/**
- * Initial play button. Shows before the video has played. The hiding of the
- * big play button is done via CSS and player states.
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.BigPlayButton = vjs.Button.extend();
-
-vjs.BigPlayButton.prototype.createEl = function(){
-  return vjs.Button.prototype.createEl.call(this, 'div', {
-    className: 'vjs-big-play-button',
-    innerHTML: '<span></span>',
-    'aria-label': 'play video'
-  });
-};
-
-vjs.BigPlayButton.prototype.onClick = function(){
-  this.player_.play();
-};
-/**
- * @fileoverview Media Technology Controller - Base class for media playback
- * technology controllers like Flash and HTML5
- */
-
-/**
- * Base class for media (HTML5 Video, Flash) controllers
- * @param {vjs.Player|Object} player  Central player instance
- * @param {Object=} options Options object
- * @constructor
- */
-vjs.MediaTechController = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options, ready){
-    vjs.Component.call(this, player, options, ready);
-
-    this.initControlsListeners();
-  }
-});
-
-/**
- * Set up click and touch listeners for the playback element
- * On desktops, a click on the video itself will toggle playback,
- * on a mobile device a click on the video toggles controls.
- * (toggling controls is done by toggling the user state between active and
- * inactive)
- *
- * A tap can signal that a user has become active, or has become inactive
- * e.g. a quick tap on an iPhone movie should reveal the controls. Another
- * quick tap should hide them again (signaling the user is in an inactive
- * viewing state)
- *
- * In addition to this, we still want the user to be considered inactive after
- * a few seconds of inactivity.
- *
- * Note: the only part of iOS interaction we can't mimic with this setup
- * is a touch and hold on the video element counting as activity in order to
- * keep the controls showing, but that shouldn't be an issue. A touch and hold on
- * any controls will still keep the user active
- */
-vjs.MediaTechController.prototype.initControlsListeners = function(){
-  var player, tech, activateControls, deactivateControls;
-
-  tech = this;
-  player = this.player();
-
-  var activateControls = function(){
-    if (player.controls() && !player.usingNativeControls()) {
-      tech.addControlsListeners();
-    }
-  };
-
-  deactivateControls = vjs.bind(tech, tech.removeControlsListeners);
-
-  // Set up event listeners once the tech is ready and has an element to apply
-  // listeners to
-  this.ready(activateControls);
-  player.on('controlsenabled', activateControls);
-  player.on('controlsdisabled', deactivateControls);
-};
-
-vjs.MediaTechController.prototype.addControlsListeners = function(){
-  var preventBubble, userWasActive;
-
-  // Some browsers (Chrome & IE) don't trigger a click on a flash swf, but do
-  // trigger mousedown/up.
-  // http://stackoverflow.com/questions/1444562/javascript-onclick-event-over-flash-object
-  // Any touch events are set to block the mousedown event from happening
-  this.on('mousedown', this.onClick);
-
-  // We need to block touch events on the video element from bubbling up,
-  // otherwise they'll signal activity prematurely. The specific use case is
-  // when the video is playing and the controls have faded out. In this case
-  // only a tap (fast touch) should toggle the user active state and turn the
-  // controls back on. A touch and move or touch and hold should not trigger
-  // the controls (per iOS as an example at least)
-  //
-  // We always want to stop propagation on touchstart because touchstart
-  // at the player level starts the touchInProgress interval. We can still
-  // report activity on the other events, but won't let them bubble for
-  // consistency. We don't want to bubble a touchend without a touchstart.
-  this.on('touchstart', function(event) {
-    // Stop the mouse events from also happening
-    event.preventDefault();
-    event.stopPropagation();
-    // Record if the user was active now so we don't have to keep polling it
-    userWasActive = this.player_.userActive();
-  });
-
-  preventBubble = function(event){
-    event.stopPropagation();
-    if (userWasActive) {
-      this.player_.reportUserActivity();
-    }
-  };
-
-  // Treat all touch events the same for consistency
-  this.on('touchmove', preventBubble);
-  this.on('touchleave', preventBubble);
-  this.on('touchcancel', preventBubble);
-  this.on('touchend', preventBubble);
-
-  // Turn on component tap events
-  this.emitTapEvents();
-
-  // The tap listener needs to come after the touchend listener because the tap
-  // listener cancels out any reportedUserActivity when setting userActive(false)
-  this.on('tap', this.onTap);
-};
-
-/**
- * Remove the listeners used for click and tap controls. This is needed for
- * toggling to controls disabled, where a tap/touch should do nothing.
- */
-vjs.MediaTechController.prototype.removeControlsListeners = function(){
-  // We don't want to just use `this.off()` because there might be other needed
-  // listeners added by techs that extend this.
-  this.off('tap');
-  this.off('touchstart');
-  this.off('touchmove');
-  this.off('touchleave');
-  this.off('touchcancel');
-  this.off('touchend');
-  this.off('click');
-  this.off('mousedown');
-};
-
-/**
- * Handle a click on the media element. By default will play/pause the media.
- */
-vjs.MediaTechController.prototype.onClick = function(event){
-  // We're using mousedown to detect clicks thanks to Flash, but mousedown
-  // will also be triggered with right-clicks, so we need to prevent that
-  if (event.button !== 0) return;
-
-  // When controls are disabled a click should not toggle playback because
-  // the click is considered a control
-  if (this.player().controls()) {
-    if (this.player().paused()) {
-      this.player().play();
-    } else {
-      this.player().pause();
-    }
-  }
-};
-
-/**
- * Handle a tap on the media element. By default it will toggle the user
- * activity state, which hides and shows the controls.
- */
-
-vjs.MediaTechController.prototype.onTap = function(){
-  this.player().userActive(!this.player().userActive());
-};
-
-vjs.MediaTechController.prototype.features = {
-  'volumeControl': true,
-
-  // Resizing plugins using request fullscreen reloads the plugin
-  'fullscreenResize': false,
-
-  // Optional events that we can manually mimic with timers
-  // currently not triggered by video-js-swf
-  'progressEvents': false,
-  'timeupdateEvents': false
-};
-
-vjs.media = {};
-
-/**
- * List of default API methods for any MediaTechController
- * @type {String}
- */
-vjs.media.ApiMethods = 'play,pause,paused,currentTime,setCurrentTime,duration,buffered,volume,setVolume,muted,setMuted,width,height,supportsFullScreen,enterFullScreen,src,load,currentSrc,preload,setPreload,autoplay,setAutoplay,loop,setLoop,error,networkState,readyState,seeking,initialTime,startOffsetTime,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks,defaultPlaybackRate,playbackRate,mediaGroup,controller,controls,defaultMuted'.split(',');
-// Create placeholder methods for each that warn when a method isn't supported by the current playback technology
-
-function createMethod(methodName){
-  return function(){
-    throw new Error('The "'+methodName+'" method is not available on the playback technology\'s API');
-  };
-}
-
-for (var i = vjs.media.ApiMethods.length - 1; i >= 0; i--) {
-  var methodName = vjs.media.ApiMethods[i];
-  vjs.MediaTechController.prototype[vjs.media.ApiMethods[i]] = createMethod(methodName);
-}
-/**
- * @fileoverview HTML5 Media Controller - Wrapper for HTML5 Media API
- */
-
-/**
- * HTML5 Media Controller - Wrapper for HTML5 Media API
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @param {Function=} ready
- * @constructor
- */
-vjs.Html5 = vjs.MediaTechController.extend({
-  /** @constructor */
-  init: function(player, options, ready){
-    // volume cannot be changed from 1 on iOS
-    this.features['volumeControl'] = vjs.Html5.canControlVolume();
-
-    // In iOS, if you move a video element in the DOM, it breaks video playback.
-    this.features['movingMediaElementInDOM'] = !vjs.IS_IOS;
-
-    // HTML video is able to automatically resize when going to fullscreen
-    this.features['fullscreenResize'] = true;
-
-    vjs.MediaTechController.call(this, player, options, ready);
-
-    var source = options['source'];
-
-    // If the element source is already set, we may have missed the loadstart event, and want to trigger it.
-    // We don't want to set the source again and interrupt playback.
-    if (source && this.el_.currentSrc == source.src) {
-      player.trigger('loadstart');
-
-    // Otherwise set the source if one was provided.
-    } else if (source) {
-      this.el_.src = source.src;
-    }
-
-    // Determine if native controls should be used
-    // Our goal should be to get the custom controls on mobile solid everywhere
-    // so we can remove this all together. Right now this will block custom
-    // controls on touch enabled laptops like the Chrome Pixel
-    if (vjs.TOUCH_ENABLED && player.options()['nativeControlsForTouch'] !== false) {
-      this.useNativeControls();
-    }
-
-    // Chrome and Safari both have issues with autoplay.
-    // In Safari (5.1.1), when we move the video element into the container div, autoplay doesn't work.
-    // In Chrome (15), if you have autoplay + a poster + no controls, the video gets hidden (but audio plays)
-    // This fixes both issues. Need to wait for API, so it updates displays correctly
-    player.ready(function(){
-      if (this.tag && this.options_['autoplay'] && this.paused()) {
-        delete this.tag['poster']; // Chrome Fix. Fixed in Chrome v16.
-        this.play();
-      }
-    });
-
-    this.setupTriggers();
-    this.triggerReady();
-  }
-});
-
-vjs.Html5.prototype.dispose = function(){
-  vjs.MediaTechController.prototype.dispose.call(this);
-};
-
-vjs.Html5.prototype.createEl = function(){
-  var player = this.player_,
-      // If possible, reuse original tag for HTML5 playback technology element
-      el = player.tag,
-      newEl;
-
-  // Check if this browser supports moving the element into the box.
-  // On the iPhone video will break if you move the element,
-  // So we have to create a brand new element.
-  if (!el || this.features['movingMediaElementInDOM'] === false) {
-
-    // If the original tag is still there, remove it.
-    if (el) {
-      el['player'] = null;
-      player.tag = null;
-      player.el().removeChild(el);
-      el = el.cloneNode(false);
-    } else {
-      el = vjs.createEl('video', {
-        id:player.id() + '_html5_api',
-        className:'vjs-tech'
-      });
-    }
-    // associate the player with the new tag
-    el['player'] = player;
-
-    vjs.insertFirst(el, player.el());
-  }
-
-  // Update specific tag settings, in case they were overridden
-  var attrs = ['autoplay','preload','loop','muted'];
-  for (var i = attrs.length - 1; i >= 0; i--) {
-    var attr = attrs[i];
-    if (player.options_[attr] !== null) {
-      el[attr] = player.options_[attr];
-    }
-  }
-
-  return el;
-  // jenniisawesome = true;
-};
-
-// Make video events trigger player events
-// May seem verbose here, but makes other APIs possible.
-vjs.Html5.prototype.setupTriggers = function(){
-  for (var i = vjs.Html5.Events.length - 1; i >= 0; i--) {
-    vjs.on(this.el_, vjs.Html5.Events[i], vjs.bind(this.player_, this.eventHandler));
-  }
-};
-// Triggers removed using this.off when disposed
-
-vjs.Html5.prototype.eventHandler = function(e){
-  this.trigger(e);
-
-  // No need for media events to bubble up.
-  e.stopPropagation();
-};
-
-vjs.Html5.prototype.useNativeControls = function(){
-  var tech, player, controlsOn, controlsOff, cleanUp;
-
-  tech = this;
-  player = this.player();
-
-  // If the player controls are enabled turn on the native controls
-  tech.setControls(player.controls());
-
-  // Update the native controls when player controls state is updated
-  controlsOn = function(){
-    tech.setControls(true);
-  };
-  controlsOff = function(){
-    tech.setControls(false);
-  };
-  player.on('controlsenabled', controlsOn);
-  player.on('controlsdisabled', controlsOff);
-
-  // Clean up when not using native controls anymore
-  cleanUp = function(){
-    player.off('controlsenabled', controlsOn);
-    player.off('controlsdisabled', controlsOff);
-  };
-  tech.on('dispose', cleanUp);
-  player.on('usingcustomcontrols', cleanUp);
-
-  // Update the state of the player to using native controls
-  player.usingNativeControls(true);
-};
-
-
-vjs.Html5.prototype.play = function(){ this.el_.play(); };
-vjs.Html5.prototype.pause = function(){ this.el_.pause(); };
-vjs.Html5.prototype.paused = function(){ return this.el_.paused; };
-
-vjs.Html5.prototype.currentTime = function(){ return this.el_.currentTime; };
-vjs.Html5.prototype.setCurrentTime = function(seconds){
-  try {
-    this.el_.currentTime = seconds;
-  } catch(e) {
-    vjs.log(e, 'Video is not ready. (Video.js)');
-    // this.warning(VideoJS.warnings.videoNotReady);
-  }
-};
-
-vjs.Html5.prototype.duration = function(){ return this.el_.duration || 0; };
-vjs.Html5.prototype.buffered = function(){ return this.el_.buffered; };
-
-vjs.Html5.prototype.volume = function(){ return this.el_.volume; };
-vjs.Html5.prototype.setVolume = function(percentAsDecimal){ this.el_.volume = percentAsDecimal; };
-vjs.Html5.prototype.muted = function(){ return this.el_.muted; };
-vjs.Html5.prototype.setMuted = function(muted){ this.el_.muted = muted; };
-
-vjs.Html5.prototype.width = function(){ return this.el_.offsetWidth; };
-vjs.Html5.prototype.height = function(){ return this.el_.offsetHeight; };
-
-vjs.Html5.prototype.supportsFullScreen = function(){
-  if (typeof this.el_.webkitEnterFullScreen == 'function') {
-
-    // Seems to be broken in Chromium/Chrome && Safari in Leopard
-    if (/Android/.test(vjs.USER_AGENT) || !/Chrome|Mac OS X 10.5/.test(vjs.USER_AGENT)) {
-      return true;
-    }
-  }
-  return false;
-};
-
-vjs.Html5.prototype.enterFullScreen = function(){
-  var video = this.el_;
-  if (video.paused && video.networkState <= video.HAVE_METADATA) {
-    // attempt to prime the video element for programmatic access
-    // this isn't necessary on the desktop but shouldn't hurt
-    this.el_.play();
-
-    // playing and pausing synchronously during the transition to fullscreen
-    // can get iOS ~6.1 devices into a play/pause loop
-    setTimeout(function(){
-      video.pause();
-      video.webkitEnterFullScreen();
-    }, 0);
-  } else {
-    video.webkitEnterFullScreen();
-  }
-};
-vjs.Html5.prototype.exitFullScreen = function(){
-  this.el_.webkitExitFullScreen();
-};
-vjs.Html5.prototype.src = function(src){ this.el_.src = src; };
-vjs.Html5.prototype.load = function(){ this.el_.load(); };
-vjs.Html5.prototype.currentSrc = function(){ return this.el_.currentSrc; };
-
-vjs.Html5.prototype.preload = function(){ return this.el_.preload; };
-vjs.Html5.prototype.setPreload = function(val){ this.el_.preload = val; };
-
-vjs.Html5.prototype.autoplay = function(){ return this.el_.autoplay; };
-vjs.Html5.prototype.setAutoplay = function(val){ this.el_.autoplay = val; };
-
-vjs.Html5.prototype.controls = function(){ return this.el_.controls; }
-vjs.Html5.prototype.setControls = function(val){ this.el_.controls = !!val; }
-
-vjs.Html5.prototype.loop = function(){ return this.el_.loop; };
-vjs.Html5.prototype.setLoop = function(val){ this.el_.loop = val; };
-
-vjs.Html5.prototype.error = function(){ return this.el_.error; };
-vjs.Html5.prototype.seeking = function(){ return this.el_.seeking; };
-vjs.Html5.prototype.ended = function(){ return this.el_.ended; };
-vjs.Html5.prototype.defaultMuted = function(){ return this.el_.defaultMuted; };
-
-/* HTML5 Support Testing ---------------------------------------------------- */
-
-vjs.Html5.isSupported = function(){
-  return !!vjs.TEST_VID.canPlayType;
-};
-
-vjs.Html5.canPlaySource = function(srcObj){
-  // IE9 on Windows 7 without MediaPlayer throws an error here
-  // https://github.com/videojs/video.js/issues/519
-  try {
-    return !!vjs.TEST_VID.canPlayType(srcObj.type);
-  } catch(e) {
-    return '';
-  }
-  // TODO: Check Type
-  // If no Type, check ext
-  // Check Media Type
-};
-
-vjs.Html5.canControlVolume = function(){
-  var volume =  vjs.TEST_VID.volume;
-  vjs.TEST_VID.volume = (volume / 2) + 0.1;
-  return volume !== vjs.TEST_VID.volume;
-};
-
-// List of all HTML5 events (various uses).
-vjs.Html5.Events = 'loadstart,suspend,abort,error,emptied,stalled,loadedmetadata,loadeddata,canplay,canplaythrough,playing,waiting,seeking,seeked,ended,durationchange,timeupdate,progress,play,pause,ratechange,volumechange'.split(',');
-
-
-// HTML5 Feature detection and Device Fixes --------------------------------- //
-
-  // Override Android 2.2 and less canPlayType method which is broken
-if (vjs.IS_OLD_ANDROID) {
-  document.createElement('video').constructor.prototype.canPlayType = function(type){
-    return (type && type.toLowerCase().indexOf('video/mp4') != -1) ? 'maybe' : '';
-  };
-}
-/**
- * @fileoverview VideoJS-SWF - Custom Flash Player with HTML5-ish API
- * https://github.com/zencoder/video-js-swf
- * Not using setupTriggers. Using global onEvent func to distribute events
- */
-
-/**
- * HTML5 Media Controller - Wrapper for HTML5 Media API
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @param {Function=} ready
- * @constructor
- */
-vjs.Flash = vjs.MediaTechController.extend({
-  /** @constructor */
-  init: function(player, options, ready){
-    vjs.MediaTechController.call(this, player, options, ready);
-
-    var source = options['source'],
-
-        // Which element to embed in
-        parentEl = options['parentEl'],
-
-        // Create a temporary element to be replaced by swf object
-        placeHolder = this.el_ = vjs.createEl('div', { id: player.id() + '_temp_flash' }),
-
-        // Generate ID for swf object
-        objId = player.id()+'_flash_api',
-
-        // Store player options in local var for optimization
-        // TODO: switch to using player methods instead of options
-        // e.g. player.autoplay();
-        playerOptions = player.options_,
-
-        // Merge default flashvars with ones passed in to init
-        flashVars = vjs.obj.merge({
-
-          // SWF Callback Functions
-          'readyFunction': 'videojs.Flash.onReady',
-          'eventProxyFunction': 'videojs.Flash.onEvent',
-          'errorEventProxyFunction': 'videojs.Flash.onError',
-
-          // Player Settings
-          'autoplay': playerOptions.autoplay,
-          'preload': playerOptions.preload,
-          'loop': playerOptions.loop,
-          'muted': playerOptions.muted
-
-        }, options['flashVars']),
-
-        // Merge default parames with ones passed in
-        params = vjs.obj.merge({
-          'wmode': 'opaque', // Opaque is needed to overlay controls, but can affect playback performance
-          'bgcolor': '#000000' // Using bgcolor prevents a white flash when the object is loading
-        }, options['params']),
-
-        // Merge default attributes with ones passed in
-        attributes = vjs.obj.merge({
-          'id': objId,
-          'name': objId, // Both ID and Name needed or swf to identifty itself
-          'class': 'vjs-tech'
-        }, options['attributes'])
-    ;
-
-    // If source was supplied pass as a flash var.
-    if (source) {
-      if (source.type && vjs.Flash.isStreamingType(source.type)) {
-        var parts = vjs.Flash.streamToParts(source.src);
-        flashVars['rtmpConnection'] = encodeURIComponent(parts.connection);
-        flashVars['rtmpStream'] = encodeURIComponent(parts.stream);
-      }
-      else {
-        flashVars['src'] = encodeURIComponent(vjs.getAbsoluteURL(source.src));
-      }
-    }
-
-    // Add placeholder to player div
-    vjs.insertFirst(placeHolder, parentEl);
-
-    // Having issues with Flash reloading on certain page actions (hide/resize/fullscreen) in certain browsers
-    // This allows resetting the playhead when we catch the reload
-    if (options['startTime']) {
-      this.ready(function(){
-        this.load();
-        this.play();
-        this.currentTime(options['startTime']);
-      });
-    }
-
-    // Flash iFrame Mode
-    // In web browsers there are multiple instances where changing the parent element or visibility of a plugin causes the plugin to reload.
-    // - Firefox just about always. https://bugzilla.mozilla.org/show_bug.cgi?id=90268 (might be fixed by version 13)
-    // - Webkit when hiding the plugin
-    // - Webkit and Firefox when using requestFullScreen on a parent element
-    // Loading the flash plugin into a dynamically generated iFrame gets around most of these issues.
-    // Issues that remain include hiding the element and requestFullScreen in Firefox specifically
-
-    // There's on particularly annoying issue with this method which is that Firefox throws a security error on an offsite Flash object loaded into a dynamically created iFrame.
-    // Even though the iframe was inserted into a page on the web, Firefox + Flash considers it a local app trying to access an internet file.
-    // I tried mulitple ways of setting the iframe src attribute but couldn't find a src that worked well. Tried a real/fake source, in/out of domain.
-    // Also tried a method from stackoverflow that caused a security error in all browsers. http://stackoverflow.com/questions/2486901/how-to-set-document-domain-for-a-dynamically-generated-iframe
-    // In the end the solution I found to work was setting the iframe window.location.href right before doing a document.write of the Flash object.
-    // The only downside of this it seems to trigger another http request to the original page (no matter what's put in the href). Not sure why that is.
-
-    // NOTE (2012-01-29): Cannot get Firefox to load the remote hosted SWF into a dynamically created iFrame
-    // Firefox 9 throws a security error, unleess you call location.href right before doc.write.
-    //    Not sure why that even works, but it causes the browser to look like it's continuously trying to load the page.
-    // Firefox 3.6 keeps calling the iframe onload function anytime I write to it, causing an endless loop.
-
-    if (options['iFrameMode'] === true && !vjs.IS_FIREFOX) {
-
-      // Create iFrame with vjs-tech class so it's 100% width/height
-      var iFrm = vjs.createEl('iframe', {
-        'id': objId + '_iframe',
-        'name': objId + '_iframe',
-        'className': 'vjs-tech',
-        'scrolling': 'no',
-        'marginWidth': 0,
-        'marginHeight': 0,
-        'frameBorder': 0
-      });
-
-      // Update ready function names in flash vars for iframe window
-      flashVars['readyFunction'] = 'ready';
-      flashVars['eventProxyFunction'] = 'events';
-      flashVars['errorEventProxyFunction'] = 'errors';
-
-      // Tried multiple methods to get this to work in all browsers
-
-      // Tried embedding the flash object in the page first, and then adding a place holder to the iframe, then replacing the placeholder with the page object.
-      // The goal here was to try to load the swf URL in the parent page first and hope that got around the firefox security error
-      // var newObj = vjs.Flash.embed(options['swf'], placeHolder, flashVars, params, attributes);
-      // (in onload)
-      //  var temp = vjs.createEl('a', { id:'asdf', innerHTML: 'asdf' } );
-      //  iDoc.body.appendChild(temp);
-
-      // Tried embedding the flash object through javascript in the iframe source.
-      // This works in webkit but still triggers the firefox security error
-      // iFrm.src = 'javascript: document.write('"+vjs.Flash.getEmbedCode(options['swf'], flashVars, params, attributes)+"');";
-
-      // Tried an actual local iframe just to make sure that works, but it kills the easiness of the CDN version if you require the user to host an iframe
-      // We should add an option to host the iframe locally though, because it could help a lot of issues.
-      // iFrm.src = "iframe.html";
-
-      // Wait until iFrame has loaded to write into it.
-      vjs.on(iFrm, 'load', vjs.bind(this, function(){
-
-        var iDoc,
-            iWin = iFrm.contentWindow;
-
-        // The one working method I found was to use the iframe's document.write() to create the swf object
-        // This got around the security issue in all browsers except firefox.
-        // I did find a hack where if I call the iframe's window.location.href='', it would get around the security error
-        // However, the main page would look like it was loading indefinitely (URL bar loading spinner would never stop)
-        // Plus Firefox 3.6 didn't work no matter what I tried.
-        // if (vjs.USER_AGENT.match('Firefox')) {
-        //   iWin.location.href = '';
-        // }
-
-        // Get the iFrame's document depending on what the browser supports
-        iDoc = iFrm.contentDocument ? iFrm.contentDocument : iFrm.contentWindow.document;
-
-        // Tried ensuring both document domains were the same, but they already were, so that wasn't the issue.
-        // Even tried adding /. that was mentioned in a browser security writeup
-        // document.domain = document.domain+'/.';
-        // iDoc.domain = document.domain+'/.';
-
-        // Tried adding the object to the iframe doc's innerHTML. Security error in all browsers.
-        // iDoc.body.innerHTML = swfObjectHTML;
-
-        // Tried appending the object to the iframe doc's body. Security error in all browsers.
-        // iDoc.body.appendChild(swfObject);
-
-        // Using document.write actually got around the security error that browsers were throwing.
-        // Again, it's a dynamically generated (same domain) iframe, loading an external Flash swf.
-        // Not sure why that's a security issue, but apparently it is.
-        iDoc.write(vjs.Flash.getEmbedCode(options['swf'], flashVars, params, attributes));
-
-        // Setting variables on the window needs to come after the doc write because otherwise they can get reset in some browsers
-        // So far no issues with swf ready event being called before it's set on the window.
-        iWin['player'] = this.player_;
-
-        // Create swf ready function for iFrame window
-        iWin['ready'] = vjs.bind(this.player_, function(currSwf){
-          var el = iDoc.getElementById(currSwf),
-              player = this,
-              tech = player.tech;
-
-          // Update reference to playback technology element
-          tech.el_ = el;
-
-          // Make sure swf is actually ready. Sometimes the API isn't actually yet.
-          vjs.Flash.checkReady(tech);
-        });
-
-        // Create event listener for all swf events
-        iWin['events'] = vjs.bind(this.player_, function(swfID, eventName){
-          var player = this;
-          if (player && player.techName === 'flash') {
-            player.trigger(eventName);
-          }
-        });
-
-        // Create error listener for all swf errors
-        iWin['errors'] = vjs.bind(this.player_, function(swfID, eventName){
-          vjs.log('Flash Error', eventName);
-        });
-
-      }));
-
-      // Replace placeholder with iFrame (it will load now)
-      placeHolder.parentNode.replaceChild(iFrm, placeHolder);
-
-    // If not using iFrame mode, embed as normal object
-    } else {
-      vjs.Flash.embed(options['swf'], placeHolder, flashVars, params, attributes);
-    }
-  }
-});
-
-vjs.Flash.prototype.dispose = function(){
-  vjs.MediaTechController.prototype.dispose.call(this);
-};
-
-vjs.Flash.prototype.play = function(){
-  this.el_.vjs_play();
-};
-
-vjs.Flash.prototype.pause = function(){
-  this.el_.vjs_pause();
-};
-
-vjs.Flash.prototype.src = function(src){
-  if (vjs.Flash.isStreamingSrc(src)) {
-    src = vjs.Flash.streamToParts(src);
-    this.setRtmpConnection(src.connection);
-    this.setRtmpStream(src.stream);
-  }
-  else {
-    // Make sure source URL is abosolute.
-    src = vjs.getAbsoluteURL(src);
-    this.el_.vjs_src(src);
-  }
-
-  // Currently the SWF doesn't autoplay if you load a source later.
-  // e.g. Load player w/ no source, wait 2s, set src.
-  if (this.player_.autoplay()) {
-    var tech = this;
-    setTimeout(function(){ tech.play(); }, 0);
-  }
-};
-
-vjs.Flash.prototype.currentSrc = function(){
-  var src = this.el_.vjs_getProperty('currentSrc');
-  // no src, check and see if RTMP
-  if (src == null) {
-    var connection = this.rtmpConnection(),
-        stream = this.rtmpStream();
-
-    if (connection && stream) {
-      src = vjs.Flash.streamFromParts(connection, stream);
-    }
-  }
-  return src;
-};
-
-vjs.Flash.prototype.load = function(){
-  this.el_.vjs_load();
-};
-
-vjs.Flash.prototype.poster = function(){
-  this.el_.vjs_getProperty('poster');
-};
-
-vjs.Flash.prototype.buffered = function(){
-  return vjs.createTimeRange(0, this.el_.vjs_getProperty('buffered'));
-};
-
-vjs.Flash.prototype.supportsFullScreen = function(){
-  return false; // Flash does not allow fullscreen through javascript
-};
-
-vjs.Flash.prototype.enterFullScreen = function(){
-  return false;
-};
-
-
-// Create setters and getters for attributes
-var api = vjs.Flash.prototype,
-    readWrite = 'rtmpConnection,rtmpStream,preload,currentTime,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted'.split(','),
-    readOnly = 'error,currentSrc,networkState,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks'.split(',');
-    // Overridden: buffered
-
-/**
- * @this {*}
- */
-var createSetter = function(attr){
-  var attrUpper = attr.charAt(0).toUpperCase() + attr.slice(1);
-  api['set'+attrUpper] = function(val){ return this.el_.vjs_setProperty(attr, val); };
-};
-
-/**
- * @this {*}
- */
-var createGetter = function(attr){
-  api[attr] = function(){ return this.el_.vjs_getProperty(attr); };
-};
-
-(function(){
-  var i;
-  // Create getter and setters for all read/write attributes
-  for (i = 0; i < readWrite.length; i++) {
-    createGetter(readWrite[i]);
-    createSetter(readWrite[i]);
-  }
-
-  // Create getters for read-only attributes
-  for (i = 0; i < readOnly.length; i++) {
-    createGetter(readOnly[i]);
-  }
-})();
-
-/* Flash Support Testing -------------------------------------------------------- */
-
-vjs.Flash.isSupported = function(){
-  return vjs.Flash.version()[0] >= 10;
-  // return swfobject.hasFlashPlayerVersion('10');
-};
-
-vjs.Flash.canPlaySource = function(srcObj){
-  if (srcObj.type in vjs.Flash.formats || srcObj.type in vjs.Flash.streamingFormats) { return 'maybe'; }
-};
-
-vjs.Flash.formats = {
-  'video/flv': 'FLV',
-  'video/x-flv': 'FLV',
-  'video/mp4': 'MP4',
-  'video/m4v': 'MP4'
-};
-
-vjs.Flash.streamingFormats = {
-  'rtmp/mp4': 'MP4',
-  'rtmp/flv': 'FLV'
-};
-
-vjs.Flash['onReady'] = function(currSwf){
-  var el = vjs.el(currSwf);
-
-  // Get player from box
-  // On firefox reloads, el might already have a player
-  var player = el['player'] || el.parentNode['player'],
-      tech = player.tech;
-
-  // Reference player on tech element
-  el['player'] = player;
-
-  // Update reference to playback technology element
-  tech.el_ = el;
-
-  vjs.Flash.checkReady(tech);
-};
-
-// The SWF isn't alwasy ready when it says it is. Sometimes the API functions still need to be added to the object.
-// If it's not ready, we set a timeout to check again shortly.
-vjs.Flash.checkReady = function(tech){
-
-  // Check if API property exists
-  if (tech.el().vjs_getProperty) {
-
-    // If so, tell tech it's ready
-    tech.triggerReady();
-
-  // Otherwise wait longer.
-  } else {
-
-    setTimeout(function(){
-      vjs.Flash.checkReady(tech);
-    }, 50);
-
-  }
-};
-
-// Trigger events from the swf on the player
-vjs.Flash['onEvent'] = function(swfID, eventName){
-  var player = vjs.el(swfID)['player'];
-  player.trigger(eventName);
-};
-
-// Log errors from the swf
-vjs.Flash['onError'] = function(swfID, err){
-  var player = vjs.el(swfID)['player'];
-  player.trigger('error');
-  vjs.log('Flash Error', err, swfID);
-};
-
-// Flash Version Check
-vjs.Flash.version = function(){
-  var version = '0,0,0';
-
-  // IE
-  try {
-    version = new window.ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version').replace(/\D+/g, ',').match(/^,?(.+),?$/)[1];
-
-  // other browsers
-  } catch(e) {
-    try {
-      if (navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin){
-        version = (navigator.plugins['Shockwave Flash 2.0'] || navigator.plugins['Shockwave Flash']).description.replace(/\D+/g, ',').match(/^,?(.+),?$/)[1];
-      }
-    } catch(err) {}
-  }
-  return version.split(',');
-};
-
-// Flash embedding method. Only used in non-iframe mode
-vjs.Flash.embed = function(swf, placeHolder, flashVars, params, attributes){
-  var code = vjs.Flash.getEmbedCode(swf, flashVars, params, attributes),
-
-      // Get element by embedding code and retrieving created element
-      obj = vjs.createEl('div', { innerHTML: code }).childNodes[0],
-
-      par = placeHolder.parentNode
-  ;
-
-  placeHolder.parentNode.replaceChild(obj, placeHolder);
-
-  // IE6 seems to have an issue where it won't initialize the swf object after injecting it.
-  // This is a dumb fix
-  var newObj = par.childNodes[0];
-  setTimeout(function(){
-    newObj.style.display = 'block';
-  }, 1000);
-
-  return obj;
-
-};
-
-vjs.Flash.getEmbedCode = function(swf, flashVars, params, attributes){
-
-  var objTag = '<object type="application/x-shockwave-flash"',
-      flashVarsString = '',
-      paramsString = '',
-      attrsString = '';
-
-  // Convert flash vars to string
-  if (flashVars) {
-    vjs.obj.each(flashVars, function(key, val){
-      flashVarsString += (key + '=' + val + '&amp;');
-    });
-  }
-
-  // Add swf, flashVars, and other default params
-  params = vjs.obj.merge({
-    'movie': swf,
-    'flashvars': flashVarsString,
-    'allowScriptAccess': 'always', // Required to talk to swf
-    'allowNetworking': 'all' // All should be default, but having security issues.
-  }, params);
-
-  // Create param tags string
-  vjs.obj.each(params, function(key, val){
-    paramsString += '<param name="'+key+'" value="'+val+'" />';
-  });
-
-  attributes = vjs.obj.merge({
-    // Add swf to attributes (need both for IE and Others to work)
-    'data': swf,
-
-    // Default to 100% width/height
-    'width': '100%',
-    'height': '100%'
-
-  }, attributes);
-
-  // Create Attributes string
-  vjs.obj.each(attributes, function(key, val){
-    attrsString += (key + '="' + val + '" ');
-  });
-
-  return objTag + attrsString + '>' + paramsString + '</object>';
-};
-
-vjs.Flash.streamFromParts = function(connection, stream) {
-  return connection + '&' + stream;
-};
-
-vjs.Flash.streamToParts = function(src) {
-  var parts = {
-    connection: '',
-    stream: ''
-  };
-
-  if (! src) {
-    return parts;
-  }
-
-  // Look for the normal URL separator we expect, '&'.
-  // If found, we split the URL into two pieces around the
-  // first '&'.
-  var connEnd = src.indexOf('&');
-  var streamBegin;
-  if (connEnd !== -1) {
-    streamBegin = connEnd + 1;
-  }
-  else {
-    // If there's not a '&', we use the last '/' as the delimiter.
-    connEnd = streamBegin = src.lastIndexOf('/') + 1;
-    if (connEnd === 0) {
-      // really, there's not a '/'?
-      connEnd = streamBegin = src.length;
-    }
-  }
-  parts.connection = src.substring(0, connEnd);
-  parts.stream = src.substring(streamBegin, src.length);
-
-  return parts;
-};
-
-vjs.Flash.isStreamingType = function(srcType) {
-  return srcType in vjs.Flash.streamingFormats;
-};
-
-// RTMP has four variations, any string starting
-// with one of these protocols should be valid
-vjs.Flash.RTMP_RE = /^rtmp[set]?:\/\//i;
-
-vjs.Flash.isStreamingSrc = function(src) {
-  return vjs.Flash.RTMP_RE.test(src);
-};
-/**
- * @constructor
- */
-vjs.MediaLoader = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options, ready){
-    vjs.Component.call(this, player, options, ready);
-
-    // If there are no sources when the player is initialized,
-    // load the first supported playback technology.
-    if (!player.options_['sources'] || player.options_['sources'].length === 0) {
-      for (var i=0,j=player.options_['techOrder']; i<j.length; i++) {
-        var techName = vjs.capitalize(j[i]),
-            tech = window['videojs'][techName];
-
-        // Check if the browser supports this technology
-        if (tech && tech.isSupported()) {
-          player.loadTech(techName);
-          break;
-        }
-      }
-    } else {
-      // // Loop through playback technologies (HTML5, Flash) and check for support.
-      // // Then load the best source.
-      // // A few assumptions here:
-      // //   All playback technologies respect preload false.
-      player.src(player.options_['sources']);
-    }
-  }
-});/**
- * @fileoverview Text Tracks
- * Text tracks are tracks of timed text events.
- * Captions - text displayed over the video for the hearing impared
- * Subtitles - text displayed over the video for those who don't understand langauge in the video
- * Chapters - text displayed in a menu allowing the user to jump to particular points (chapters) in the video
- * Descriptions (not supported yet) - audio descriptions that are read back to the user by a screen reading device
- */
-
-// Player Additions - Functions add to the player object for easier access to tracks
-
-/**
- * List of associated text tracks
- * @type {Array}
- * @private
- */
-vjs.Player.prototype.textTracks_;
-
-/**
- * Get an array of associated text tracks. captions, subtitles, chapters, descriptions
- * http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-texttracks
- * @return {Array}           Array of track objects
- */
-vjs.Player.prototype.textTracks = function(){
-  this.textTracks_ = this.textTracks_ || [];
-  return this.textTracks_;
-};
-
-/**
- * Add a text track
- * In addition to the W3C settings we allow adding additional info through options.
- * http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-addtexttrack
- * @param {String}  kind        Captions, subtitles, chapters, descriptions, or metadata
- * @param {String=} label       Optional label
- * @param {String=} language    Optional language
- * @param {Object=} options     Additional track options, like src
- */
-vjs.Player.prototype.addTextTrack = function(kind, label, language, options){
-  var tracks = this.textTracks_ = this.textTracks_ || [];
-  options = options || {};
-
-  options['kind'] = kind;
-  options['label'] = label;
-  options['language'] = language;
-
-  // HTML5 Spec says default to subtitles.
-  // Uppercase first letter to match class names
-  var Kind = vjs.capitalize(kind || 'subtitles');
-
-  // Create correct texttrack class. CaptionsTrack, etc.
-  var track = new window['videojs'][Kind + 'Track'](this, options);
-
-  tracks.push(track);
-
-  // If track.dflt() is set, start showing immediately
-  // TODO: Add a process to deterime the best track to show for the specific kind
-  // Incase there are mulitple defaulted tracks of the same kind
-  // Or the user has a set preference of a specific language that should override the default
-  // if (track.dflt()) {
-  //   this.ready(vjs.bind(track, track.show));
-  // }
-
-  return track;
-};
-
-/**
- * Add an array of text tracks. captions, subtitles, chapters, descriptions
- * Track objects will be stored in the player.textTracks() array
- * @param {Array} trackList Array of track elements or objects (fake track elements)
- */
-vjs.Player.prototype.addTextTracks = function(trackList){
-  var trackObj;
-
-  for (var i = 0; i < trackList.length; i++) {
-    trackObj = trackList[i];
-    this.addTextTrack(trackObj['kind'], trackObj['label'], trackObj['language'], trackObj);
-  }
-
-  return this;
-};
-
-// Show a text track
-// disableSameKind: disable all other tracks of the same kind. Value should be a track kind (captions, etc.)
-vjs.Player.prototype.showTextTrack = function(id, disableSameKind){
-  var tracks = this.textTracks_,
-      i = 0,
-      j = tracks.length,
-      track, showTrack, kind;
-
-  // Find Track with same ID
-  for (;i<j;i++) {
-    track = tracks[i];
-    if (track.id() === id) {
-      track.show();
-      showTrack = track;
-
-    // Disable tracks of the same kind
-    } else if (disableSameKind && track.kind() == disableSameKind && track.mode() > 0) {
-      track.disable();
-    }
-  }
-
-  // Get track kind from shown track or disableSameKind
-  kind = (showTrack) ? showTrack.kind() : ((disableSameKind) ? disableSameKind : false);
-
-  // Trigger trackchange event, captionstrackchange, subtitlestrackchange, etc.
-  if (kind) {
-    this.trigger(kind+'trackchange');
-  }
-
-  return this;
-};
-
-/**
- * Track Class
- * Contains track methods for loading, showing, parsing cues of tracks
- * @param {vjs.Player|Object} player
- * @param {Object=} options
- * @constructor
- */
-vjs.TextTrack = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.Component.call(this, player, options);
-
-    // Apply track info to track object
-    // Options will often be a track element
-
-    // Build ID if one doesn't exist
-    this.id_ = options['id'] || ('vjs_' + options['kind'] + '_' + options['language'] + '_' + vjs.guid++);
-    this.src_ = options['src'];
-    // 'default' is a reserved keyword in js so we use an abbreviated version
-    this.dflt_ = options['default'] || options['dflt'];
-    this.title_ = options['title'];
-    this.language_ = options['srclang'];
-    this.label_ = options['label'];
-    this.cues_ = [];
-    this.activeCues_ = [];
-    this.readyState_ = 0;
-    this.mode_ = 0;
-
-    this.player_.on('fullscreenchange', vjs.bind(this, this.adjustFontSize));
-  }
-});
-
-/**
- * Track kind value. Captions, subtitles, etc.
- * @private
- */
-vjs.TextTrack.prototype.kind_;
-
-/**
- * Get the track kind value
- * @return {String}
- */
-vjs.TextTrack.prototype.kind = function(){
-  return this.kind_;
-};
-
-/**
- * Track src value
- * @private
- */
-vjs.TextTrack.prototype.src_;
-
-/**
- * Get the track src value
- * @return {String}
- */
-vjs.TextTrack.prototype.src = function(){
-  return this.src_;
-};
-
-/**
- * Track default value
- * If default is used, subtitles/captions to start showing
- * @private
- */
-vjs.TextTrack.prototype.dflt_;
-
-/**
- * Get the track default value
- * 'default' is a reserved keyword
- * @return {Boolean}
- */
-vjs.TextTrack.prototype.dflt = function(){
-  return this.dflt_;
-};
-
-/**
- * Track title value
- * @private
- */
-vjs.TextTrack.prototype.title_;
-
-/**
- * Get the track title value
- * @return {String}
- */
-vjs.TextTrack.prototype.title = function(){
-  return this.title_;
-};
-
-/**
- * Language - two letter string to represent track language, e.g. 'en' for English
- * Spec def: readonly attribute DOMString language;
- * @private
- */
-vjs.TextTrack.prototype.language_;
-
-/**
- * Get the track language value
- * @return {String}
- */
-vjs.TextTrack.prototype.language = function(){
-  return this.language_;
-};
-
-/**
- * Track label e.g. 'English'
- * Spec def: readonly attribute DOMString label;
- * @private
- */
-vjs.TextTrack.prototype.label_;
-
-/**
- * Get the track label value
- * @return {String}
- */
-vjs.TextTrack.prototype.label = function(){
-  return this.label_;
-};
-
-/**
- * All cues of the track. Cues have a startTime, endTime, text, and other properties.
- * Spec def: readonly attribute TextTrackCueList cues;
- * @private
- */
-vjs.TextTrack.prototype.cues_;
-
-/**
- * Get the track cues
- * @return {Array}
- */
-vjs.TextTrack.prototype.cues = function(){
-  return this.cues_;
-};
-
-/**
- * ActiveCues is all cues that are currently showing
- * Spec def: readonly attribute TextTrackCueList activeCues;
- * @private
- */
-vjs.TextTrack.prototype.activeCues_;
-
-/**
- * Get the track active cues
- * @return {Array}
- */
-vjs.TextTrack.prototype.activeCues = function(){
-  return this.activeCues_;
-};
-
-/**
- * ReadyState describes if the text file has been loaded
- * const unsigned short NONE = 0;
- * const unsigned short LOADING = 1;
- * const unsigned short LOADED = 2;
- * const unsigned short ERROR = 3;
- * readonly attribute unsigned short readyState;
- * @private
- */
-vjs.TextTrack.prototype.readyState_;
-
-/**
- * Get the track readyState
- * @return {Number}
- */
-vjs.TextTrack.prototype.readyState = function(){
-  return this.readyState_;
-};
-
-/**
- * Mode describes if the track is showing, hidden, or disabled
- * const unsigned short OFF = 0;
- * const unsigned short HIDDEN = 1; (still triggering cuechange events, but not visible)
- * const unsigned short SHOWING = 2;
- * attribute unsigned short mode;
- * @private
- */
-vjs.TextTrack.prototype.mode_;
-
-/**
- * Get the track mode
- * @return {Number}
- */
-vjs.TextTrack.prototype.mode = function(){
-  return this.mode_;
-};
-
-/**
- * Change the font size of the text track to make it larger when playing in fullscreen mode
- * and restore it to its normal size when not in fullscreen mode.
- */
-vjs.TextTrack.prototype.adjustFontSize = function(){
-    if (this.player_.isFullScreen) {
-        // Scale the font by the same factor as increasing the video width to the full screen window width.
-        // Additionally, multiply that factor by 1.4, which is the default font size for
-        // the caption track (from the CSS)
-        this.el_.style.fontSize = screen.width / this.player_.width() * 1.4 * 100 + '%';
-    } else {
-        // Change the font size of the text track back to its original non-fullscreen size
-        this.el_.style.fontSize = '';
-    }
-};
-
-/**
- * Create basic div to hold cue text
- * @return {Element}
- */
-vjs.TextTrack.prototype.createEl = function(){
-  return vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-' + this.kind_ + ' vjs-text-track'
-  });
-};
-
-/**
- * Show: Mode Showing (2)
- * Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
- * The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
- * In addition, for text tracks whose kind is subtitles or captions, the cues are being displayed over the video as appropriate;
- * for text tracks whose kind is descriptions, the user agent is making the cues available to the user in a non-visual fashion;
- * and for text tracks whose kind is chapters, the user agent is making available to the user a mechanism by which the user can navigate to any point in the media resource by selecting a cue.
- * The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute.
- * This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences.
- */
-vjs.TextTrack.prototype.show = function(){
-  this.activate();
-
-  this.mode_ = 2;
-
-  // Show element.
-  vjs.Component.prototype.show.call(this);
-};
-
-/**
- * Hide: Mode Hidden (1)
- * Indicates that the text track is active, but that the user agent is not actively displaying the cues.
- * If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
- * The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
- */
-vjs.TextTrack.prototype.hide = function(){
-  // When hidden, cues are still triggered. Disable to stop triggering.
-  this.activate();
-
-  this.mode_ = 1;
-
-  // Hide element.
-  vjs.Component.prototype.hide.call(this);
-};
-
-/**
- * Disable: Mode Off/Disable (0)
- * Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track.
- * No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues.
- */
-vjs.TextTrack.prototype.disable = function(){
-  // If showing, hide.
-  if (this.mode_ == 2) { this.hide(); }
-
-  // Stop triggering cues
-  this.deactivate();
-
-  // Switch Mode to Off
-  this.mode_ = 0;
-};
-
-/**
- * Turn on cue tracking. Tracks that are showing OR hidden are active.
- */
-vjs.TextTrack.prototype.activate = function(){
-  // Load text file if it hasn't been yet.
-  if (this.readyState_ === 0) { this.load(); }
-
-  // Only activate if not already active.
-  if (this.mode_ === 0) {
-    // Update current cue on timeupdate
-    // Using unique ID for bind function so other tracks don't remove listener
-    this.player_.on('timeupdate', vjs.bind(this, this.update, this.id_));
-
-    // Reset cue time on media end
-    this.player_.on('ended', vjs.bind(this, this.reset, this.id_));
-
-    // Add to display
-    if (this.kind_ === 'captions' || this.kind_ === 'subtitles') {
-      this.player_.getChild('textTrackDisplay').addChild(this);
-    }
-  }
-};
-
-/**
- * Turn off cue tracking.
- */
-vjs.TextTrack.prototype.deactivate = function(){
-  // Using unique ID for bind function so other tracks don't remove listener
-  this.player_.off('timeupdate', vjs.bind(this, this.update, this.id_));
-  this.player_.off('ended', vjs.bind(this, this.reset, this.id_));
-  this.reset(); // Reset
-
-  // Remove from display
-  this.player_.getChild('textTrackDisplay').removeChild(this);
-};
-
-// A readiness state
-// One of the following:
-//
-// Not loaded
-// Indicates that the text track is known to exist (e.g. it has been declared with a track element), but its cues have not been obtained.
-//
-// Loading
-// Indicates that the text track is loading and there have been no fatal errors encountered so far. Further cues might still be added to the track.
-//
-// Loaded
-// Indicates that the text track has been loaded with no fatal errors. No new cues will be added to the track except if the text track corresponds to a MutableTextTrack object.
-//
-// Failed to load
-// Indicates that the text track was enabled, but when the user agent attempted to obtain it, this failed in some way (e.g. URL could not be resolved, network error, unknown text track format). Some or all of the cues are likely missing and will not be obtained.
-vjs.TextTrack.prototype.load = function(){
-
-  // Only load if not loaded yet.
-  if (this.readyState_ === 0) {
-    this.readyState_ = 1;
-    vjs.get(this.src_, vjs.bind(this, this.parseCues), vjs.bind(this, this.onError));
-  }
-
-};
-
-vjs.TextTrack.prototype.onError = function(err){
-  this.error = err;
-  this.readyState_ = 3;
-  this.trigger('error');
-};
-
-// Parse the WebVTT text format for cue times.
-// TODO: Separate parser into own class so alternative timed text formats can be used. (TTML, DFXP)
-vjs.TextTrack.prototype.parseCues = function(srcContent) {
-  var cue, time, text,
-      lines = srcContent.split('\n'),
-      line = '', id;
-
-  for (var i=1, j=lines.length; i<j; i++) {
-    // Line 0 should be 'WEBVTT', so skipping i=0
-
-    line = vjs.trim(lines[i]); // Trim whitespace and linebreaks
-
-    if (line) { // Loop until a line with content
-
-      // First line could be an optional cue ID
-      // Check if line has the time separator
-      if (line.indexOf('-->') == -1) {
-        id = line;
-        // Advance to next line for timing.
-        line = vjs.trim(lines[++i]);
-      } else {
-        id = this.cues_.length;
-      }
-
-      // First line - Number
-      cue = {
-        id: id, // Cue Number
-        index: this.cues_.length // Position in Array
-      };
-
-      // Timing line
-      time = line.split(' --> ');
-      cue.startTime = this.parseCueTime(time[0]);
-      cue.endTime = this.parseCueTime(time[1]);
-
-      // Additional lines - Cue Text
-      text = [];
-
-      // Loop until a blank line or end of lines
-      // Assumeing trim('') returns false for blank lines
-      while (lines[++i] && (line = vjs.trim(lines[i]))) {
-        text.push(line);
-      }
-
-      cue.text = text.join('<br/>');
-
-      // Add this cue
-      this.cues_.push(cue);
-    }
-  }
-
-  this.readyState_ = 2;
-  this.trigger('loaded');
-};
-
-
-vjs.TextTrack.prototype.parseCueTime = function(timeText) {
-  var parts = timeText.split(':'),
-      time = 0,
-      hours, minutes, other, seconds, ms;
-
-  // Check if optional hours place is included
-  // 00:00:00.000 vs. 00:00.000
-  if (parts.length == 3) {
-    hours = parts[0];
-    minutes = parts[1];
-    other = parts[2];
-  } else {
-    hours = 0;
-    minutes = parts[0];
-    other = parts[1];
-  }
-
-  // Break other (seconds, milliseconds, and flags) by spaces
-  // TODO: Make additional cue layout settings work with flags
-  other = other.split(/\s+/);
-  // Remove seconds. Seconds is the first part before any spaces.
-  seconds = other.splice(0,1)[0];
-  // Could use either . or , for decimal
-  seconds = seconds.split(/\.|,/);
-  // Get milliseconds
-  ms = parseFloat(seconds[1]);
-  seconds = seconds[0];
-
-  // hours => seconds
-  time += parseFloat(hours) * 3600;
-  // minutes => seconds
-  time += parseFloat(minutes) * 60;
-  // Add seconds
-  time += parseFloat(seconds);
-  // Add milliseconds
-  if (ms) { time += ms/1000; }
-
-  return time;
-};
-
-// Update active cues whenever timeupdate events are triggered on the player.
-vjs.TextTrack.prototype.update = function(){
-  if (this.cues_.length > 0) {
-
-    // Get curent player time
-    var time = this.player_.currentTime();
-
-    // Check if the new time is outside the time box created by the the last update.
-    if (this.prevChange === undefined || time < this.prevChange || this.nextChange <= time) {
-      var cues = this.cues_,
-
-          // Create a new time box for this state.
-          newNextChange = this.player_.duration(), // Start at beginning of the timeline
-          newPrevChange = 0, // Start at end
-
-          reverse = false, // Set the direction of the loop through the cues. Optimized the cue check.
-          newCues = [], // Store new active cues.
-
-          // Store where in the loop the current active cues are, to provide a smart starting point for the next loop.
-          firstActiveIndex, lastActiveIndex,
-          cue, i; // Loop vars
-
-      // Check if time is going forwards or backwards (scrubbing/rewinding)
-      // If we know the direction we can optimize the starting position and direction of the loop through the cues array.
-      if (time >= this.nextChange || this.nextChange === undefined) { // NextChange should happen
-        // Forwards, so start at the index of the first active cue and loop forward
-        i = (this.firstActiveIndex !== undefined) ? this.firstActiveIndex : 0;
-      } else {
-        // Backwards, so start at the index of the last active cue and loop backward
-        reverse = true;
-        i = (this.lastActiveIndex !== undefined) ? this.lastActiveIndex : cues.length - 1;
-      }
-
-      while (true) { // Loop until broken
-        cue = cues[i];
-
-        // Cue ended at this point
-        if (cue.endTime <= time) {
-          newPrevChange = Math.max(newPrevChange, cue.endTime);
-
-          if (cue.active) {
-            cue.active = false;
-          }
-
-          // No earlier cues should have an active start time.
-          // Nevermind. Assume first cue could have a duration the same as the video.
-          // In that case we need to loop all the way back to the beginning.
-          // if (reverse && cue.startTime) { break; }
-
-        // Cue hasn't started
-        } else if (time < cue.startTime) {
-          newNextChange = Math.min(newNextChange, cue.startTime);
-
-          if (cue.active) {
-            cue.active = false;
-          }
-
-          // No later cues should have an active start time.
-          if (!reverse) { break; }
-
-        // Cue is current
-        } else {
-
-          if (reverse) {
-            // Add cue to front of array to keep in time order
-            newCues.splice(0,0,cue);
-
-            // If in reverse, the first current cue is our lastActiveCue
-            if (lastActiveIndex === undefined) { lastActiveIndex = i; }
-            firstActiveIndex = i;
-          } else {
-            // Add cue to end of array
-            newCues.push(cue);
-
-            // If forward, the first current cue is our firstActiveIndex
-            if (firstActiveIndex === undefined) { firstActiveIndex = i; }
-            lastActiveIndex = i;
-          }
-
-          newNextChange = Math.min(newNextChange, cue.endTime);
-          newPrevChange = Math.max(newPrevChange, cue.startTime);
-
-          cue.active = true;
-        }
-
-        if (reverse) {
-          // Reverse down the array of cues, break if at first
-          if (i === 0) { break; } else { i--; }
-        } else {
-          // Walk up the array fo cues, break if at last
-          if (i === cues.length - 1) { break; } else { i++; }
-        }
-
-      }
-
-      this.activeCues_ = newCues;
-      this.nextChange = newNextChange;
-      this.prevChange = newPrevChange;
-      this.firstActiveIndex = firstActiveIndex;
-      this.lastActiveIndex = lastActiveIndex;
-
-      this.updateDisplay();
-
-      this.trigger('cuechange');
-    }
-  }
-};
-
-// Add cue HTML to display
-vjs.TextTrack.prototype.updateDisplay = function(){
-  var cues = this.activeCues_,
-      html = '',
-      i=0,j=cues.length;
-
-  for (;i<j;i++) {
-    html += '<span class="vjs-tt-cue">'+cues[i].text+'</span>';
-  }
-
-  this.el_.innerHTML = html;
-};
-
-// Set all loop helper values back
-vjs.TextTrack.prototype.reset = function(){
-  this.nextChange = 0;
-  this.prevChange = this.player_.duration();
-  this.firstActiveIndex = 0;
-  this.lastActiveIndex = 0;
-};
-
-// Create specific track types
-/**
- * @constructor
- */
-vjs.CaptionsTrack = vjs.TextTrack.extend();
-vjs.CaptionsTrack.prototype.kind_ = 'captions';
-// Exporting here because Track creation requires the track kind
-// to be available on global object. e.g. new window['videojs'][Kind + 'Track']
-
-/**
- * @constructor
- */
-vjs.SubtitlesTrack = vjs.TextTrack.extend();
-vjs.SubtitlesTrack.prototype.kind_ = 'subtitles';
-
-/**
- * @constructor
- */
-vjs.ChaptersTrack = vjs.TextTrack.extend();
-vjs.ChaptersTrack.prototype.kind_ = 'chapters';
-
-
-/* Text Track Display
-============================================================================= */
-// Global container for both subtitle and captions text. Simple div container.
-
-/**
- * @constructor
- */
-vjs.TextTrackDisplay = vjs.Component.extend({
-  /** @constructor */
-  init: function(player, options, ready){
-    vjs.Component.call(this, player, options, ready);
-
-    // This used to be called during player init, but was causing an error
-    // if a track should show by default and the display hadn't loaded yet.
-    // Should probably be moved to an external track loader when we support
-    // tracks that don't need a display.
-    if (player.options_['tracks'] && player.options_['tracks'].length > 0) {
-      this.player_.addTextTracks(player.options_['tracks']);
-    }
-  }
-});
-
-vjs.TextTrackDisplay.prototype.createEl = function(){
-  return vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-text-track-display'
-  });
-};
-
-
-/* Text Track Menu Items
-============================================================================= */
-/**
- * @constructor
- */
-vjs.TextTrackMenuItem = vjs.MenuItem.extend({
-  /** @constructor */
-  init: function(player, options){
-    var track = this.track = options['track'];
-
-    // Modify options for parent MenuItem class's init.
-    options['label'] = track.label();
-    options['selected'] = track.dflt();
-    vjs.MenuItem.call(this, player, options);
-
-    this.player_.on(track.kind() + 'trackchange', vjs.bind(this, this.update));
-  }
-});
-
-vjs.TextTrackMenuItem.prototype.onClick = function(){
-  vjs.MenuItem.prototype.onClick.call(this);
-  this.player_.showTextTrack(this.track.id_, this.track.kind());
-};
-
-vjs.TextTrackMenuItem.prototype.update = function(){
-  this.selected(this.track.mode() == 2);
-};
-
-/**
- * @constructor
- */
-vjs.OffTextTrackMenuItem = vjs.TextTrackMenuItem.extend({
-  /** @constructor */
-  init: function(player, options){
-    // Create pseudo track info
-    // Requires options['kind']
-    options['track'] = {
-      kind: function() { return options['kind']; },
-      player: player,
-      label: function(){ return options['kind'] + ' off'; },
-      dflt: function(){ return false; },
-      mode: function(){ return false; }
-    };
-    vjs.TextTrackMenuItem.call(this, player, options);
-    this.selected(true);
-  }
-});
-
-vjs.OffTextTrackMenuItem.prototype.onClick = function(){
-  vjs.TextTrackMenuItem.prototype.onClick.call(this);
-  this.player_.showTextTrack(this.track.id_, this.track.kind());
-};
-
-vjs.OffTextTrackMenuItem.prototype.update = function(){
-  var tracks = this.player_.textTracks(),
-      i=0, j=tracks.length, track,
-      off = true;
-
-  for (;i<j;i++) {
-    track = tracks[i];
-    if (track.kind() == this.track.kind() && track.mode() == 2) {
-      off = false;
-    }
-  }
-
-  this.selected(off);
-};
-
-/* Captions Button
-================================================================================ */
-/**
- * @constructor
- */
-vjs.TextTrackButton = vjs.MenuButton.extend({
-  /** @constructor */
-  init: function(player, options){
-    vjs.MenuButton.call(this, player, options);
-
-    if (this.items.length <= 1) {
-      this.hide();
-    }
-  }
-});
-
-// vjs.TextTrackButton.prototype.buttonPressed = false;
-
-// vjs.TextTrackButton.prototype.createMenu = function(){
-//   var menu = new vjs.Menu(this.player_);
-
-//   // Add a title list item to the top
-//   // menu.el().appendChild(vjs.createEl('li', {
-//   //   className: 'vjs-menu-title',
-//   //   innerHTML: vjs.capitalize(this.kind_),
-//   //   tabindex: -1
-//   // }));
-
-//   this.items = this.createItems();
-
-//   // Add menu items to the menu
-//   for (var i = 0; i < this.items.length; i++) {
-//     menu.addItem(this.items[i]);
-//   }
-
-//   // Add list to element
-//   this.addChild(menu);
-
-//   return menu;
-// };
-
-// Create a menu item for each text track
-vjs.TextTrackButton.prototype.createItems = function(){
-  var items = [], track;
-
-  // Add an OFF menu item to turn all tracks off
-  items.push(new vjs.OffTextTrackMenuItem(this.player_, { 'kind': this.kind_ }));
-
-  for (var i = 0; i < this.player_.textTracks().length; i++) {
-    track = this.player_.textTracks()[i];
-    if (track.kind() === this.kind_) {
-      items.push(new vjs.TextTrackMenuItem(this.player_, {
-        'track': track
-      }));
-    }
-  }
-
-  return items;
-};
-
-/**
- * @constructor
- */
-vjs.CaptionsButton = vjs.TextTrackButton.extend({
-  /** @constructor */
-  init: function(player, options, ready){
-    vjs.TextTrackButton.call(this, player, options, ready);
-    this.el_.setAttribute('aria-label','Captions Menu');
-  }
-});
-vjs.CaptionsButton.prototype.kind_ = 'captions';
-vjs.CaptionsButton.prototype.buttonText = 'Captions';
-vjs.CaptionsButton.prototype.className = 'vjs-captions-button';
-
-/**
- * @constructor
- */
-vjs.SubtitlesButton = vjs.TextTrackButton.extend({
-  /** @constructor */
-  init: function(player, options, ready){
-    vjs.TextTrackButton.call(this, player, options, ready);
-    this.el_.setAttribute('aria-label','Subtitles Menu');
-  }
-});
-vjs.SubtitlesButton.prototype.kind_ = 'subtitles';
-vjs.SubtitlesButton.prototype.buttonText = 'Subtitles';
-vjs.SubtitlesButton.prototype.className = 'vjs-subtitles-button';
-
-// Chapters act much differently than other text tracks
-// Cues are navigation vs. other tracks of alternative languages
-/**
- * @constructor
- */
-vjs.ChaptersButton = vjs.TextTrackButton.extend({
-  /** @constructor */
-  init: function(player, options, ready){
-    vjs.TextTrackButton.call(this, player, options, ready);
-    this.el_.setAttribute('aria-label','Chapters Menu');
-  }
-});
-vjs.ChaptersButton.prototype.kind_ = 'chapters';
-vjs.ChaptersButton.prototype.buttonText = 'Chapters';
-vjs.ChaptersButton.prototype.className = 'vjs-chapters-button';
-
-// Create a menu item for each text track
-vjs.ChaptersButton.prototype.createItems = function(){
-  var items = [], track;
-
-  for (var i = 0; i < this.player_.textTracks().length; i++) {
-    track = this.player_.textTracks()[i];
-    if (track.kind() === this.kind_) {
-      items.push(new vjs.TextTrackMenuItem(this.player_, {
-        'track': track
-      }));
-    }
-  }
-
-  return items;
-};
-
-vjs.ChaptersButton.prototype.createMenu = function(){
-  var tracks = this.player_.textTracks(),
-      i = 0,
-      j = tracks.length,
-      track, chaptersTrack,
-      items = this.items = [];
-
-  for (;i<j;i++) {
-    track = tracks[i];
-    if (track.kind() == this.kind_ && track.dflt()) {
-      if (track.readyState() < 2) {
-        this.chaptersTrack = track;
-        track.on('loaded', vjs.bind(this, this.createMenu));
-        return;
-      } else {
-        chaptersTrack = track;
-        break;
-      }
-    }
-  }
-
-  var menu = this.menu = new vjs.Menu(this.player_);
-
-  menu.el_.appendChild(vjs.createEl('li', {
-    className: 'vjs-menu-title',
-    innerHTML: vjs.capitalize(this.kind_),
-    tabindex: -1
-  }));
-
-  if (chaptersTrack) {
-    var cues = chaptersTrack.cues_, cue, mi;
-    i = 0;
-    j = cues.length;
-
-    for (;i<j;i++) {
-      cue = cues[i];
-
-      mi = new vjs.ChaptersTrackMenuItem(this.player_, {
-        'track': chaptersTrack,
-        'cue': cue
-      });
-
-      items.push(mi);
-
-      menu.addChild(mi);
-    }
-  }
-
-  if (this.items.length > 0) {
-    this.show();
-  }
-
-  return menu;
-};
-
-
-/**
- * @constructor
- */
-vjs.ChaptersTrackMenuItem = vjs.MenuItem.extend({
-  /** @constructor */
-  init: function(player, options){
-    var track = this.track = options['track'],
-        cue = this.cue = options['cue'],
-        currentTime = player.currentTime();
-
-    // Modify options for parent MenuItem class's init.
-    options['label'] = cue.text;
-    options['selected'] = (cue.startTime <= currentTime && currentTime < cue.endTime);
-    vjs.MenuItem.call(this, player, options);
-
-    track.on('cuechange', vjs.bind(this, this.update));
-  }
-});
-
-vjs.ChaptersTrackMenuItem.prototype.onClick = function(){
-  vjs.MenuItem.prototype.onClick.call(this);
-  this.player_.currentTime(this.cue.startTime);
-  this.update(this.cue.startTime);
-};
-
-vjs.ChaptersTrackMenuItem.prototype.update = function(){
-  var cue = this.cue,
-      currentTime = this.player_.currentTime();
-
-  // vjs.log(currentTime, cue.startTime);
-  this.selected(cue.startTime <= currentTime && currentTime < cue.endTime);
-};
-
-// Add Buttons to controlBar
-vjs.obj.merge(vjs.ControlBar.prototype.options_['children'], {
-  'subtitlesButton': {},
-  'captionsButton': {},
-  'chaptersButton': {}
-});
-
-// vjs.Cue = vjs.Component.extend({
-//   /** @constructor */
-//   init: function(player, options){
-//     vjs.Component.call(this, player, options);
-//   }
-// });
-/**
- * @fileoverview Add JSON support
- * @suppress {undefinedVars}
- * (Compiler doesn't like JSON not being declared)
- */
-
-/**
- * Javascript JSON implementation
- * (Parse Method Only)
- * https://github.com/douglascrockford/JSON-js/blob/master/json2.js
- * Only using for parse method when parsing data-setup attribute JSON.
- * @type {Object}
- * @suppress {undefinedVars}
- */
-vjs.JSON;
-
-/**
- * @suppress {undefinedVars}
- */
-if (typeof window.JSON !== 'undefined' && window.JSON.parse === 'function') {
-  vjs.JSON = window.JSON;
-
-} else {
-  vjs.JSON = {};
-
-  var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
-
-  vjs.JSON.parse = function (text, reviver) {
-      var j;
-
-      function walk(holder, key) {
-          var k, v, value = holder[key];
-          if (value && typeof value === 'object') {
-              for (k in value) {
-                  if (Object.prototype.hasOwnProperty.call(value, k)) {
-                      v = walk(value, k);
-                      if (v !== undefined) {
-                          value[k] = v;
-                      } else {
-                          delete value[k];
-                      }
-                  }
-              }
-          }
-          return reviver.call(holder, key, value);
-      }
-      text = String(text);
-      cx.lastIndex = 0;
-      if (cx.test(text)) {
-          text = text.replace(cx, function (a) {
-              return '\\u' +
-                  ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-          });
-      }
-
-      if (/^[\],:{}\s]*$/
-              .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
-                  .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
-                  .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-          j = eval('(' + text + ')');
-
-          return typeof reviver === 'function' ?
-              walk({'': j}, '') : j;
-      }
-
-      throw new SyntaxError('JSON.parse(): invalid or malformed JSON data');
-  };
-}
-/**
- * @fileoverview Functions for automatically setting up a player
- * based on the data-setup attribute of the video tag
- */
-
-// Automatically set up any tags that have a data-setup attribute
-vjs.autoSetup = function(){
-  var options, vid, player,
-      vids = document.getElementsByTagName('video');
-
-  // Check if any media elements exist
-  if (vids && vids.length > 0) {
-
-    for (var i=0,j=vids.length; i<j; i++) {
-      vid = vids[i];
-
-      // Check if element exists, has getAttribute func.
-      // IE seems to consider typeof el.getAttribute == 'object' instead of 'function' like expected, at least when loading the player immediately.
-      if (vid && vid.getAttribute) {
-
-        // Make sure this player hasn't already been set up.
-        if (vid['player'] === undefined) {
-          options = vid.getAttribute('data-setup');
-
-          // Check if data-setup attr exists.
-          // We only auto-setup if they've added the data-setup attr.
-          if (options !== null) {
-
-            // Parse options JSON
-            // If empty string, make it a parsable json object.
-            options = vjs.JSON.parse(options || '{}');
-
-            // Create new video.js instance.
-            player = videojs(vid, options);
-          }
-        }
-
-      // If getAttribute isn't defined, we need to wait for the DOM.
-      } else {
-        vjs.autoSetupTimeout(1);
-        break;
-      }
-    }
-
-  // No videos were found, so keep looping unless page is finisehd loading.
-  } else if (!vjs.windowLoaded) {
-    vjs.autoSetupTimeout(1);
-  }
-};
-
-// Pause to let the DOM keep processing
-vjs.autoSetupTimeout = function(wait){
-  setTimeout(vjs.autoSetup, wait);
-};
-
-if (document.readyState === 'complete') {
-  vjs.windowLoaded = true;
-} else {
-  vjs.one(window, 'load', function(){
-    vjs.windowLoaded = true;
-  });
-}
-
-// Run Auto-load players
-// You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version)
-vjs.autoSetupTimeout(1);
-vjs.plugin = function(name, init){
-  vjs.Player.prototype[name] = init;
-};
diff --git a/extlib/video-js/video.js b/extlib/video-js/video.js
deleted file mode 100644
index 8c2621d6..00000000
--- a/extlib/video-js/video.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*! Video.js v4.2.1 Copyright 2013 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ (function() {var b=void 0,f=!0,j=null,l=!1;function m(){return function(){}}function p(a){return function(){return this[a]}}function q(a){return function(){return a}}var t;document.createElement("video");document.createElement("audio");document.createElement("track");function u(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(u.wa[a])return u.wa[a];a=u.v(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new u.w(a,c,d)}var v=u;
-window.Qd=window.Rd=u;u.Rb="4.2";u.Bc="https:"==document.location.protocol?"https://":"http://";u.options={techOrder:["html5","flash"],html5:{},flash:{},width:300,height:150,defaultVolume:0,children:{mediaLoader:{},posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{}},notSupportedMessage:'Sorry, no compatible source and playback technology were found for this video. Try using another browser like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'};
-"GENERATED_CDN_VSN"!==u.Rb&&(v.options.flash.swf=u.Bc+"vjs.zencdn.net/"+u.Rb+"/video-js.swf");u.wa={};u.ka=u.CoreObject=m();u.ka.extend=function(a){var c,d;a=a||{};c=a.init||a.i||this.prototype.init||this.prototype.i||m();d=function(){c.apply(this,arguments)};d.prototype=u.k.create(this.prototype);d.prototype.constructor=d;d.extend=u.ka.extend;d.create=u.ka.create;for(var e in a)a.hasOwnProperty(e)&&(d.prototype[e]=a[e]);return d};
-u.ka.create=function(){var a=u.k.create(this.prototype);this.apply(a,arguments);return a};u.d=function(a,c,d){var e=u.getData(a);e.z||(e.z={});e.z[c]||(e.z[c]=[]);d.s||(d.s=u.s++);e.z[c].push(d);e.W||(e.disabled=l,e.W=function(c){if(!e.disabled){c=u.gc(c);var d=e.z[c.type];if(d)for(var d=d.slice(0),k=0,r=d.length;k<r&&!c.lc();k++)d[k].call(a,c)}});1==e.z[c].length&&(document.addEventListener?a.addEventListener(c,e.W,l):document.attachEvent&&a.attachEvent("on"+c,e.W))};
-u.n=function(a,c,d){if(u.kc(a)){var e=u.getData(a);if(e.z)if(c){var g=e.z[c];if(g){if(d){if(d.s)for(e=0;e<g.length;e++)g[e].s===d.s&&g.splice(e--,1)}else e.z[c]=[];u.dc(a,c)}}else for(g in e.z)c=g,e.z[c]=[],u.dc(a,c)}};u.dc=function(a,c){var d=u.getData(a);0===d.z[c].length&&(delete d.z[c],document.removeEventListener?a.removeEventListener(c,d.W,l):document.detachEvent&&a.detachEvent("on"+c,d.W));u.Ab(d.z)&&(delete d.z,delete d.W,delete d.disabled);u.Ab(d)&&u.qc(a)};
-u.gc=function(a){function c(){return f}function d(){return l}if(!a||!a.Bb){var e=a||window.event;a={};for(var g in e)"layerX"!==g&&"layerY"!==g&&(a[g]=e[g]);a.target||(a.target=a.srcElement||document);a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;a.preventDefault=function(){e.preventDefault&&e.preventDefault();a.returnValue=l;a.zb=c};a.zb=d;a.stopPropagation=function(){e.stopPropagation&&e.stopPropagation();a.cancelBubble=f;a.Bb=c};a.Bb=d;a.stopImmediatePropagation=function(){e.stopImmediatePropagation&&
-e.stopImmediatePropagation();a.lc=c;a.stopPropagation()};a.lc=d;if(a.clientX!=j){g=document.documentElement;var h=document.body;a.pageX=a.clientX+(g&&g.scrollLeft||h&&h.scrollLeft||0)-(g&&g.clientLeft||h&&h.clientLeft||0);a.pageY=a.clientY+(g&&g.scrollTop||h&&h.scrollTop||0)-(g&&g.clientTop||h&&h.clientTop||0)}a.which=a.charCode||a.keyCode;a.button!=j&&(a.button=a.button&1?0:a.button&4?1:a.button&2?2:0)}return a};
-u.j=function(a,c){var d=u.kc(a)?u.getData(a):{},e=a.parentNode||a.ownerDocument;"string"===typeof c&&(c={type:c,target:a});c=u.gc(c);d.W&&d.W.call(a,c);if(e&&!c.Bb()&&c.bubbles!==l)u.j(e,c);else if(!e&&!c.zb()&&(d=u.getData(c.target),c.target[c.type])){d.disabled=f;if("function"===typeof c.target[c.type])c.target[c.type]();d.disabled=l}return!c.zb()};u.U=function(a,c,d){function e(){u.n(a,c,e);d.apply(this,arguments)}e.s=d.s=d.s||u.s++;u.d(a,c,e)};var w=Object.prototype.hasOwnProperty;
-u.e=function(a,c){var d,e;d=document.createElement(a||"div");for(e in c)w.call(c,e)&&(-1!==e.indexOf("aria-")||"role"==e?d.setAttribute(e,c[e]):d[e]=c[e]);return d};u.$=function(a){return a.charAt(0).toUpperCase()+a.slice(1)};u.k={};u.k.create=Object.create||function(a){function c(){}c.prototype=a;return new c};u.k.ta=function(a,c,d){for(var e in a)w.call(a,e)&&c.call(d||this,e,a[e])};u.k.B=function(a,c){if(!c)return a;for(var d in c)w.call(c,d)&&(a[d]=c[d]);return a};
-u.k.fc=function(a,c){var d,e,g;a=u.k.copy(a);for(d in c)w.call(c,d)&&(e=a[d],g=c[d],a[d]=u.k.mc(e)&&u.k.mc(g)?u.k.fc(e,g):c[d]);return a};u.k.copy=function(a){return u.k.B({},a)};u.k.mc=function(a){return!!a&&"object"===typeof a&&"[object Object]"===a.toString()&&a.constructor===Object};u.bind=function(a,c,d){function e(){return c.apply(a,arguments)}c.s||(c.s=u.s++);e.s=d?d+"_"+c.s:c.s;return e};u.qa={};u.s=1;u.expando="vdata"+(new Date).getTime();
-u.getData=function(a){var c=a[u.expando];c||(c=a[u.expando]=u.s++,u.qa[c]={});return u.qa[c]};u.kc=function(a){a=a[u.expando];return!(!a||u.Ab(u.qa[a]))};u.qc=function(a){var c=a[u.expando];if(c){delete u.qa[c];try{delete a[u.expando]}catch(d){a.removeAttribute?a.removeAttribute(u.expando):a[u.expando]=j}}};u.Ab=function(a){for(var c in a)if(a[c]!==j)return l;return f};u.m=function(a,c){-1==(" "+a.className+" ").indexOf(" "+c+" ")&&(a.className=""===a.className?c:a.className+" "+c)};
-u.t=function(a,c){var d,e;if(-1!=a.className.indexOf(c)){d=a.className.split(" ");for(e=d.length-1;0<=e;e--)d[e]===c&&d.splice(e,1);a.className=d.join(" ")}};u.ma=u.e("video");u.G=navigator.userAgent;u.Hc=/iPhone/i.test(u.G);u.Gc=/iPad/i.test(u.G);u.Ic=/iPod/i.test(u.G);u.Fc=u.Hc||u.Gc||u.Ic;var aa=u,x;var y=u.G.match(/OS (\d+)_/i);x=y&&y[1]?y[1]:b;aa.Cd=x;u.Dc=/Android/i.test(u.G);var ba=u,z;var A=u.G.match(/Android (\d+)(?:\.(\d+))?(?:\.(\d+))*/i),B,C;
-A?(B=A[1]&&parseFloat(A[1]),C=A[2]&&parseFloat(A[2]),z=B&&C?parseFloat(A[1]+"."+A[2]):B?B:j):z=j;ba.Cc=z;u.Jc=u.Dc&&/webkit/i.test(u.G)&&2.3>u.Cc;u.Ec=/Firefox/i.test(u.G);u.Dd=/Chrome/i.test(u.G);u.Mc="ontouchstart"in window;u.wb=function(a){var c,d,e,g;c={};if(a&&a.attributes&&0<a.attributes.length){d=a.attributes;for(var h=d.length-1;0<=h;h--){e=d[h].name;g=d[h].value;if("boolean"===typeof a[e]||-1!==",autoplay,controls,loop,muted,default,".indexOf(","+e+","))g=g!==j?f:l;c[e]=g}}return c};
-u.Hd=function(a,c){var d="";document.defaultView&&document.defaultView.getComputedStyle?d=document.defaultView.getComputedStyle(a,"").getPropertyValue(c):a.currentStyle&&(d=a["client"+c.substr(0,1).toUpperCase()+c.substr(1)]+"px");return d};u.yb=function(a,c){c.firstChild?c.insertBefore(a,c.firstChild):c.appendChild(a)};u.Nb={};u.v=function(a){0===a.indexOf("#")&&(a=a.slice(1));return document.getElementById(a)};
-u.Ka=function(a,c){c=c||a;var d=Math.floor(a%60),e=Math.floor(a/60%60),g=Math.floor(a/3600),h=Math.floor(c/60%60),k=Math.floor(c/3600);if(isNaN(a)||Infinity===a)g=e=d="-";g=0<g||0<k?g+":":"";return g+(((g||10<=h)&&10>e?"0"+e:e)+":")+(10>d?"0"+d:d)};u.Pc=function(){document.body.focus();document.onselectstart=q(l)};u.yd=function(){document.onselectstart=q(f)};u.trim=function(a){return(a+"").replace(/^\s+|\s+$/g,"")};u.round=function(a,c){c||(c=0);return Math.round(a*Math.pow(10,c))/Math.pow(10,c)};
-u.sb=function(a,c){return{length:1,start:function(){return a},end:function(){return c}}};
-u.get=function(a,c,d){var e,g;"undefined"===typeof XMLHttpRequest&&(window.XMLHttpRequest=function(){try{return new window.ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(a){}try{return new window.ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(c){}try{return new window.ActiveXObject("Msxml2.XMLHTTP")}catch(d){}throw Error("This browser does not support XMLHttpRequest.");});g=new XMLHttpRequest;try{g.open("GET",a)}catch(h){d(h)}e=0===a.indexOf("file:")||0===window.location.href.indexOf("file:")&&-1===a.indexOf("http");
-g.onreadystatechange=function(){4===g.readyState&&(200===g.status||e&&0===g.status?c(g.responseText):d&&d())};try{g.send()}catch(k){d&&d(k)}};u.qd=function(a){try{var c=window.localStorage||l;c&&(c.volume=a)}catch(d){22==d.code||1014==d.code?u.log("LocalStorage Full (VideoJS)",d):18==d.code?u.log("LocalStorage not allowed (VideoJS)",d):u.log("LocalStorage Error (VideoJS)",d)}};u.ic=function(a){a.match(/^https?:\/\//)||(a=u.e("div",{innerHTML:'<a href="'+a+'">x</a>'}).firstChild.href);return a};
-u.log=function(){u.log.history=u.log.history||[];u.log.history.push(arguments);window.console&&window.console.log(Array.prototype.slice.call(arguments))};u.Xc=function(a){var c,d;a.getBoundingClientRect&&a.parentNode&&(c=a.getBoundingClientRect());if(!c)return{left:0,top:0};a=document.documentElement;d=document.body;return{left:c.left+(window.pageXOffset||d.scrollLeft)-(a.clientLeft||d.clientLeft||0),top:c.top+(window.pageYOffset||d.scrollTop)-(a.clientTop||d.clientTop||0)}};
-u.c=u.ka.extend({i:function(a,c,d){this.b=a;this.g=u.k.copy(this.g);c=this.options(c);this.Q=c.id||(c.el&&c.el.id?c.el.id:a.id()+"_component_"+u.s++);this.cd=c.name||j;this.a=c.el||this.e();this.H=[];this.pb={};this.V={};if((a=this.g)&&a.children){var e=this;u.k.ta(a.children,function(a,c){c!==l&&!c.loadEvent&&(e[a]=e.Z(a,c))})}this.M(d)}});t=u.c.prototype;
-t.D=function(){this.j("dispose");if(this.H)for(var a=this.H.length-1;0<=a;a--)this.H[a].D&&this.H[a].D();this.V=this.pb=this.H=j;this.n();this.a.parentNode&&this.a.parentNode.removeChild(this.a);u.qc(this.a);this.a=j};t.L=p("b");t.options=function(a){return a===b?this.g:this.g=u.k.fc(this.g,a)};t.e=function(a,c){return u.e(a,c)};t.v=p("a");t.id=p("Q");t.name=p("cd");t.children=p("H");
-t.Z=function(a,c){var d,e;"string"===typeof a?(e=a,c=c||{},d=c.componentClass||u.$(e),c.name=e,d=new window.videojs[d](this.b||this,c)):d=a;this.H.push(d);"function"===typeof d.id&&(this.pb[d.id()]=d);(e=e||d.name&&d.name())&&(this.V[e]=d);"function"===typeof d.el&&d.el()&&(this.ra||this.a).appendChild(d.el());return d};
-t.removeChild=function(a){"string"===typeof a&&(a=this.V[a]);if(a&&this.H){for(var c=l,d=this.H.length-1;0<=d;d--)if(this.H[d]===a){c=f;this.H.splice(d,1);break}c&&(this.pb[a.id]=j,this.V[a.name]=j,(c=a.v())&&c.parentNode===(this.ra||this.a)&&(this.ra||this.a).removeChild(a.v()))}};t.T=q("");t.d=function(a,c){u.d(this.a,a,u.bind(this,c));return this};t.n=function(a,c){u.n(this.a,a,c);return this};t.U=function(a,c){u.U(this.a,a,u.bind(this,c));return this};t.j=function(a,c){u.j(this.a,a,c);return this};
-t.M=function(a){a&&(this.aa?a.call(this):(this.Ra===b&&(this.Ra=[]),this.Ra.push(a)));return this};t.Ta=function(){this.aa=f;var a=this.Ra;if(a&&0<a.length){for(var c=0,d=a.length;c<d;c++)a[c].call(this);this.Ra=[];this.j("ready")}};t.m=function(a){u.m(this.a,a);return this};t.t=function(a){u.t(this.a,a);return this};t.show=function(){this.a.style.display="block";return this};t.C=function(){this.a.style.display="none";return this};function D(a){a.t("vjs-lock-showing")}
-t.disable=function(){this.C();this.show=m()};t.width=function(a,c){return E(this,"width",a,c)};t.height=function(a,c){return E(this,"height",a,c)};t.Tc=function(a,c){return this.width(a,f).height(c)};function E(a,c,d,e){if(d!==b)return a.a.style[c]=-1!==(""+d).indexOf("%")||-1!==(""+d).indexOf("px")?d:"auto"===d?"":d+"px",e||a.j("resize"),a;if(!a.a)return 0;d=a.a.style[c];e=d.indexOf("px");return-1!==e?parseInt(d.slice(0,e),10):parseInt(a.a["offset"+u.$(c)],10)}
-u.q=u.c.extend({i:function(a,c){u.c.call(this,a,c);var d=l;this.d("touchstart",function(a){a.preventDefault();d=f});this.d("touchmove",function(){d=l});var e=this;this.d("touchend",function(a){d&&e.p(a);a.preventDefault()});this.d("click",this.p);this.d("focus",this.Na);this.d("blur",this.Ma)}});t=u.q.prototype;
-t.e=function(a,c){c=u.k.B({className:this.T(),innerHTML:'<div class="vjs-control-content"><span class="vjs-control-text">'+(this.pa||"Need Text")+"</span></div>",nd:"button","aria-live":"polite",tabIndex:0},c);return u.c.prototype.e.call(this,a,c)};t.T=function(){return"vjs-control "+u.c.prototype.T.call(this)};t.p=m();t.Na=function(){u.d(document,"keyup",u.bind(this,this.ba))};t.ba=function(a){if(32==a.which||13==a.which)a.preventDefault(),this.p()};
-t.Ma=function(){u.n(document,"keyup",u.bind(this,this.ba))};u.O=u.c.extend({i:function(a,c){u.c.call(this,a,c);this.Oc=this.V[this.g.barName];this.handle=this.V[this.g.handleName];a.d(this.oc,u.bind(this,this.update));this.d("mousedown",this.Oa);this.d("touchstart",this.Oa);this.d("focus",this.Na);this.d("blur",this.Ma);this.d("click",this.p);this.b.d("controlsvisible",u.bind(this,this.update));a.M(u.bind(this,this.update));this.P={}}});t=u.O.prototype;
-t.e=function(a,c){c=c||{};c.className+=" vjs-slider";c=u.k.B({nd:"slider","aria-valuenow":0,"aria-valuemin":0,"aria-valuemax":100,tabIndex:0},c);return u.c.prototype.e.call(this,a,c)};t.Oa=function(a){a.preventDefault();u.Pc();this.P.move=u.bind(this,this.Gb);this.P.end=u.bind(this,this.Hb);u.d(document,"mousemove",this.P.move);u.d(document,"mouseup",this.P.end);u.d(document,"touchmove",this.P.move);u.d(document,"touchend",this.P.end);this.Gb(a)};
-t.Hb=function(){u.yd();u.n(document,"mousemove",this.P.move,l);u.n(document,"mouseup",this.P.end,l);u.n(document,"touchmove",this.P.move,l);u.n(document,"touchend",this.P.end,l);this.update()};t.update=function(){if(this.a){var a,c=this.xb(),d=this.handle,e=this.Oc;isNaN(c)&&(c=0);a=c;if(d){a=this.a.offsetWidth;var g=d.v().offsetWidth;a=g?g/a:0;c*=1-a;a=c+a/2;d.v().style.left=u.round(100*c,2)+"%"}e.v().style.width=u.round(100*a,2)+"%"}};
-function F(a,c){var d,e,g,h;d=a.a;e=u.Xc(d);h=g=d.offsetWidth;d=a.handle;if(a.g.zd)return h=e.top,e=c.changedTouches?c.changedTouches[0].pageY:c.pageY,d&&(d=d.v().offsetHeight,h+=d/2,g-=d),Math.max(0,Math.min(1,(h-e+g)/g));g=e.left;e=c.changedTouches?c.changedTouches[0].pageX:c.pageX;d&&(d=d.v().offsetWidth,g+=d/2,h-=d);return Math.max(0,Math.min(1,(e-g)/h))}t.Na=function(){u.d(document,"keyup",u.bind(this,this.ba))};
-t.ba=function(a){37==a.which?(a.preventDefault(),this.uc()):39==a.which&&(a.preventDefault(),this.vc())};t.Ma=function(){u.n(document,"keyup",u.bind(this,this.ba))};t.p=function(a){a.stopImmediatePropagation();a.preventDefault()};u.ea=u.c.extend();u.ea.prototype.defaultValue=0;u.ea.prototype.e=function(a,c){c=c||{};c.className+=" vjs-slider-handle";c=u.k.B({innerHTML:'<span class="vjs-control-text">'+this.defaultValue+"</span>"},c);return u.c.prototype.e.call(this,"div",c)};u.la=u.c.extend();
-function ca(a,c){a.Z(c);c.d("click",u.bind(a,function(){D(this)}))}u.la.prototype.e=function(){var a=this.options().Rc||"ul";this.ra=u.e(a,{className:"vjs-menu-content"});a=u.c.prototype.e.call(this,"div",{append:this.ra,className:"vjs-menu"});a.appendChild(this.ra);u.d(a,"click",function(a){a.preventDefault();a.stopImmediatePropagation()});return a};u.N=u.q.extend({i:function(a,c){u.q.call(this,a,c);this.selected(c.selected)}});
-u.N.prototype.e=function(a,c){return u.q.prototype.e.call(this,"li",u.k.B({className:"vjs-menu-item",innerHTML:this.g.label},c))};u.N.prototype.p=function(){this.selected(f)};u.N.prototype.selected=function(a){a?(this.m("vjs-selected"),this.a.setAttribute("aria-selected",f)):(this.t("vjs-selected"),this.a.setAttribute("aria-selected",l))};
-u.R=u.q.extend({i:function(a,c){u.q.call(this,a,c);this.va=this.Ja();this.Z(this.va);this.J&&0===this.J.length&&this.C();this.d("keyup",this.ba);this.a.setAttribute("aria-haspopup",f);this.a.setAttribute("role","button")}});t=u.R.prototype;t.oa=l;t.Ja=function(){var a=new u.la(this.b);this.options().title&&a.v().appendChild(u.e("li",{className:"vjs-menu-title",innerHTML:u.$(this.A),wd:-1}));if(this.J=this.createItems())for(var c=0;c<this.J.length;c++)ca(a,this.J[c]);return a};t.sa=m();
-t.T=function(){return this.className+" vjs-menu-button "+u.q.prototype.T.call(this)};t.Na=m();t.Ma=m();t.p=function(){this.U("mouseout",u.bind(this,function(){D(this.va);this.a.blur()}));this.oa?G(this):H(this)};t.ba=function(a){a.preventDefault();32==a.which||13==a.which?this.oa?G(this):H(this):27==a.which&&this.oa&&G(this)};function H(a){a.oa=f;a.va.m("vjs-lock-showing");a.a.setAttribute("aria-pressed",f);a.J&&0<a.J.length&&a.J[0].v().focus()}
-function G(a){a.oa=l;D(a.va);a.a.setAttribute("aria-pressed",l)}
-u.w=u.c.extend({i:function(a,c,d){this.F=a;c=u.k.B(da(a),c);this.u={};this.pc=c.poster;this.rb=c.controls;a.controls=l;u.c.call(this,this,c,d);this.controls()?this.m("vjs-controls-enabled"):this.m("vjs-controls-disabled");this.U("play",function(a){u.j(this.a,{type:"firstplay",target:this.a})||(a.preventDefault(),a.stopPropagation(),a.stopImmediatePropagation())});this.d("ended",this.ed);this.d("play",this.Jb);this.d("firstplay",this.fd);this.d("pause",this.Ib);this.d("progress",this.hd);this.d("durationchange",
-this.dd);this.d("error",this.Fb);this.d("fullscreenchange",this.gd);u.wa[this.Q]=this;c.plugins&&u.k.ta(c.plugins,function(a,c){this[a](c)},this);var e,g,h,k;e=this.rc;a=function(){e();clearInterval(g);g=setInterval(u.bind(this,e),250)};c=function(){e();clearInterval(g)};this.d("mousedown",a);this.d("mousemove",e);this.d("mouseup",c);this.d("keydown",e);this.d("keyup",e);this.d("touchstart",a);this.d("touchmove",e);this.d("touchend",c);this.d("touchcancel",c);h=setInterval(u.bind(this,function(){this.ja&&
-(this.ja=l,I(this,f),clearTimeout(k),k=setTimeout(u.bind(this,function(){this.ja||I(this,l)}),2E3))}),250);this.d("dispose",function(){clearInterval(h);clearTimeout(k)})}});t=u.w.prototype;t.g=u.options;t.D=function(){this.j("dispose");this.n("dispose");u.wa[this.Q]=j;this.F&&this.F.player&&(this.F.player=j);this.a&&this.a.player&&(this.a.player=j);clearInterval(this.Qa);this.ya();this.h&&this.h.D();u.c.prototype.D.call(this)};
-function da(a){var c={sources:[],tracks:[]};u.k.B(c,u.wb(a));if(a.hasChildNodes()){var d,e,g,h;a=a.childNodes;g=0;for(h=a.length;g<h;g++)d=a[g],e=d.nodeName.toLowerCase(),"source"===e?c.sources.push(u.wb(d)):"track"===e&&c.tracks.push(u.wb(d))}return c}
-t.e=function(){var a=this.a=u.c.prototype.e.call(this,"div"),c=this.F;c.removeAttribute("width");c.removeAttribute("height");if(c.hasChildNodes()){var d,e,g,h,k;d=c.childNodes;e=d.length;for(k=[];e--;)g=d[e],h=g.nodeName.toLowerCase(),("source"===h||"track"===h)&&k.push(g);for(d=0;d<k.length;d++)c.removeChild(k[d])}c.id=c.id||"vjs_video_"+u.s++;a.id=c.id;a.className=c.className;c.id+="_html5_api";c.className="vjs-tech";c.player=a.player=this;this.m("vjs-paused");this.width(this.g.width,f);this.height(this.g.height,
-f);c.parentNode&&c.parentNode.insertBefore(a,c);u.yb(c,a);return a};
-function J(a,c,d){a.h?(a.aa=l,a.h.D(),a.Db&&(a.Db=l,clearInterval(a.Qa)),a.Eb&&K(a),a.h=l):"Html5"!==c&&a.F&&(a.a.removeChild(a.F),a.F.player=j,a.F=j);a.ia=c;a.aa=l;var e=u.k.B({source:d,parentEl:a.a},a.g[c.toLowerCase()]);d&&(d.src==a.u.src&&0<a.u.currentTime&&(e.startTime=a.u.currentTime),a.u.src=d.src);a.h=new window.videojs[c](a,e);a.h.M(function(){this.b.Ta();if(!this.l.progressEvents){var a=this.b;a.Db=f;a.Qa=setInterval(u.bind(a,function(){this.u.kb<this.buffered().end(0)?this.j("progress"):
-1==this.Ia()&&(clearInterval(this.Qa),this.j("progress"))}),500);a.h.U("progress",function(){this.l.progressEvents=f;var a=this.b;a.Db=l;clearInterval(a.Qa)})}this.l.timeupdateEvents||(a=this.b,a.Eb=f,a.d("play",a.yc),a.d("pause",a.ya),a.h.U("timeupdate",function(){this.l.timeupdateEvents=f;K(this.b)}))})}function K(a){a.Eb=l;a.ya();a.n("play",a.yc);a.n("pause",a.ya)}t.yc=function(){this.ec&&this.ya();this.ec=setInterval(u.bind(this,function(){this.j("timeupdate")}),250)};t.ya=function(){clearInterval(this.ec)};
-t.ed=function(){this.g.loop&&(this.currentTime(0),this.play())};t.Jb=function(){u.t(this.a,"vjs-paused");u.m(this.a,"vjs-playing")};t.fd=function(){this.g.starttime&&this.currentTime(this.g.starttime);this.m("vjs-has-started")};t.Ib=function(){u.t(this.a,"vjs-playing");u.m(this.a,"vjs-paused")};t.hd=function(){1==this.Ia()&&this.j("loadedalldata")};t.dd=function(){this.duration(L(this,"duration"))};t.Fb=function(a){u.log("Video Error",a)};t.gd=function(){this.I?this.m("vjs-fullscreen"):this.t("vjs-fullscreen")};
-function M(a,c,d){if(a.h&&!a.h.aa)a.h.M(function(){this[c](d)});else try{a.h[c](d)}catch(e){throw u.log(e),e;}}function L(a,c){if(a.h&&a.h.aa)try{return a.h[c]()}catch(d){throw a.h[c]===b?u.log("Video.js: "+c+" method not defined for "+a.ia+" playback technology.",d):"TypeError"==d.name?(u.log("Video.js: "+c+" unavailable on "+a.ia+" playback technology element.",d),a.h.aa=l):u.log(d),d;}}t.play=function(){M(this,"play");return this};t.pause=function(){M(this,"pause");return this};
-t.paused=function(){return L(this,"paused")===l?l:f};t.currentTime=function(a){return a!==b?(this.u.nc=a,M(this,"setCurrentTime",a),this.Eb&&this.j("timeupdate"),this):this.u.currentTime=L(this,"currentTime")||0};t.duration=function(a){return a!==b?(this.u.duration=parseFloat(a),this):this.u.duration};t.buffered=function(){var a=L(this,"buffered"),c=a.length-1,d=this.u.kb=this.u.kb||0;a&&(0<=c&&a.end(c)!==d)&&(d=a.end(c),this.u.kb=d);return u.sb(0,d)};
-t.Ia=function(){return this.duration()?this.buffered().end(0)/this.duration():0};t.volume=function(a){if(a!==b)return a=Math.max(0,Math.min(1,parseFloat(a))),this.u.volume=a,M(this,"setVolume",a),u.qd(a),this;a=parseFloat(L(this,"volume"));return isNaN(a)?1:a};t.muted=function(a){return a!==b?(M(this,"setMuted",a),this):L(this,"muted")||l};t.Sa=function(){return L(this,"supportsFullScreen")||l};
-t.xa=function(){var a=u.Nb.xa;this.I=f;a?(u.d(document,a.ub,u.bind(this,function(c){this.I=document[a.I];this.I===l&&u.n(document,a.ub,arguments.callee);this.j("fullscreenchange")})),this.a[a.sc]()):this.h.Sa()?M(this,"enterFullScreen"):(this.Zc=f,this.Uc=document.documentElement.style.overflow,u.d(document,"keydown",u.bind(this,this.hc)),document.documentElement.style.overflow="hidden",u.m(document.body,"vjs-full-window"),this.j("enterFullWindow"),this.j("fullscreenchange"));return this};
-t.nb=function(){var a=u.Nb.xa;this.I=l;if(a)document[a.mb]();else this.h.Sa()?M(this,"exitFullScreen"):(N(this),this.j("fullscreenchange"));return this};t.hc=function(a){27===a.keyCode&&(this.I===f?this.nb():N(this))};function N(a){a.Zc=l;u.n(document,"keydown",a.hc);document.documentElement.style.overflow=a.Uc;u.t(document.body,"vjs-full-window");a.j("exitFullWindow")}
-t.src=function(a){if(a instanceof Array){var c;a:{c=a;for(var d=0,e=this.g.techOrder;d<e.length;d++){var g=u.$(e[d]),h=window.videojs[g];if(h.isSupported())for(var k=0,r=c;k<r.length;k++){var n=r[k];if(h.canPlaySource(n)){c={source:n,h:g};break a}}}c=l}c?(a=c.source,c=c.h,c==this.ia?this.src(a):J(this,c,a)):this.a.appendChild(u.e("p",{innerHTML:this.options().notSupportedMessage}))}else a instanceof Object?window.videojs[this.ia].canPlaySource(a)?this.src(a.src):this.src([a]):(this.u.src=a,this.aa?
-(M(this,"src",a),"auto"==this.g.preload&&this.load(),this.g.autoplay&&this.play()):this.M(function(){this.src(a)}));return this};t.load=function(){M(this,"load");return this};t.currentSrc=function(){return L(this,"currentSrc")||this.u.src||""};t.Pa=function(a){return a!==b?(M(this,"setPreload",a),this.g.preload=a,this):L(this,"preload")};t.autoplay=function(a){return a!==b?(M(this,"setAutoplay",a),this.g.autoplay=a,this):L(this,"autoplay")};
-t.loop=function(a){return a!==b?(M(this,"setLoop",a),this.g.loop=a,this):L(this,"loop")};t.poster=function(a){a!==b&&(this.pc=a);return this.pc};t.controls=function(a){return a!==b?(a=!!a,this.rb!==a&&((this.rb=a)?(this.t("vjs-controls-disabled"),this.m("vjs-controls-enabled"),this.j("controlsenabled")):(this.t("vjs-controls-enabled"),this.m("vjs-controls-disabled"),this.j("controlsdisabled"))),this):this.rb};u.w.prototype.Qb;t=u.w.prototype;
-t.Pb=function(a){return a!==b?(a=!!a,this.Qb!==a&&((this.Qb=a)?(this.m("vjs-using-native-controls"),this.j("usingnativecontrols")):(this.t("vjs-using-native-controls"),this.j("usingcustomcontrols"))),this):this.Qb};t.error=function(){return L(this,"error")};t.seeking=function(){return L(this,"seeking")};t.ja=f;t.rc=function(){this.ja=f};t.Ob=f;
-function I(a,c){return c!==b?(c=!!c,c!==a.Ob&&((a.Ob=c)?(a.ja=f,a.t("vjs-user-inactive"),a.m("vjs-user-active"),a.j("useractive")):(a.ja=l,a.h.U("mousemove",function(a){a.stopPropagation();a.preventDefault()}),a.t("vjs-user-active"),a.m("vjs-user-inactive"),a.j("userinactive"))),a):a.Ob}var O,P,Q;Q=document.createElement("div");P={};
-Q.Ed!==b?(P.sc="requestFullscreen",P.mb="exitFullscreen",P.ub="fullscreenchange",P.I="fullScreen"):(document.mozCancelFullScreen?(O="moz",P.I=O+"FullScreen"):(O="webkit",P.I=O+"IsFullScreen"),Q[O+"RequestFullScreen"]&&(P.sc=O+"RequestFullScreen",P.mb=O+"CancelFullScreen"),P.ub=O+"fullscreenchange");document[P.mb]&&(u.Nb.xa=P);u.Ea=u.c.extend();
-u.Ea.prototype.g={Jd:"play",children:{playToggle:{},currentTimeDisplay:{},timeDivider:{},durationDisplay:{},remainingTimeDisplay:{},progressControl:{},fullscreenToggle:{},volumeControl:{},muteToggle:{}}};u.Ea.prototype.e=function(){return u.e("div",{className:"vjs-control-bar"})};u.Wb=u.q.extend({i:function(a,c){u.q.call(this,a,c);a.d("play",u.bind(this,this.Jb));a.d("pause",u.bind(this,this.Ib))}});t=u.Wb.prototype;t.pa="Play";t.T=function(){return"vjs-play-control "+u.q.prototype.T.call(this)};
-t.p=function(){this.b.paused()?this.b.play():this.b.pause()};t.Jb=function(){u.t(this.a,"vjs-paused");u.m(this.a,"vjs-playing");this.a.children[0].children[0].innerHTML="Pause"};t.Ib=function(){u.t(this.a,"vjs-playing");u.m(this.a,"vjs-paused");this.a.children[0].children[0].innerHTML="Play"};u.Xa=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("timeupdate",u.bind(this,this.Ba))}});
-u.Xa.prototype.e=function(){var a=u.c.prototype.e.call(this,"div",{className:"vjs-current-time vjs-time-controls vjs-control"});this.content=u.e("div",{className:"vjs-current-time-display",innerHTML:'<span class="vjs-control-text">Current Time </span>0:00',"aria-live":"off"});a.appendChild(u.e("div").appendChild(this.content));return a};
-u.Xa.prototype.Ba=function(){var a=this.b.Lb?this.b.u.currentTime:this.b.currentTime();this.content.innerHTML='<span class="vjs-control-text">Current Time </span>'+u.Ka(a,this.b.duration())};u.Ya=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("timeupdate",u.bind(this,this.Ba))}});
-u.Ya.prototype.e=function(){var a=u.c.prototype.e.call(this,"div",{className:"vjs-duration vjs-time-controls vjs-control"});this.content=u.e("div",{className:"vjs-duration-display",innerHTML:'<span class="vjs-control-text">Duration Time </span>0:00',"aria-live":"off"});a.appendChild(u.e("div").appendChild(this.content));return a};u.Ya.prototype.Ba=function(){var a=this.b.duration();a&&(this.content.innerHTML='<span class="vjs-control-text">Duration Time </span>'+u.Ka(a))};
-u.$b=u.c.extend({i:function(a,c){u.c.call(this,a,c)}});u.$b.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-time-divider",innerHTML:"<div><span>/</span></div>"})};u.eb=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("timeupdate",u.bind(this,this.Ba))}});
-u.eb.prototype.e=function(){var a=u.c.prototype.e.call(this,"div",{className:"vjs-remaining-time vjs-time-controls vjs-control"});this.content=u.e("div",{className:"vjs-remaining-time-display",innerHTML:'<span class="vjs-control-text">Remaining Time </span>-0:00',"aria-live":"off"});a.appendChild(u.e("div").appendChild(this.content));return a};u.eb.prototype.Ba=function(){this.b.duration()&&(this.content.innerHTML='<span class="vjs-control-text">Remaining Time </span>-'+u.Ka(this.b.duration()-this.b.currentTime()))};
-u.Fa=u.q.extend({i:function(a,c){u.q.call(this,a,c)}});u.Fa.prototype.pa="Fullscreen";u.Fa.prototype.T=function(){return"vjs-fullscreen-control "+u.q.prototype.T.call(this)};u.Fa.prototype.p=function(){this.b.I?(this.b.nb(),this.a.children[0].children[0].innerHTML="Fullscreen"):(this.b.xa(),this.a.children[0].children[0].innerHTML="Non-Fullscreen")};u.cb=u.c.extend({i:function(a,c){u.c.call(this,a,c)}});u.cb.prototype.g={children:{seekBar:{}}};
-u.cb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-progress-control vjs-control"})};u.Xb=u.O.extend({i:function(a,c){u.O.call(this,a,c);a.d("timeupdate",u.bind(this,this.Aa));a.M(u.bind(this,this.Aa))}});t=u.Xb.prototype;t.g={children:{loadProgressBar:{},playProgressBar:{},seekHandle:{}},barName:"playProgressBar",handleName:"seekHandle"};t.oc="timeupdate";t.e=function(){return u.O.prototype.e.call(this,"div",{className:"vjs-progress-holder","aria-label":"video progress bar"})};
-t.Aa=function(){var a=this.b.Lb?this.b.u.currentTime:this.b.currentTime();this.a.setAttribute("aria-valuenow",u.round(100*this.xb(),2));this.a.setAttribute("aria-valuetext",u.Ka(a,this.b.duration()))};t.xb=function(){var a;"Flash"===this.b.ia&&this.b.seeking()?(a=this.b.u,a=a.nc?a.nc:this.b.currentTime()):a=this.b.currentTime();return a/this.b.duration()};t.Oa=function(a){u.O.prototype.Oa.call(this,a);this.b.Lb=f;this.Ad=!this.b.paused();this.b.pause()};
-t.Gb=function(a){a=F(this,a)*this.b.duration();a==this.b.duration()&&(a-=0.1);this.b.currentTime(a)};t.Hb=function(a){u.O.prototype.Hb.call(this,a);this.b.Lb=l;this.Ad&&this.b.play()};t.vc=function(){this.b.currentTime(this.b.currentTime()+5)};t.uc=function(){this.b.currentTime(this.b.currentTime()-5)};u.$a=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("progress",u.bind(this,this.update))}});u.$a.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-load-progress",innerHTML:'<span class="vjs-control-text">Loaded: 0%</span>'})};
-u.$a.prototype.update=function(){this.a.style&&(this.a.style.width=u.round(100*this.b.Ia(),2)+"%")};u.Vb=u.c.extend({i:function(a,c){u.c.call(this,a,c)}});u.Vb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-play-progress",innerHTML:'<span class="vjs-control-text">Progress: 0%</span>'})};u.fb=u.ea.extend();u.fb.prototype.defaultValue="00:00";u.fb.prototype.e=function(){return u.ea.prototype.e.call(this,"div",{className:"vjs-seek-handle"})};
-u.hb=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.h&&(a.h.l&&a.h.l.volumeControl===l)&&this.m("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.h.l&&a.h.l.volumeControl===l?this.m("vjs-hidden"):this.t("vjs-hidden")}))}});u.hb.prototype.g={children:{volumeBar:{}}};u.hb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-volume-control vjs-control"})};
-u.gb=u.O.extend({i:function(a,c){u.O.call(this,a,c);a.d("volumechange",u.bind(this,this.Aa));a.M(u.bind(this,this.Aa));setTimeout(u.bind(this,this.update),0)}});t=u.gb.prototype;t.Aa=function(){this.a.setAttribute("aria-valuenow",u.round(100*this.b.volume(),2));this.a.setAttribute("aria-valuetext",u.round(100*this.b.volume(),2)+"%")};t.g={children:{volumeLevel:{},volumeHandle:{}},barName:"volumeLevel",handleName:"volumeHandle"};t.oc="volumechange";
-t.e=function(){return u.O.prototype.e.call(this,"div",{className:"vjs-volume-bar","aria-label":"volume level"})};t.Gb=function(a){this.b.volume(F(this,a))};t.xb=function(){return this.b.muted()?0:this.b.volume()};t.vc=function(){this.b.volume(this.b.volume()+0.1)};t.uc=function(){this.b.volume(this.b.volume()-0.1)};u.ac=u.c.extend({i:function(a,c){u.c.call(this,a,c)}});u.ac.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-volume-level",innerHTML:'<span class="vjs-control-text"></span>'})};
-u.ib=u.ea.extend();u.ib.prototype.defaultValue="00:00";u.ib.prototype.e=function(){return u.ea.prototype.e.call(this,"div",{className:"vjs-volume-handle"})};u.da=u.q.extend({i:function(a,c){u.q.call(this,a,c);a.d("volumechange",u.bind(this,this.update));a.h&&(a.h.l&&a.h.l.volumeControl===l)&&this.m("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.h.l&&a.h.l.volumeControl===l?this.m("vjs-hidden"):this.t("vjs-hidden")}))}});
-u.da.prototype.e=function(){return u.q.prototype.e.call(this,"div",{className:"vjs-mute-control vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})};u.da.prototype.p=function(){this.b.muted(this.b.muted()?l:f)};
-u.da.prototype.update=function(){var a=this.b.volume(),c=3;0===a||this.b.muted()?c=0:0.33>a?c=1:0.67>a&&(c=2);this.b.muted()?"Unmute"!=this.a.children[0].children[0].innerHTML&&(this.a.children[0].children[0].innerHTML="Unmute"):"Mute"!=this.a.children[0].children[0].innerHTML&&(this.a.children[0].children[0].innerHTML="Mute");for(a=0;4>a;a++)u.t(this.a,"vjs-vol-"+a);u.m(this.a,"vjs-vol-"+c)};
-u.na=u.R.extend({i:function(a,c){u.R.call(this,a,c);a.d("volumechange",u.bind(this,this.update));a.h&&(a.h.l&&a.h.l.zc===l)&&this.m("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.h.l&&a.h.l.zc===l?this.m("vjs-hidden"):this.t("vjs-hidden")}));this.m("vjs-menu-button")}});u.na.prototype.Ja=function(){var a=new u.la(this.b,{Rc:"div"}),c=new u.gb(this.b,u.k.B({zd:f},this.g.Sd));a.Z(c);return a};u.na.prototype.p=function(){u.da.prototype.p.call(this);u.R.prototype.p.call(this)};
-u.na.prototype.e=function(){return u.q.prototype.e.call(this,"div",{className:"vjs-volume-menu-button vjs-menu-button vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})};u.na.prototype.update=u.da.prototype.update;u.bb=u.q.extend({i:function(a,c){u.q.call(this,a,c);(!a.poster()||!a.controls())&&this.C();a.d("play",u.bind(this,this.C))}});
-u.bb.prototype.e=function(){var a=u.e("div",{className:"vjs-poster",tabIndex:-1}),c=this.b.poster();c&&("backgroundSize"in a.style?a.style.backgroundImage='url("'+c+'")':a.appendChild(u.e("img",{src:c})));return a};u.bb.prototype.p=function(){this.L().controls()&&this.b.play()};
-u.Ub=u.c.extend({i:function(a,c){u.c.call(this,a,c);a.d("canplay",u.bind(this,this.C));a.d("canplaythrough",u.bind(this,this.C));a.d("playing",u.bind(this,this.C));a.d("seeked",u.bind(this,this.C));a.d("seeking",u.bind(this,this.show));a.d("seeked",u.bind(this,this.C));a.d("error",u.bind(this,this.show));a.d("waiting",u.bind(this,this.show))}});u.Ub.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-loading-spinner"})};u.Va=u.q.extend();
-u.Va.prototype.e=function(){return u.q.prototype.e.call(this,"div",{className:"vjs-big-play-button",innerHTML:"<span></span>","aria-label":"play video"})};u.Va.prototype.p=function(){this.b.play()};
-u.r=u.c.extend({i:function(a,c,d){u.c.call(this,a,c,d);var e,g;g=this;e=this.L();a=function(){if(e.controls()&&!e.Pb()){var a,c;g.d("mousedown",g.p);g.d("touchstart",function(a){a.preventDefault();a.stopPropagation();c=I(this.b)});a=function(a){a.stopPropagation();c&&this.b.rc()};g.d("touchmove",a);g.d("touchleave",a);g.d("touchcancel",a);g.d("touchend",a);var d,n,s;d=0;g.d("touchstart",function(){d=(new Date).getTime();s=f});a=function(){s=l};g.d("touchmove",a);g.d("touchleave",a);g.d("touchcancel",
-a);g.d("touchend",function(){s===f&&(n=(new Date).getTime()-d,250>n&&this.j("tap"))});g.d("tap",g.jd)}};c=u.bind(g,g.md);this.M(a);e.d("controlsenabled",a);e.d("controlsdisabled",c)}});u.r.prototype.md=function(){this.n("tap");this.n("touchstart");this.n("touchmove");this.n("touchleave");this.n("touchcancel");this.n("touchend");this.n("click");this.n("mousedown")};u.r.prototype.p=function(a){0===a.button&&this.L().controls()&&(this.L().paused()?this.L().play():this.L().pause())};
-u.r.prototype.jd=function(){I(this.L(),!I(this.L()))};u.r.prototype.l={volumeControl:f,fullscreenResize:l,progressEvents:l,timeupdateEvents:l};u.media={};u.media.Ua="play pause paused currentTime setCurrentTime duration buffered volume setVolume muted setMuted width height supportsFullScreen enterFullScreen src load currentSrc preload setPreload autoplay setAutoplay loop setLoop error networkState readyState seeking initialTime startOffsetTime played seekable ended videoTracks audioTracks videoWidth videoHeight textTracks defaultPlaybackRate playbackRate mediaGroup controller controls defaultMuted".split(" ");
-function ea(){var a=u.media.Ua[i];return function(){throw Error('The "'+a+"\" method is not available on the playback technology's API");}}for(var i=u.media.Ua.length-1;0<=i;i--)u.r.prototype[u.media.Ua[i]]=ea();
-u.o=u.r.extend({i:function(a,c,d){this.l.volumeControl=u.o.Qc();this.l.movingMediaElementInDOM=!u.Fc;this.l.fullscreenResize=f;u.r.call(this,a,c,d);(c=c.source)&&this.a.currentSrc==c.src?a.j("loadstart"):c&&(this.a.src=c.src);if(u.Mc&&a.options().nativeControlsForTouch!==l){var e,g,h,k;e=this;g=this.L();c=g.controls();e.a.controls=!!c;h=function(){e.a.controls=f};k=function(){e.a.controls=l};g.d("controlsenabled",h);g.d("controlsdisabled",k);c=function(){g.n("controlsenabled",h);g.n("controlsdisabled",
-k)};e.d("dispose",c);g.d("usingcustomcontrols",c);g.Pb(f)}a.M(function(){this.F&&(this.g.autoplay&&this.paused())&&(delete this.F.poster,this.play())});for(a=u.o.Za.length-1;0<=a;a--)u.d(this.a,u.o.Za[a],u.bind(this.b,this.Wc));this.Ta()}});t=u.o.prototype;t.D=function(){u.r.prototype.D.call(this)};
-t.e=function(){var a=this.b,c=a.F;if(!c||this.l.movingMediaElementInDOM===l)c?(c.player=j,a.F=j,a.v().removeChild(c),c=c.cloneNode(l)):c=u.e("video",{id:a.id()+"_html5_api",className:"vjs-tech"}),c.player=a,u.yb(c,a.v());for(var d=["autoplay","preload","loop","muted"],e=d.length-1;0<=e;e--){var g=d[e];a.g[g]!==j&&(c[g]=a.g[g])}return c};t.Wc=function(a){this.j(a);a.stopPropagation()};t.play=function(){this.a.play()};t.pause=function(){this.a.pause()};t.paused=function(){return this.a.paused};
-t.currentTime=function(){return this.a.currentTime};t.pd=function(a){try{this.a.currentTime=a}catch(c){u.log(c,"Video is not ready. (Video.js)")}};t.duration=function(){return this.a.duration||0};t.buffered=function(){return this.a.buffered};t.volume=function(){return this.a.volume};t.ud=function(a){this.a.volume=a};t.muted=function(){return this.a.muted};t.sd=function(a){this.a.muted=a};t.width=function(){return this.a.offsetWidth};t.height=function(){return this.a.offsetHeight};
-t.Sa=function(){return"function"==typeof this.a.webkitEnterFullScreen&&(/Android/.test(u.G)||!/Chrome|Mac OS X 10.5/.test(u.G))?f:l};t.src=function(a){this.a.src=a};t.load=function(){this.a.load()};t.currentSrc=function(){return this.a.currentSrc};t.Pa=function(){return this.a.Pa};t.td=function(a){this.a.Pa=a};t.autoplay=function(){return this.a.autoplay};t.od=function(a){this.a.autoplay=a};t.controls=function(){return this.a.controls};t.loop=function(){return this.a.loop};
-t.rd=function(a){this.a.loop=a};t.error=function(){return this.a.error};t.seeking=function(){return this.a.seeking};u.o.isSupported=function(){return!!u.ma.canPlayType};u.o.lb=function(a){try{return!!u.ma.canPlayType(a.type)}catch(c){return""}};u.o.Qc=function(){var a=u.ma.volume;u.ma.volume=a/2+0.1;return a!==u.ma.volume};u.o.Za="loadstart suspend abort error emptied stalled loadedmetadata loadeddata canplay canplaythrough playing waiting seeking seeked ended durationchange timeupdate progress play pause ratechange volumechange".split(" ");
-u.Jc&&(document.createElement("video").constructor.prototype.canPlayType=function(a){return a&&-1!=a.toLowerCase().indexOf("video/mp4")?"maybe":""});
-u.f=u.r.extend({i:function(a,c,d){u.r.call(this,a,c,d);var e=c.source;d=c.parentEl;var g=this.a=u.e("div",{id:a.id()+"_temp_flash"}),h=a.id()+"_flash_api";a=a.g;var k=u.k.B({readyFunction:"videojs.Flash.onReady",eventProxyFunction:"videojs.Flash.onEvent",errorEventProxyFunction:"videojs.Flash.onError",autoplay:a.autoplay,preload:a.Pa,loop:a.loop,muted:a.muted},c.flashVars),r=u.k.B({wmode:"opaque",bgcolor:"#000000"},c.params),n=u.k.B({id:h,name:h,"class":"vjs-tech"},c.attributes);e&&(e.type&&u.f.ad(e.type)?
-(a=u.f.wc(e.src),k.rtmpConnection=encodeURIComponent(a.qb),k.rtmpStream=encodeURIComponent(a.Mb)):k.src=encodeURIComponent(u.ic(e.src)));u.yb(g,d);c.startTime&&this.M(function(){this.load();this.play();this.currentTime(c.startTime)});if(c.iFrameMode===f&&!u.Ec){var s=u.e("iframe",{id:h+"_iframe",name:h+"_iframe",className:"vjs-tech",scrolling:"no",marginWidth:0,marginHeight:0,frameBorder:0});k.readyFunction="ready";k.eventProxyFunction="events";k.errorEventProxyFunction="errors";u.d(s,"load",u.bind(this,
-function(){var a,d=s.contentWindow;a=s.contentDocument?s.contentDocument:s.contentWindow.document;a.write(u.f.jc(c.swf,k,r,n));d.player=this.b;d.ready=u.bind(this.b,function(c){var d=this.h;d.a=a.getElementById(c);u.f.ob(d)});d.events=u.bind(this.b,function(a,c){this&&"flash"===this.ia&&this.j(c)});d.errors=u.bind(this.b,function(a,c){u.log("Flash Error",c)})}));g.parentNode.replaceChild(s,g)}else u.f.Vc(c.swf,g,k,r,n)}});t=u.f.prototype;t.D=function(){u.r.prototype.D.call(this)};t.play=function(){this.a.vjs_play()};
-t.pause=function(){this.a.vjs_pause()};t.src=function(a){u.f.$c(a)?(a=u.f.wc(a),this.Nd(a.qb),this.Od(a.Mb)):(a=u.ic(a),this.a.vjs_src(a));if(this.b.autoplay()){var c=this;setTimeout(function(){c.play()},0)}};t.currentSrc=function(){var a=this.a.vjs_getProperty("currentSrc");if(a==j){var c=this.Ld(),d=this.Md();c&&d&&(a=u.f.vd(c,d))}return a};t.load=function(){this.a.vjs_load()};t.poster=function(){this.a.vjs_getProperty("poster")};t.buffered=function(){return u.sb(0,this.a.vjs_getProperty("buffered"))};
-t.Sa=q(l);var R=u.f.prototype,S="rtmpConnection rtmpStream preload currentTime defaultPlaybackRate playbackRate autoplay loop mediaGroup controller controls volume muted defaultMuted".split(" "),T="error currentSrc networkState readyState seeking initialTime duration startOffsetTime paused played seekable ended videoTracks audioTracks videoWidth videoHeight textTracks".split(" ");
-function fa(){var a=S[U],c=a.charAt(0).toUpperCase()+a.slice(1);R["set"+c]=function(c){return this.a.vjs_setProperty(a,c)}}function V(a){R[a]=function(){return this.a.vjs_getProperty(a)}}var U;for(U=0;U<S.length;U++)V(S[U]),fa();for(U=0;U<T.length;U++)V(T[U]);u.f.isSupported=function(){return 10<=u.f.version()[0]};u.f.lb=function(a){if(a.type in u.f.Yc||a.type in u.f.xc)return"maybe"};u.f.Yc={"video/flv":"FLV","video/x-flv":"FLV","video/mp4":"MP4","video/m4v":"MP4"};u.f.xc={"rtmp/mp4":"MP4","rtmp/flv":"FLV"};
-u.f.onReady=function(a){a=u.v(a);var c=a.player||a.parentNode.player,d=c.h;a.player=c;d.a=a;u.f.ob(d)};u.f.ob=function(a){a.v().vjs_getProperty?a.Ta():setTimeout(function(){u.f.ob(a)},50)};u.f.onEvent=function(a,c){u.v(a).player.j(c)};u.f.onError=function(a,c){u.v(a).player.j("error");u.log("Flash Error",c,a)};
-u.f.version=function(){var a="0,0,0";try{a=(new window.ActiveXObject("ShockwaveFlash.ShockwaveFlash")).GetVariable("$version").replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}catch(c){try{navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin&&(a=(navigator.plugins["Shockwave Flash 2.0"]||navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g,",").match(/^,?(.+),?$/)[1])}catch(d){}}return a.split(",")};
-u.f.Vc=function(a,c,d,e,g){a=u.f.jc(a,d,e,g);a=u.e("div",{innerHTML:a}).childNodes[0];d=c.parentNode;c.parentNode.replaceChild(a,c);var h=d.childNodes[0];setTimeout(function(){h.style.display="block"},1E3)};
-u.f.jc=function(a,c,d,e){var g="",h="",k="";c&&u.k.ta(c,function(a,c){g+=a+"="+c+"&amp;"});d=u.k.B({movie:a,flashvars:g,allowScriptAccess:"always",allowNetworking:"all"},d);u.k.ta(d,function(a,c){h+='<param name="'+a+'" value="'+c+'" />'});e=u.k.B({data:a,width:"100%",height:"100%"},e);u.k.ta(e,function(a,c){k+=a+'="'+c+'" '});return'<object type="application/x-shockwave-flash"'+k+">"+h+"</object>"};u.f.vd=function(a,c){return a+"&"+c};
-u.f.wc=function(a){var c={qb:"",Mb:""};if(!a)return c;var d=a.indexOf("&"),e;-1!==d?e=d+1:(d=e=a.lastIndexOf("/")+1,0===d&&(d=e=a.length));c.qb=a.substring(0,d);c.Mb=a.substring(e,a.length);return c};u.f.ad=function(a){return a in u.f.xc};u.f.Lc=/^rtmp[set]?:\/\//i;u.f.$c=function(a){return u.f.Lc.test(a)};
-u.Kc=u.c.extend({i:function(a,c,d){u.c.call(this,a,c,d);if(!a.g.sources||0===a.g.sources.length){c=0;for(d=a.g.techOrder;c<d.length;c++){var e=u.$(d[c]),g=window.videojs[e];if(g&&g.isSupported()){J(a,e);break}}}else a.src(a.g.sources)}});function W(a){a.za=a.za||[];return a.za}function X(a,c,d){for(var e=a.za,g=0,h=e.length,k,r;g<h;g++)k=e[g],k.id()===c?(k.show(),r=k):d&&(k.K()==d&&0<k.mode())&&k.disable();(c=r?r.K():d?d:l)&&a.j(c+"trackchange")}
-u.X=u.c.extend({i:function(a,c){u.c.call(this,a,c);this.Q=c.id||"vjs_"+c.kind+"_"+c.language+"_"+u.s++;this.tc=c.src;this.Sc=c["default"]||c.dflt;this.xd=c.title;this.Id=c.srclang;this.bd=c.label;this.fa=[];this.bc=[];this.ga=this.ha=0;this.b.d("fullscreenchange",u.bind(this,this.Nc))}});t=u.X.prototype;t.K=p("A");t.src=p("tc");t.tb=p("Sc");t.title=p("xd");t.label=p("bd");t.readyState=p("ha");t.mode=p("ga");t.Nc=function(){this.a.style.fontSize=this.b.I?140*(screen.width/this.b.width())+"%":""};
-t.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-"+this.A+" vjs-text-track"})};t.show=function(){Y(this);this.ga=2;u.c.prototype.show.call(this)};t.C=function(){Y(this);this.ga=1;u.c.prototype.C.call(this)};t.disable=function(){2==this.ga&&this.C();this.b.n("timeupdate",u.bind(this,this.update,this.Q));this.b.n("ended",u.bind(this,this.reset,this.Q));this.reset();this.b.V.textTrackDisplay.removeChild(this);this.ga=0};
-function Y(a){0===a.ha&&a.load();0===a.ga&&(a.b.d("timeupdate",u.bind(a,a.update,a.Q)),a.b.d("ended",u.bind(a,a.reset,a.Q)),("captions"===a.A||"subtitles"===a.A)&&a.b.V.textTrackDisplay.Z(a))}t.load=function(){0===this.ha&&(this.ha=1,u.get(this.tc,u.bind(this,this.kd),u.bind(this,this.Fb)))};t.Fb=function(a){this.error=a;this.ha=3;this.j("error")};
-t.kd=function(a){var c,d;a=a.split("\n");for(var e="",g=1,h=a.length;g<h;g++)if(e=u.trim(a[g])){-1==e.indexOf("--\x3e")?(c=e,e=u.trim(a[++g])):c=this.fa.length;c={id:c,index:this.fa.length};d=e.split(" --\x3e ");c.startTime=ga(d[0]);c.ua=ga(d[1]);for(d=[];a[++g]&&(e=u.trim(a[g]));)d.push(e);c.text=d.join("<br/>");this.fa.push(c)}this.ha=2;this.j("loaded")};
-function ga(a){var c=a.split(":");a=0;var d,e,g;3==c.length?(d=c[0],e=c[1],c=c[2]):(d=0,e=c[0],c=c[1]);c=c.split(/\s+/);c=c.splice(0,1)[0];c=c.split(/\.|,/);g=parseFloat(c[1]);c=c[0];a+=3600*parseFloat(d);a+=60*parseFloat(e);a+=parseFloat(c);g&&(a+=g/1E3);return a}
-t.update=function(){if(0<this.fa.length){var a=this.b.currentTime();if(this.Kb===b||a<this.Kb||this.La<=a){var c=this.fa,d=this.b.duration(),e=0,g=l,h=[],k,r,n,s;a>=this.La||this.La===b?s=this.vb!==b?this.vb:0:(g=f,s=this.Cb!==b?this.Cb:c.length-1);for(;;){n=c[s];if(n.ua<=a)e=Math.max(e,n.ua),n.Ha&&(n.Ha=l);else if(a<n.startTime){if(d=Math.min(d,n.startTime),n.Ha&&(n.Ha=l),!g)break}else g?(h.splice(0,0,n),r===b&&(r=s),k=s):(h.push(n),k===b&&(k=s),r=s),d=Math.min(d,n.ua),e=Math.max(e,n.startTime),
-n.Ha=f;if(g)if(0===s)break;else s--;else if(s===c.length-1)break;else s++}this.bc=h;this.La=d;this.Kb=e;this.vb=k;this.Cb=r;a=this.bc;c="";d=0;for(e=a.length;d<e;d++)c+='<span class="vjs-tt-cue">'+a[d].text+"</span>";this.a.innerHTML=c;this.j("cuechange")}}};t.reset=function(){this.La=0;this.Kb=this.b.duration();this.Cb=this.vb=0};u.Sb=u.X.extend();u.Sb.prototype.A="captions";u.Yb=u.X.extend();u.Yb.prototype.A="subtitles";u.Tb=u.X.extend();u.Tb.prototype.A="chapters";
-u.Zb=u.c.extend({i:function(a,c,d){u.c.call(this,a,c,d);if(a.g.tracks&&0<a.g.tracks.length){c=this.b;a=a.g.tracks;var e;for(d=0;d<a.length;d++){e=a[d];var g=c,h=e.kind,k=e.label,r=e.language,n=e;e=g.za=g.za||[];n=n||{};n.kind=h;n.label=k;n.language=r;h=u.$(h||"subtitles");g=new window.videojs[h+"Track"](g,n);e.push(g)}}}});u.Zb.prototype.e=function(){return u.c.prototype.e.call(this,"div",{className:"vjs-text-track-display"})};
-u.Y=u.N.extend({i:function(a,c){var d=this.ca=c.track;c.label=d.label();c.selected=d.tb();u.N.call(this,a,c);this.b.d(d.K()+"trackchange",u.bind(this,this.update))}});u.Y.prototype.p=function(){u.N.prototype.p.call(this);X(this.b,this.ca.Q,this.ca.K())};u.Y.prototype.update=function(){this.selected(2==this.ca.mode())};u.ab=u.Y.extend({i:function(a,c){c.track={K:function(){return c.kind},L:a,label:function(){return c.kind+" off"},tb:q(l),mode:q(l)};u.Y.call(this,a,c);this.selected(f)}});
-u.ab.prototype.p=function(){u.Y.prototype.p.call(this);X(this.b,this.ca.Q,this.ca.K())};u.ab.prototype.update=function(){for(var a=W(this.b),c=0,d=a.length,e,g=f;c<d;c++)e=a[c],e.K()==this.ca.K()&&2==e.mode()&&(g=l);this.selected(g)};u.S=u.R.extend({i:function(a,c){u.R.call(this,a,c);1>=this.J.length&&this.C()}});u.S.prototype.sa=function(){var a=[],c;a.push(new u.ab(this.b,{kind:this.A}));for(var d=0;d<W(this.b).length;d++)c=W(this.b)[d],c.K()===this.A&&a.push(new u.Y(this.b,{track:c}));return a};
-u.Ca=u.S.extend({i:function(a,c,d){u.S.call(this,a,c,d);this.a.setAttribute("aria-label","Captions Menu")}});u.Ca.prototype.A="captions";u.Ca.prototype.pa="Captions";u.Ca.prototype.className="vjs-captions-button";u.Ga=u.S.extend({i:function(a,c,d){u.S.call(this,a,c,d);this.a.setAttribute("aria-label","Subtitles Menu")}});u.Ga.prototype.A="subtitles";u.Ga.prototype.pa="Subtitles";u.Ga.prototype.className="vjs-subtitles-button";
-u.Da=u.S.extend({i:function(a,c,d){u.S.call(this,a,c,d);this.a.setAttribute("aria-label","Chapters Menu")}});t=u.Da.prototype;t.A="chapters";t.pa="Chapters";t.className="vjs-chapters-button";t.sa=function(){for(var a=[],c,d=0;d<W(this.b).length;d++)c=W(this.b)[d],c.K()===this.A&&a.push(new u.Y(this.b,{track:c}));return a};
-t.Ja=function(){for(var a=W(this.b),c=0,d=a.length,e,g,h=this.J=[];c<d;c++)if(e=a[c],e.K()==this.A&&e.tb()){if(2>e.readyState()){this.Fd=e;e.d("loaded",u.bind(this,this.Ja));return}g=e;break}a=this.va=new u.la(this.b);a.a.appendChild(u.e("li",{className:"vjs-menu-title",innerHTML:u.$(this.A),wd:-1}));if(g){e=g.fa;for(var k,c=0,d=e.length;c<d;c++)k=e[c],k=new u.Wa(this.b,{track:g,cue:k}),h.push(k),a.Z(k)}0<this.J.length&&this.show();return a};
-u.Wa=u.N.extend({i:function(a,c){var d=this.ca=c.track,e=this.cue=c.cue,g=a.currentTime();c.label=e.text;c.selected=e.startTime<=g&&g<e.ua;u.N.call(this,a,c);d.d("cuechange",u.bind(this,this.update))}});u.Wa.prototype.p=function(){u.N.prototype.p.call(this);this.b.currentTime(this.cue.startTime);this.update(this.cue.startTime)};u.Wa.prototype.update=function(){var a=this.cue,c=this.b.currentTime();this.selected(a.startTime<=c&&c<a.ua)};
-u.k.B(u.Ea.prototype.g.children,{subtitlesButton:{},captionsButton:{},chaptersButton:{}});
-if("undefined"!==typeof window.JSON&&"function"===window.JSON.parse)u.JSON=window.JSON;else{u.JSON={};var Z=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;u.JSON.parse=function(a,c){function d(a,e){var k,r,n=a[e];if(n&&"object"===typeof n)for(k in n)Object.prototype.hasOwnProperty.call(n,k)&&(r=d(n,k),r!==b?n[k]=r:delete n[k]);return c.call(a,e,n)}var e;a=String(a);Z.lastIndex=0;Z.test(a)&&(a=a.replace(Z,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));
-if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return e=eval("("+a+")"),"function"===typeof c?d({"":e},""):e;throw new SyntaxError("JSON.parse(): invalid or malformed JSON data");}}
-u.cc=function(){var a,c,d=document.getElementsByTagName("video");if(d&&0<d.length)for(var e=0,g=d.length;e<g;e++)if((c=d[e])&&c.getAttribute)c.player===b&&(a=c.getAttribute("data-setup"),a!==j&&(a=u.JSON.parse(a||"{}"),v(c,a)));else{u.jb();break}else u.Ac||u.jb()};u.jb=function(){setTimeout(u.cc,1)};"complete"===document.readyState?u.Ac=f:u.U(window,"load",function(){u.Ac=f});u.jb();u.ld=function(a,c){u.w.prototype[a]=c};var ha=this;ha.Bd=f;function $(a,c){var d=a.split("."),e=ha;!(d[0]in e)&&e.execScript&&e.execScript("var "+d[0]);for(var g;d.length&&(g=d.shift());)!d.length&&c!==b?e[g]=c:e=e[g]?e[g]:e[g]={}};$("videojs",u);$("_V_",u);$("videojs.options",u.options);$("videojs.players",u.wa);$("videojs.cache",u.qa);$("videojs.Component",u.c);u.c.prototype.player=u.c.prototype.L;u.c.prototype.dispose=u.c.prototype.D;u.c.prototype.createEl=u.c.prototype.e;u.c.prototype.el=u.c.prototype.v;u.c.prototype.addChild=u.c.prototype.Z;u.c.prototype.children=u.c.prototype.children;u.c.prototype.on=u.c.prototype.d;u.c.prototype.off=u.c.prototype.n;u.c.prototype.one=u.c.prototype.U;u.c.prototype.trigger=u.c.prototype.j;
-u.c.prototype.triggerReady=u.c.prototype.Ta;u.c.prototype.show=u.c.prototype.show;u.c.prototype.hide=u.c.prototype.C;u.c.prototype.width=u.c.prototype.width;u.c.prototype.height=u.c.prototype.height;u.c.prototype.dimensions=u.c.prototype.Tc;u.c.prototype.ready=u.c.prototype.M;u.c.prototype.addClass=u.c.prototype.m;u.c.prototype.removeClass=u.c.prototype.t;$("videojs.Player",u.w);u.w.prototype.dispose=u.w.prototype.D;u.w.prototype.requestFullScreen=u.w.prototype.xa;u.w.prototype.cancelFullScreen=u.w.prototype.nb;
-u.w.prototype.bufferedPercent=u.w.prototype.Ia;u.w.prototype.usingNativeControls=u.w.prototype.Pb;$("videojs.MediaLoader",u.Kc);$("videojs.TextTrackDisplay",u.Zb);$("videojs.ControlBar",u.Ea);$("videojs.Button",u.q);$("videojs.PlayToggle",u.Wb);$("videojs.FullscreenToggle",u.Fa);$("videojs.BigPlayButton",u.Va);$("videojs.LoadingSpinner",u.Ub);$("videojs.CurrentTimeDisplay",u.Xa);$("videojs.DurationDisplay",u.Ya);$("videojs.TimeDivider",u.$b);$("videojs.RemainingTimeDisplay",u.eb);
-$("videojs.Slider",u.O);$("videojs.ProgressControl",u.cb);$("videojs.SeekBar",u.Xb);$("videojs.LoadProgressBar",u.$a);$("videojs.PlayProgressBar",u.Vb);$("videojs.SeekHandle",u.fb);$("videojs.VolumeControl",u.hb);$("videojs.VolumeBar",u.gb);$("videojs.VolumeLevel",u.ac);$("videojs.VolumeMenuButton",u.na);$("videojs.VolumeHandle",u.ib);$("videojs.MuteToggle",u.da);$("videojs.PosterImage",u.bb);$("videojs.Menu",u.la);$("videojs.MenuItem",u.N);$("videojs.MenuButton",u.R);u.R.prototype.createItems=u.R.prototype.sa;
-u.S.prototype.createItems=u.S.prototype.sa;u.Da.prototype.createItems=u.Da.prototype.sa;$("videojs.SubtitlesButton",u.Ga);$("videojs.CaptionsButton",u.Ca);$("videojs.ChaptersButton",u.Da);$("videojs.MediaTechController",u.r);u.r.prototype.features=u.r.prototype.l;u.r.prototype.l.volumeControl=u.r.prototype.l.zc;u.r.prototype.l.fullscreenResize=u.r.prototype.l.Gd;u.r.prototype.l.progressEvents=u.r.prototype.l.Kd;u.r.prototype.l.timeupdateEvents=u.r.prototype.l.Pd;$("videojs.Html5",u.o);
-u.o.Events=u.o.Za;u.o.isSupported=u.o.isSupported;u.o.canPlaySource=u.o.lb;u.o.prototype.setCurrentTime=u.o.prototype.pd;u.o.prototype.setVolume=u.o.prototype.ud;u.o.prototype.setMuted=u.o.prototype.sd;u.o.prototype.setPreload=u.o.prototype.td;u.o.prototype.setAutoplay=u.o.prototype.od;u.o.prototype.setLoop=u.o.prototype.rd;$("videojs.Flash",u.f);u.f.isSupported=u.f.isSupported;u.f.canPlaySource=u.f.lb;u.f.onReady=u.f.onReady;$("videojs.TextTrack",u.X);u.X.prototype.label=u.X.prototype.label;
-$("videojs.CaptionsTrack",u.Sb);$("videojs.SubtitlesTrack",u.Yb);$("videojs.ChaptersTrack",u.Tb);$("videojs.autoSetup",u.cc);$("videojs.plugin",u.ld);$("videojs.createTimeRange",u.sb);})();
diff --git a/lazystarter.sh b/lazystarter.sh
index 41994015..98362794 100755
--- a/lazystarter.sh
+++ b/lazystarter.sh
@@ -18,9 +18,35 @@
 
 selfname=$(basename "$0")
 local_bin="./bin"
+
+# Test whether or not gunicorn is installed
+# -----------------------------------------
+if [ -f "${local_bin}/python" ]; then
+    our_python="${local_bin}/python";
+else
+    our_python="python";
+fi
+
+if $our_python -c "import sys
+try:
+    import gunicorn
+    sys.exit(0)
+except ImportError:
+    sys.exit(1)
+"; then
+    use_gunicorn=true;
+else
+    use_gunicorn=false;
+fi
+# -----------------------------------------
+
 case "$selfname" in
     lazyserver.sh)
-        starter_cmd=paster
+        if $use_gunicorn; then
+            starter_cmd=gunicorn;
+        else
+            starter_cmd=paster;
+        fi
         ini_prefix=paste
         ;;
     lazycelery.sh)
@@ -36,9 +62,14 @@ esac
 if [ "$1" = "-h" ]; then
     echo "$0 [-h] [-c filename.ini] [ARGS_to_${starter_cmd} ...]"
     echo ""
-    echo "   For example:"
-    echo "         $0 -c fcgi.ini port_number=23371"
-    echo "     or: $0 --server-name=fcgi --log-file=paste.log"
+    if $use_gunicorn; then
+        echo "   For Gunicorn settings, see at:"
+        echo "      http://docs.gunicorn.org/en/19.0/settings.html"
+    else
+        echo "   For example:"
+        echo "         $0 -c fcgi.ini port_number=23371"
+        echo "     or: $0 --server-name=fcgi --log-file=paste.log"
+    fi
     echo ""
     echo "   The configfile defaults to ${ini_prefix}_local.ini,"
     echo "   if that is readable, otherwise ${ini_prefix}.ini."
@@ -67,11 +98,25 @@ else
     exit 1
 fi
 
+# If the user somehow doesn't have a mediagoblin.ini
+# (maybe they aren't using make) give them one
+#   ... this doesn't fulfill all conditions maybe, but is a stopgap
+#   that doesn't have noticable race conditions
+if [ -f mediagoblin.example.ini ] && \
+    [ ! -f mediagoblin.ini ]; then
+    echo "No mediagoblin.ini found, making one";
+    cp --no-clobber mediagoblin.example.ini mediagoblin.ini;
+fi
+
 set -x
 export CELERY_ALWAYS_EAGER=true
 case "$selfname" in
     lazyserver.sh)
-        $starter serve "$ini_file" "$@" --reload
+        if $use_gunicorn; then
+            $starter --paste "$ini_file" --log-file=- $@;
+        else
+            $starter serve "$ini_file" "$@" --reload;
+        fi
         ;;
     lazycelery.sh)
         MEDIAGOBLIN_CONFIG="${ini_file}" \
diff --git a/m4/python.m4 b/m4/python.m4
index f8b197fe..58aef433 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Brandon Invergo <brandon@invergo.net>
+# Copyright 2012, 2013, 2014 Brandon Invergo <brandon@invergo.net>
 #
 # This file is part of pyconfigure.  This program is free
 # software; you can redistribute it and/or modify it under the
@@ -107,69 +107,64 @@ m4_define([_AC_LANG_CALL(Python)],
 
 
 AC_DEFUN([AC_LANG_COMPILER(Python)],
-[AC_REQUIRE([AC_PROG_PYTHON])])
+[AC_REQUIRE([PC_PROG_PYTHON])])
 
 
-# PC_INIT([MIN_VER], [MAX_VER]) 
+# PC_INIT([MIN-VERSION], [MAX-VERSION]) 
 # -----------------------------
 # Initialize pyconfigure, finding a Python interpreter with a given
 # minimum and/or maximum version. 
 AC_DEFUN([PC_INIT],
-[AC_ARG_VAR([PYTHON], [the Python interpreter])
-dnl The default minimum version is 2.0
-m4_define_default([pc_min_ver], m4_ifval([$1], [$1], [2.0]))
-dnl The default maximum version is 3.3
-m4_define_default([pc_max_ver], m4_ifval([$2], [$2], [3.3]))
-dnl Build up a list of possible interpreter names. 
-m4_define_default([_PC_PYTHON_INTERPRETER_LIST],
-dnl Construct a comma-separated list of interpreter names (python2.6, 
-dnl python2.7, etc). We only care about the first 3 characters of the
-dnl version strings (major-dot-minor; not 
-dnl major-dot-minor-dot-bugfix[-dot-whatever])
-        [m4_foreach([pc_ver], 
-                    m4_esyscmd_s(seq -s[[", "]] -f["[[%.1f]]"] m4_substr(pc_max_ver, [0], [3]) -0.1 m4_substr(pc_min_ver, [0], [3])),
-dnl Remove python2.8 and python2.9 since they will never exist
-                    [m4_bmatch(pc_ver, [2.[89]], [], [python]pc_ver)] ) \
-dnl If we want some Python 3 versions (max version >= 3.0), 
-dnl also search for "python3"
-m4_if(m4_version_compare(pc_max_ver, [2.9]), [1], [python3], []) \
-dnl If we want some Python 2 versions (min version <= 2.7),
-dnl also search for "python2". Finally, also search for plain ol' "python"
-m4_if(m4_version_compare(pc_min_ver, [2.8]), [-1], [python2], []) [python]])
-dnl Do the actual search at last.
-AC_PATH_PROGS(PYTHON, [_PC_PYTHON_INTERPRETER_LIST])
+[PC_PROG_PYTHON([], [$1], [$2])
 dnl If we found something, do a sanity check that the interpreter really
 dnl has the version its name would suggest.
 m4_ifval([PYTHON],
-        [PC_PYTHON_VERIFY_VERSION([>=], [pc_min_ver],
-                  [AC_MSG_RESULT([yes])],
+        [PC_PYTHON_VERIFY_VERSION([>=], [pc_min_ver], [],
                   [AC_MSG_FAILURE([No compatible Python interpreter found. If you're sure that you have one, try setting the PYTHON environment variable to the location of the interpreter.])])])
 m4_ifval([PYTHON],
-        [PC_PYTHON_VERIFY_VERSION([<=], [pc_max_ver], 
-                  [AC_MSG_RESULT([yes])], 
+        [PC_PYTHON_VERIFY_VERSION([<=], [pc_max_ver], [],
                   [AC_MSG_FAILURE([No compatible Python interpreter found. If you're sure that you have one, try setting the PYTHON environment variable to the location of the interpreter.])])])
 ])# PC_INIT
 
-# AC_PROG_PYTHON(PROG-TO-CHECK-FOR)
+# PC_PROG_PYTHON([PROG-TO-CHECK-FOR], [MIN-VERSION], [MAX-VERSION])
 # ---------------------------------
 # Find a Python interpreter.  Python versions prior to 2.0 are not
 # supported. (2.0 was released on October 16, 2000).
-AC_DEFUN([AC_PROG_PYTHON],
+AC_DEFUN_ONCE([PC_PROG_PYTHON],
 [AC_ARG_VAR([PYTHON], [the Python interpreter])
+dnl The default minimum version is 2.0
+m4_define_default([pc_min_ver], m4_ifval([$2], [$2], [2.0]))
+dnl The default maximum version is 3.3
+m4_define_default([pc_max_ver], m4_ifval([$3], [$3], [4.0]))
+dnl Build up a list of possible interpreter names. 
 m4_define_default([_PC_PYTHON_INTERPRETER_LIST],
-                  [python python3 python3.3 python3.2 python3.1 python3.0 python2 python2.7 dnl
-                   python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
+    [[python] \
+dnl If we want some Python 3 versions (max version >= 3.0), 
+dnl also search for "python3"
+     m4_if(m4_version_compare(pc_max_ver, [2.9]), [1], [python3], []) \
+dnl If we want some Python 2 versions (min version <= 2.7),
+dnl also search for "python2".
+     m4_if(m4_version_compare(pc_min_ver, [2.8]), [-1], [python2], []) \
+dnl Construct a comma-separated list of interpreter names (python2.6, 
+dnl python2.7, etc). We only care about the first 3 characters of the
+dnl version strings (major-dot-minor; not 
+dnl major-dot-minor-dot-bugfix[-dot-whatever])
+     m4_foreach([pc_ver], 
+                    m4_esyscmd_s(seq -s[[", "]] -f["[[%.1f]]"] m4_substr(pc_max_ver, [0], [3]) -0.1 m4_substr(pc_min_ver, [0], [3])),
+dnl Remove python2.8 and python2.9 since they will never exist
+                    [m4_bmatch(pc_ver, [2.[89]], [], [python]pc_ver)])])
+dnl Do the actual search at last.
 m4_ifval([$1],
 	[AC_PATH_PROGS(PYTHON, [$1 _PC_PYTHON_INTERPRETER_LIST])],
 	[AC_PATH_PROGS(PYTHON, [_PC_PYTHON_INTERPRETER_LIST])])
-])
+])# PC_PROG_PYTHON
   
 
 # PC_PYTHON_PROG_PYTHON_CONFIG(PROG-TO-CHECK-FOR)
 # ----------------------------------------------
 # Find the python-config program
 AC_DEFUN([PC_PYTHON_PROG_PYTHON_CONFIG],
-[AC_REQUIRE([PC_INIT])[]dnl
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
 AC_ARG_VAR([PYTHON_CONFIG], [the Python-config program])
 dnl python-config's binary name is normally based on the Python interpreter's
 dnl binary name (i.e. python2.7 -> python2.7-config)
@@ -180,9 +175,10 @@ m4_ifval([$1],
 ]) # PC_PYTHON_PROG_PYTHON_CONFIG
 
 
-# PC_PYTHON_VERIFY_VERSION(RELATION, VERSION, [ACTION-IF-TRUE], [ACTION-IF-NOT-FOUND])
+# PC_PYTHON_VERIFY_VERSION([RELATION], [VERSION], [ACTION-IF-TRUE], [ACTION-IF-FALSE])
 # ---------------------------------------------------------------------------
-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
+# Run ACTION-IF-TRUE if the Python interpreter PROG has version [RELATION] VERSION.
+# i.e if RELATION is "<", check if PROG has a version number less than VERSION.
 # Run ACTION-IF-FALSE otherwise.
 # Specify RELATION as any mathematical comparison "<", ">", "<=", ">=", "==" or "!="
 # This test uses sys.hexversion instead of the string equivalent (first
@@ -191,7 +187,7 @@ m4_ifval([$1],
 AC_DEFUN([PC_PYTHON_VERIFY_VERSION],
 [m4_define([pc_python_safe_ver], m4_bpatsubsts($2, [\.], [_]))
 AC_CACHE_CHECK([if Python $1 '$2'],
-    [[pc_cv_python_min_version_]pc_python_safe_ver],
+    [[pc_cv_python_req_version_]pc_python_safe_ver],
     [AC_LANG_PUSH(Python)[]dnl
      AC_RUN_IFELSE(
         [AC_LANG_PROGRAM([dnl
@@ -205,13 +201,17 @@ import sys
     # xrange is not present in Python 3.0 and range returns an iterator
     for i in list(range(4)):
         reqverhex = (reqverhex << 8) + reqver[[i]]
+    # the final 8 bits are "0xf0" for final versions, which are all
+    # we'll test against, since it's doubtful that a released software
+    # will depend on an alpha- or beta-state Python.
+    reqverhex += 0xf0
     if sys.hexversion $1 reqverhex:
         sys.exit()
     else:
         sys.exit(1)
 ])], 
-         [[pc_cv_python_req_version_]pc_python_safe_ver="yes"], 
-         [[pc_cv_python_req_version_]pc_python_safe_ver="no"])
+         [[pc_cv_python_req_version_]pc_python_safe_ver=yes], 
+         [[pc_cv_python_req_version_]pc_python_safe_ver=no])
      AC_LANG_POP(Python)[]dnl
     ])
 AS_IF([test "$[pc_cv_python_req_version_]pc_python_safe_ver" = "no"], [$4], [$3])
@@ -224,17 +224,17 @@ AS_IF([test "$[pc_cv_python_req_version_]pc_python_safe_ver" = "no"], [$4], [$3]
 # the best way to do this; it's what "site.py" does in the standard
 # library.
 AC_DEFUN([PC_PYTHON_CHECK_VERSION],
-[AC_REQUIRE([PC_INIT])[]dnl
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
 AC_CACHE_CHECK([for $1 version], 
     [pc_cv_python_version],
     [AC_LANG_PUSH(Python)[]dnl
-     AC_LANG_CONFTEST([
-         AC_LANG_PROGRAM([dnl
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
 import sys
 ], [dnl
     sys.stdout.write(sys.version[[:3]])
-])])
-     pc_cv_python_version=`$PYTHON conftest.py`
+])],
+                   [pc_cv_python_version=`./conftest`],
+                   [AC_MSG_FAILURE([failed to run Python program])])
      AC_LANG_POP(Python)[]dnl
     ])
 AC_SUBST([PYTHON_VERSION], [$pc_cv_python_version])
@@ -255,11 +255,15 @@ AC_CACHE_CHECK([for Python prefix], [pc_cv_python_prefix],
     pc_cv_python_prefix=`$PYTHON_CONFIG --prefix 2>&AS_MESSAGE_LOG_FD`
 else
     AC_LANG_PUSH(Python)[]dnl
-    pc_cv_python_prefix=AC_LANG_CONFTEST([AC_LANG_PROGRAM([dnl
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
 import sys
 ], [dnl
-    sys.exit(sys.prefix)
-])])
+    sys.stdout.write(sys.prefix)
+])], [pc_cv_python_prefix=`./conftest`;
+      if test $? != 0; then
+         AC_MSG_FAILURE([could not determine Python prefix])
+      fi],
+      [AC_MSG_FAILURE([failed to run Python program])])
     AC_LANG_POP(Python)[]dnl
 fi])
 AC_SUBST([PYTHON_PREFIX], [$pc_cv_python_prefix])])
@@ -276,11 +280,16 @@ AC_CACHE_CHECK([for Python exec-prefix], [pc_cv_python_exec_prefix],
     pc_cv_python_exec_prefix=`$PYTHON_CONFIG --exec-prefix 2>&AS_MESSAGE_LOG_FD`
 else
     AC_LANG_PUSH(Python)[]dnl
-    pc_cv_python_exec_prefix=AC_LANG_CONFTEST([AC_LANG_PROGRAM([dnl
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
 import sys
 ], [dnl
-    sys.exit(sys.exec_prefix)
-])])
+    sys.stdout.write(sys.exec_prefix)
+])],
+        [pc_cv_python_exec_prefix=`./conftest`;
+         if test $? != 0; then
+            AC_MSG_FAILURE([could not determine Python exec_prefix])
+         fi],
+         [AC_MSG_FAILURE([failed to run Python program])])
     AC_LANG_POP(Python)[]dnl
 fi
 ])
@@ -420,18 +429,19 @@ AC_SUBST([PYTHON_ABI_FLAGS], [$pc_cv_python_abi_flags])])
 # At times (like when building shared libraries) you may want
 # to know which OS platform Python thinks this is.
 AC_DEFUN([PC_PYTHON_CHECK_PLATFORM],
-[AC_REQUIRE([PC_INIT])[]dnl
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
 dnl Get the platform from within Python (sys.platform)
-AC_CACHE_CHECK([for Python platform], 
-    [pc_cv_python_platform],
+AC_CACHE_CHECK([for Python platform], [pc_cv_python_platform],
     [AC_LANG_PUSH(Python)[]dnl
-     AC_LANG_CONFTEST([
-         AC_LANG_PROGRAM([dnl
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
 import sys
 ], [dnl
     sys.stdout.write(sys.platform)
-])])
-    pc_cv_python_platform=`$PYTHON conftest.py`
+])], [pc_cv_python_platform=`./conftest`;
+     if test $? != 0; then
+        AC_MSG_FAILURE([could not determine Python platform])
+     fi],
+     [AC_MSG_FAILURE([failed to run Python program])])
     AC_LANG_POP(Python)[]dnl
    ])
 AC_SUBST([PYTHON_PLATFORM], [$pc_cv_python_platform])
@@ -443,7 +453,7 @@ AC_SUBST([PYTHON_PLATFORM], [$pc_cv_python_platform])
 # The directory to which new libraries are installed (i.e. the
 # "site-packages" directory.
 AC_DEFUN([PC_PYTHON_CHECK_SITE_DIR],
-[AC_REQUIRE([PC_INIT])AC_REQUIRE([PC_PYTHON_CHECK_PREFIX])[]dnl
+[AC_REQUIRE([PC_PROG_PYTHON])AC_REQUIRE([PC_PYTHON_CHECK_PREFIX])[]dnl
 AC_CACHE_CHECK([for Python site-packages directory],
     [pc_cv_python_site_dir],
     [AC_LANG_PUSH(Python)[]dnl
@@ -453,8 +463,7 @@ AC_CACHE_CHECK([for Python site-packages directory],
      else
        pc_py_prefix=$prefix
      fi
-     AC_LANG_CONFTEST([
-         AC_LANG_PROGRAM([dnl
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
 import sys
 from platform import python_implementation
 # sysconfig in CPython 2.7 doesn't work in virtualenv
@@ -475,8 +484,8 @@ else:
     sitedir = sysconfig.get_path('purelib', vars={'base':'$pc_py_prefix'})
 ], [dnl
     sys.stdout.write(sitedir)
-])])
-     pc_cv_python_site_dir=`$PYTHON conftest.py`
+])], [pc_cv_python_site_dir=`./conftest`],
+     [AC_MSG_FAILURE([failed to run Python program])])
      AC_LANG_POP(Python)[]dnl
      case $pc_cv_python_site_dir in
      $pc_py_prefix*)
@@ -500,14 +509,14 @@ AC_SUBST([pythondir], [\${prefix}/$pc_cv_python_site_dir])])# PC_PYTHON_CHECK_SI
 # $PACKAGE directory under PYTHON_SITE_DIR
 AC_DEFUN([PC_PYTHON_SITE_PACKAGE_DIR],
 [AC_REQUIRE([PC_PYTHON_CHECK_SITE_DIR])[]dnl
-AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])])
+AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE_NAME])])
 
 
 # PC_PYTHON_CHECK_EXEC_DIR
 # ------------------------
 # directory for installing python extension modules (shared libraries)
 AC_DEFUN([PC_PYTHON_CHECK_EXEC_DIR],
-[AC_REQUIRE([PC_INIT])AC_REQUIRE([PC_PYTHON_CHECK_EXEC_PREFIX])[]dnl
+[AC_REQUIRE([PC_PROG_PYTHON])AC_REQUIRE([PC_PYTHON_CHECK_EXEC_PREFIX])[]dnl
   AC_CACHE_CHECK([for Python extension module directory],
     [pc_cv_python_exec_dir],
     [AC_LANG_PUSH(Python)[]dnl
@@ -517,8 +526,7 @@ AC_DEFUN([PC_PYTHON_CHECK_EXEC_DIR],
      else
        pc_py_exec_prefix=$pc_cv_python_exec_prefix
      fi
-     AC_LANG_CONFTEST([
-         AC_LANG_PROGRAM([dnl
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
 import sys
 from platform import python_implementation
 # sysconfig in CPython 2.7 doesn't work in virtualenv
@@ -539,8 +547,8 @@ else:
     sitedir = sysconfig.get_path('purelib', vars={'platbase':'$pc_py_exec_prefix'})
 ], [dnl
     sys.stdout.write(sitedir)
-])])
-     pc_cv_python_exec_dir=`$PYTHON conftest.py`
+])], [pc_cv_python_exec_dir=`./conftest`],
+     [AC_MSG_FAILURE([failed to run Python program])])
      AC_LANG_POP(Python)[]dnl
      case $pc_cv_python_exec_dir in
      $pc_py_exec_prefix*)
@@ -565,7 +573,7 @@ AC_SUBST([pyexecdir], [\${exec_prefix}/$pc_cv_python_pyexecdir])]) #PY_PYTHON_CH
 # $PACKAGE directory under PYTHON_SITE_DIR
 AC_DEFUN([PC_PYTHON_EXEC_PACKAGE_DIR],
 [AC_REQUIRE([PC_PYTHON_CHECK_EXEC_DIR])[]dnl
-AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])])
+AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE_NAME])])
 
 
 ## -------------------------------------------- ##
@@ -577,7 +585,7 @@ AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])])
 # ----------------------------------------------------------------------
 # Macro for checking if a Python library is installed
 AC_DEFUN([PC_PYTHON_CHECK_MODULE],
-[AC_REQUIRE([PC_INIT])[]dnl
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
 m4_define([pc_python_safe_mod], m4_bpatsubsts($1, [\.], [_]))
 AC_CACHE_CHECK([for Python '$1' library],
     [[pc_cv_python_module_]pc_python_safe_mod],
@@ -605,7 +613,7 @@ AS_IF([test "$[pc_cv_python_module_]pc_python_safe_mod" = "no"], [$3], [$2])
 # Check to see if a given function call, optionally from a module, can
 # be successfully called
 AC_DEFUN([PC_PYTHON_CHECK_FUNC],
-[AC_REQUIRE([PC_INIT])[]dnl
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
 m4_define([pc_python_safe_mod], m4_bpatsubsts($1, [\.], [_]))
 AC_CACHE_CHECK([for Python m4_ifnblank($1, '$1.$2()', '$2()') function],
     [[pc_cv_python_func_]pc_python_safe_mod[_$2]],
diff --git a/mediagoblin.ini b/mediagoblin.example.ini
index 5e2477a4..17b123fb 100644
--- a/mediagoblin.ini
+++ b/mediagoblin.example.ini
@@ -5,6 +5,12 @@
 # It defines types and defaults so it’s a good place to look for documentation
 # or to find hidden options that we didn’t tell you about. :)
 
+# To change the directory you should make sure you change the
+# directory in paste.ini and/or your webserver configuration.
+#
+# [DEFAULT]
+# data_basedir = "/var/lib/mediagoblin"
+
 [mediagoblin]
 direct_remote_path = /mgoblin_static/
 email_sender_address = "notice@mediagoblin.example.org"
@@ -24,7 +30,7 @@ allow_registration = true
 allow_reporting = true
 
 ## Uncomment this to put some user-overriding templates here
-# local_templates = %(here)s/user_dev/templates/
+# local_templates = %(data_basedir)s/templates/
 
 ## You can set your theme by specifying this (not specifying it will
 ## use the default theme).  Run `gmg assetlink` to apply the change.
@@ -37,10 +43,10 @@ allow_reporting = true
 
 user_privilege_scheme = "uploader,commenter,reporter"
 [storage:queuestore]
-base_dir = %(here)s/user_dev/media/queue
+base_dir = %(data_basedir)s/media/queue
 
 [storage:publicstore]
-base_dir = %(here)s/user_dev/media/public
+base_dir = %(data_basedir)s/media/public
 base_url = /mgoblin_media/
 
 [celery]
diff --git a/mediagoblin/_compat.py b/mediagoblin/_compat.py
new file mode 100644
index 00000000..9164d5fc
--- /dev/null
+++ b/mediagoblin/_compat.py
@@ -0,0 +1,32 @@
+import functools
+import warnings
+
+import six
+
+if six.PY3:
+    from email.mime.text import MIMEText
+else:
+    from email.MIMEText import MIMEText
+
+
+def encode_to_utf8(method):
+    def wrapper(self):
+        if six.PY2 and isinstance(method(self), six.text_type):
+            return method(self).encode('utf-8')
+        return method(self)
+    functools.update_wrapper(wrapper, method, ['__name__', '__doc__'])
+    return wrapper
+
+
+# based on django.utils.encoding.python_2_unicode_compatible
+def py2_unicode(klass):
+    if six.PY2:
+        if '__str__' not in klass.__dict__:
+            warnings.warn("@py2_unicode cannot be applied "
+                          "to %s because it doesn't define __str__()." %
+                          klass.__name__)
+        klass.__unicode__ = klass.__str__
+        klass.__str__ = encode_to_utf8(klass.__unicode__)
+        if '__repr__' in klass.__dict__:
+            klass.__repr__ = encode_to_utf8(klass.__repr__)
+    return klass
diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py.in
index 016da938..d180f750 100644
--- a/mediagoblin/_version.py
+++ b/mediagoblin/_version.py.in
@@ -23,4 +23,4 @@
 
 # see http://www.python.org/dev/peps/pep-0386/
 
-__version__ = "0.7.1"
+__version__ = "@PACKAGE_VERSION@"
diff --git a/mediagoblin/federation/__init__.py b/mediagoblin/api/__init__.py
index 621845ba..621845ba 100644
--- a/mediagoblin/federation/__init__.py
+++ b/mediagoblin/api/__init__.py
diff --git a/mediagoblin/federation/decorators.py b/mediagoblin/api/decorators.py
index 3dd6264e..3dd6264e 100644
--- a/mediagoblin/federation/decorators.py
+++ b/mediagoblin/api/decorators.py
diff --git a/mediagoblin/api/routing.py b/mediagoblin/api/routing.py
new file mode 100644
index 00000000..ea231b63
--- /dev/null
+++ b/mediagoblin/api/routing.py
@@ -0,0 +1,144 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from mediagoblin.tools.routing import add_route
+
+# Add user profile
+add_route(
+    "media.api.user",
+    "/api/user/<string:username>/",
+    "mediagoblin.api.views:user_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.user.profile",
+    "/api/user/<string:username>/profile/",
+    "mediagoblin.api.views:profile_endpoint",
+    match_slash=False
+)
+
+# Inbox and Outbox (feed)
+add_route(
+    "mediagoblin.api.feed",
+    "/api/user/<string:username>/feed/",
+    "mediagoblin.api.views:feed_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.feed_major",
+    "/api/user/<string:username>/feed/major/",
+    "mediagoblin.api.views:feed_major_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.feed_minor",
+    "/api/user/<string:username>/feed/minor/",
+    "mediagoblin.api.views:feed_minor_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.user.uploads",
+    "/api/user/<string:username>/uploads/",
+    "mediagoblin.api.views:uploads_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.inbox",
+    "/api/user/<string:username>/inbox/",
+    "mediagoblin.api.views:inbox_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.inbox_minor",
+    "/api/user/<string:username>/inbox/minor/",
+    "mediagoblin.api.views:inbox_minor_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.inbox_major",
+    "/api/user/<string:username>/inbox/major/",
+    "mediagoblin.api.views:inbox_major_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.inbox_direct",
+    "/api/user/<string:username>/inbox/direct/",
+    "mediagoblin.api.views:inbox_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.inbox_direct_minor",
+    "/api/user/<string:username>/inbox/direct/minor/",
+    "mediagoblin.api.views:inbox_minor_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.inbox_direct_major",
+    "/api/user/<string:username>/inbox/direct/major/",
+    "mediagoblin.api.views:inbox_major_endpoint",
+    match_slash=False
+)
+
+# object endpoints
+add_route(
+    "mediagoblin.api.object",
+    "/api/<string:object_type>/<string:id>/",
+    "mediagoblin.api.views:object_endpoint",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.api.object.comments",
+    "/api/<string:object_type>/<string:id>/comments/",
+    "mediagoblin.api.views:object_comments",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.webfinger.well-known.host-meta",
+    "/.well-known/host-meta",
+    "mediagoblin.api.views:host_meta"
+)
+
+add_route(
+    "mediagoblin.webfinger.well-known.host-meta.json",
+    "/.well-known/host-meta.json",
+    "mediagoblin.api.views:host_meta"
+)
+
+add_route(
+    "mediagoblin.webfinger.well-known.webfinger",
+    "/.well-known/webfinger/",
+    "mediagoblin.api.views:lrdd_lookup",
+    match_slash=False
+)
+
+add_route(
+    "mediagoblin.webfinger.whoami",
+    "/api/whoami/",
+    "mediagoblin.api.views:whoami",
+    match_slash=False
+)
diff --git a/mediagoblin/federation/views.py b/mediagoblin/api/views.py
index 724d349c..6095a721 100644
--- a/mediagoblin/federation/views.py
+++ b/mediagoblin/api/views.py
@@ -20,11 +20,13 @@ import mimetypes
 
 from werkzeug.datastructures import FileStorage
 
-from mediagoblin.decorators import oauth_required
-from mediagoblin.federation.decorators import user_has_privilege
-from mediagoblin.db.models import User, MediaEntry, MediaComment
+from mediagoblin.decorators import oauth_required, require_active_login
+from mediagoblin.api.decorators import user_has_privilege
+from mediagoblin.db.models import User, MediaEntry, MediaComment, Activity
+from mediagoblin.tools.federation import create_activity, create_generator
+from mediagoblin.tools.routing import extract_url_arguments
 from mediagoblin.tools.response import redirect, json_response, json_error, \
-                                       render_to_response
+                                       render_404, render_to_response
 from mediagoblin.meddleware.csrf import csrf_exempt
 from mediagoblin.submit.lib import new_upload_entry, api_upload_request, \
                                     api_add_to_feed
@@ -130,7 +132,97 @@ def uploads_endpoint(request):
 
 @oauth_required
 @csrf_exempt
-def feed_endpoint(request):
+def inbox_endpoint(request, inbox=None):
+    """ This is the user's inbox
+
+    Currently because we don't have the ability to represent the inbox in the
+    database this is not a "real" inbox in the pump.io/Activity streams 1.0
+    sense but instead just gives back all the data on the website
+
+    inbox: allows you to pass a query in to limit inbox scope
+    """
+    username = request.matchdict["username"]
+    user = User.query.filter_by(username=username).first()
+
+    if user is None:
+        return json_error("No such 'user' with id '{0}'".format(username), 404)
+
+
+    # Only the user who's authorized should be able to read their inbox
+    if user.id != request.user.id:
+        return json_error(
+            "Only '{0}' can read this inbox.".format(user.username),
+            403
+        )
+
+    if inbox is None:
+        inbox = Activity.query
+
+    # Count how many items for the "totalItems" field
+    total_items = inbox.count()
+
+    # We want to make a query for all media on the site and then apply GET
+    # limits where we can.
+    inbox = inbox.order_by(Activity.published.desc())
+
+    # Limit by the "count" (default: 20)
+    try:
+        limit = int(request.args.get("count", 20))
+    except ValueError:
+        limit = 20
+
+    # Prevent the count being too big (pump uses 200 so we shall)
+    limit = limit if limit <= 200 else 200
+
+    # Apply the limit
+    inbox = inbox.limit(limit)
+
+    # Offset (default: no offset - first <count> results)
+    inbox = inbox.offset(request.args.get("offset", 0))
+
+    # build the inbox feed
+    feed = {
+        "displayName": "Activities for {0}".format(user.username),
+        "author": user.serialize(request),
+        "objectTypes": ["activity"],
+        "url": request.base_url,
+        "links": {"self": {"href": request.url}},
+        "items": [],
+        "totalItems": total_items,
+    }
+
+    for activity in inbox:
+        try:
+            feed["items"].append(activity.serialize(request))
+        except AttributeError:
+            # As with the feed endpint this occurs because of how we our
+            # hard-deletion method. Some activites might exist where the
+            # Activity object and/or target no longer exist, for this case we
+            # should just skip them.
+            pass
+
+    return json_response(feed)
+
+@oauth_required
+@csrf_exempt
+def inbox_minor_endpoint(request):
+    """ Inbox subset for less important Activities """
+    inbox = Activity.query.filter(
+        (Activity.verb == "update") | (Activity.verb == "delete")
+    )
+
+    return inbox_endpoint(request=request, inbox=inbox)
+
+@oauth_required
+@csrf_exempt
+def inbox_major_endpoint(request):
+    """ Inbox subset for most important Activities """
+    inbox = Activity.query.filter_by(verb="post")
+    return inbox_endpoint(request=request, inbox=inbox)
+
+@oauth_required
+@csrf_exempt
+def feed_endpoint(request, outbox=None):
     """ Handles the user's outbox - /api/user/<username>/feed """
     username = request.matchdict["username"]
     requested_user = User.query.filter_by(username=username).first()
@@ -140,7 +232,7 @@ def feed_endpoint(request):
         return json_error("No such 'user' with id '{0}'".format(username), 404)
 
     if request.data:
-        data = json.loads(request.data)
+        data = json.loads(request.data.decode())
     else:
         data = {"verb": None, "object": {}}
 
@@ -151,7 +243,7 @@ def feed_endpoint(request):
             return json_error("Invalid activity provided.")
 
         # Check that the verb is valid
-        if data["verb"] not in ["post", "update"]:
+        if data["verb"] not in ["post", "update", "delete"]:
             return json_error("Verb not yet implemented", 501)
 
         # We need to check that the user they're posting to is
@@ -177,17 +269,28 @@ def feed_endpoint(request):
                     )
 
                 comment = MediaComment(author=request.user.id)
-                comment.unserialize(data["object"])
+                comment.unserialize(data["object"], request)
                 comment.save()
-                data = {
-                    "verb": "post",
-                    "object": comment.serialize(request)
-                }
-                return json_response(data)
+
+                # Create activity for comment
+                generator = create_generator(request)
+                activity = create_activity(
+                    verb="post",
+                    actor=request.user,
+                    obj=comment,
+                    target=comment.get_entry,
+                    generator=generator
+                )
+
+                return json_response(activity.serialize(request))
 
             elif obj.get("objectType", None) == "image":
                 # Posting an image to the feed
-                media_id = int(data["object"]["id"])
+                media_id = int(extract_url_arguments(
+                    url=data["object"]["id"],
+                    urlmap=request.app.url_map
+                )["id"])
+
                 media = MediaEntry.query.filter_by(id=media_id).first()
 
                 if media is None:
@@ -208,13 +311,15 @@ def feed_endpoint(request):
                         "Invalid 'image' with id '{0}'".format(media_id)
                     )
 
+
+                # Add location if one exists
+                if "location" in data:
+                    Location.create(data["location"], self)
+
                 media.save()
-                api_add_to_feed(request, media)
+                activity = api_add_to_feed(request, media)
 
-                return json_response({
-                    "verb": "post",
-                    "object": media.serialize(request)
-                })
+                return json_response(activity.serialize(request))
 
             elif obj.get("objectType", None) is None:
                 # They need to tell us what type of object they're giving us.
@@ -240,7 +345,10 @@ def feed_endpoint(request):
             if "id" not in obj:
                 return json_error("Object ID has not been specified.")
 
-            obj_id = obj["id"]
+            obj_id = int(extract_url_arguments(
+                url=obj["id"],
+                urlmap=request.app.url_map
+            )["id"])
 
             # Now try and find object
             if obj["objectType"] == "comment":
@@ -264,24 +372,29 @@ def feed_endpoint(request):
                         status=403
                     )
 
-                if not comment.unserialize(data["object"]):
+                if not comment.unserialize(data["object"], request):
                     return json_error(
-                        "Invalid 'comment' with id '{0}'".format(obj_id)
+                        "Invalid 'comment' with id '{0}'".format(obj["id"])
                     )
 
                 comment.save()
 
-                activity = {
-                    "verb": "update",
-                    "object": comment.serialize(request),
-                }
-                return json_response(activity)
+                # Create an update activity
+                generator = create_generator(request)
+                activity = create_activity(
+                    verb="update",
+                    actor=request.user,
+                    obj=comment,
+                    generator=generator
+                )
+
+                return json_response(activity.serialize(request))
 
             elif obj["objectType"] == "image":
                 image = MediaEntry.query.filter_by(id=obj_id).first()
                 if image is None:
                     return json_error(
-                        "No such 'image' with the id '{0}'.".format(obj_id)
+                        "No such 'image' with the id '{0}'.".format(obj["id"])
                     )
 
                 # Check that the person trying to update the comment is
@@ -296,13 +409,113 @@ def feed_endpoint(request):
                     return json_error(
                         "Invalid 'image' with id '{0}'".format(obj_id)
                     )
+                image.generate_slug()
                 image.save()
 
-                activity = {
-                    "verb": "update",
-                    "object": image.serialize(request),
-                }
-                return json_response(activity)
+                # Create an update activity
+                generator = create_generator(request)
+                activity = create_activity(
+                    verb="update",
+                    actor=request.user,
+                    obj=image,
+                    generator=generator
+                )
+
+                return json_response(activity.serialize(request))
+            elif obj["objectType"] == "person":
+                # check this is the same user
+                if "id" not in obj or obj["id"] != requested_user.id:
+                    return json_error(
+                        "Incorrect user id, unable to update"
+                    )
+
+                requested_user.unserialize(obj)
+                requested_user.save()
+
+                generator = create_generator(request)
+                activity = create_activity(
+                    verb="update",
+                    actor=request.user,
+                    obj=requested_user,
+                    generator=generator
+                )
+
+                return json_response(activity.serialize(request))
+
+        elif data["verb"] == "delete":
+            obj = data.get("object", None)
+            if obj is None:
+                return json_error("Could not find 'object' element.")
+
+            if "objectType" not in obj:
+                return json_error("No objectType specified.")
+
+            if "id" not in obj:
+                return json_error("Object ID has not been specified.")
+
+            # Parse out the object ID
+            obj_id = int(extract_url_arguments(
+                url=obj["id"],
+                urlmap=request.app.url_map
+            )["id"])
+
+            if obj.get("objectType", None) == "comment":
+                # Find the comment asked for
+                comment = MediaComment.query.filter_by(
+                    id=obj_id,
+                    author=request.user.id
+                ).first()
+
+                if comment is None:
+                    return json_error(
+                        "No such 'comment' with id '{0}'.".format(obj_id)
+                    )
+
+                # Make a delete activity
+                generator = create_generator(request)
+                activity = create_activity(
+                    verb="delete",
+                    actor=request.user,
+                    obj=comment,
+                    generator=generator
+                )
+
+                # Unfortunately this has to be done while hard deletion exists
+                context = activity.serialize(request)
+
+                # now we can delete the comment
+                comment.delete()
+
+                return json_response(context)
+
+            if obj.get("objectType", None) == "image":
+                # Find the image
+                entry = MediaEntry.query.filter_by(
+                    id=obj_id,
+                    uploader=request.user.id
+                ).first()
+
+                if entry is None:
+                    return json_error(
+                        "No such 'image' with id '{0}'.".format(obj_id)
+                    )
+
+                # Make the delete activity
+                generator = create_generator(request)
+                activity = create_activity(
+                    verb="delete",
+                    actor=request.user,
+                    obj=entry,
+                    generator=generator
+                )
+
+                # This is because we have hard deletion
+                context = activity.serialize(request)
+
+                # Now we can delete the image
+                entry.delete()
+
+                return json_response(context)
 
     elif request.method != "GET":
         return json_error(
@@ -310,62 +523,86 @@ def feed_endpoint(request):
             status=501
         )
 
-    feed_url = request.urlgen(
-        "mediagoblin.federation.feed",
-        username=request.user.username,
-        qualified=True
-    )
-
     feed = {
         "displayName": "Activities by {user}@{host}".format(
             user=request.user.username,
             host=request.host
         ),
         "objectTypes": ["activity"],
-        "url": feed_url,
-        "links": {
-            "first": {
-                "href": feed_url,
-            },
-            "self": {
-                "href": request.url,
-            },
-            "prev": {
-                "href": feed_url,
-            },
-            "next": {
-                "href": feed_url,
-            }
-        },
+        "url": request.base_url,
+        "links": {"self": {"href": request.url}},
         "author": request.user.serialize(request),
         "items": [],
     }
 
+    # Create outbox
+    if outbox is None:
+        outbox = Activity.query.filter_by(actor=request.user.id)
+    else:
+        outbox = outbox.filter_by(actor=request.user.id)
+
+    # We want the newest things at the top (issue: #1055)
+    outbox = outbox.order_by(Activity.published.desc())
 
-    # Look up all the media to put in the feed (this will be changed
-    # when we get real feeds/inboxes/outboxes/activites)
-    for media in MediaEntry.query.all():
-        item = {
-            "verb": "post",
-            "object": media.serialize(request),
-            "actor": media.get_uploader.serialize(request),
-            "content": "{0} posted a picture".format(request.user.username),
-            "id": media.id,
-        }
-        item["updated"] = item["object"]["updated"]
-        item["published"] = item["object"]["published"]
-        item["url"] = item["object"]["url"]
-        feed["items"].append(item)
+    # Limit by the "count" (default: 20)
+    limit = request.args.get("count", 20)
+
+    try:
+        limit = int(limit)
+    except ValueError:
+        limit = 20
+
+    # The upper most limit should be 200
+    limit = limit if limit < 200 else 200
+
+    # apply the limit
+    outbox = outbox.limit(limit)
+
+    # Offset (default: no offset - first <count>  result)
+    outbox = outbox.offset(request.args.get("offset", 0))
+
+    # Build feed.
+    for activity in outbox:
+        try:
+            feed["items"].append(activity.serialize(request))
+        except AttributeError:
+            # This occurs because of how we hard-deletion and the object
+            # no longer existing anymore. We want to keep the Activity
+            # in case someone wishes to look it up but we shouldn't display
+            # it in the feed.
+            pass
     feed["totalItems"] = len(feed["items"])
 
     return json_response(feed)
 
 @oauth_required
+def feed_minor_endpoint(request):
+    """ Outbox for minor activities such as updates """
+    # If it's anything but GET pass it along
+    if request.method != "GET":
+        return feed_endpoint(request)
+
+    outbox = Activity.query.filter(
+        (Activity.verb == "update") | (Activity.verb == "delete")
+    )
+    return feed_endpoint(request, outbox=outbox)
+
+@oauth_required
+def feed_major_endpoint(request):
+    """ Outbox for all major activities """
+    # If it's anything but a GET pass it along
+    if request.method != "GET":
+        return feed_endpoint(request)
+
+    outbox = Activity.query.filter_by(verb="post")
+    return feed_endpoint(request, outbox=outbox)
+
+@oauth_required
 def object_endpoint(request):
     """ Lookup for a object type """
-    object_type = request.matchdict["objectType"]
+    object_type = request.matchdict["object_type"]
     try:
-        object_id = int(request.matchdict["id"])
+        object_id = request.matchdict["id"]
     except ValueError:
         error = "Invalid object ID '{0}' for '{1}'".format(
             request.matchdict["id"],
@@ -395,17 +632,17 @@ def object_comments(request):
     media = MediaEntry.query.filter_by(id=request.matchdict["id"]).first()
     if media is None:
         return json_error("Can't find '{0}' with ID '{1}'".format(
-            request.matchdict["objectType"],
+            request.matchdict["object_type"],
             request.matchdict["id"]
         ), 404)
 
-    comments = response.serialize(request)
+    comments = media.serialize(request)
     comments = comments.get("replies", {
         "totalItems": 0,
         "items": [],
         "url": request.urlgen(
-            "mediagoblin.federation.object.comments",
-            objectType=media.objectType,
+            "mediagoblin.api.object.comments",
+            object_type=media.object_type,
             id=media.id,
             qualified=True
         )
@@ -484,7 +721,7 @@ def host_meta(request):
     # provide XML+XRD
     return render_to_response(
         request,
-        "mediagoblin/federation/host-meta.xml",
+        "mediagoblin/api/host-meta.xml",
         {"links": links},
         mimetype="application/xrd+xml"
     )
@@ -525,7 +762,7 @@ def lrdd_lookup(request):
             {
                 "rel": "self",
                 "href": request.urlgen(
-                    "mediagoblin.federation.user",
+                    "mediagoblin.api.user",
                     username=user.username,
                     qualified=True
                 )
@@ -533,7 +770,7 @@ def lrdd_lookup(request):
             {
                 "rel": "activity-outbox",
                 "href": request.urlgen(
-                    "mediagoblin.federation.feed",
+                    "mediagoblin.api.feed",
                     username=user.username,
                     qualified=True
                 )
@@ -549,9 +786,11 @@ def whoami(request):
         return json_error("Not logged in.", status=401)
 
     profile = request.urlgen(
-        "mediagoblin.federation.user.profile",
+        "mediagoblin.api.user.profile",
         username=request.user.username,
         qualified=True
     )
 
     return redirect(request, location=profile)
+
+
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 8027ad87..b9846962 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -16,6 +16,7 @@
 
 import os
 import logging
+from contextlib import contextmanager
 
 from mediagoblin.routing import get_url_map
 from mediagoblin.tools.routing import endpoint_to_controller
@@ -23,6 +24,7 @@ from mediagoblin.tools.routing import endpoint_to_controller
 from werkzeug.wrappers import Request
 from werkzeug.exceptions import HTTPException
 from werkzeug.routing import RequestRedirect
+from werkzeug.wsgi import SharedDataMiddleware
 
 from mediagoblin import meddleware, __version__
 from mediagoblin.db.util import check_db_up_to_date
@@ -41,10 +43,25 @@ from mediagoblin.tools.pluginapi import PluginManager, hook_transform
 from mediagoblin.tools.crypto import setup_crypto
 from mediagoblin.auth.tools import check_auth_enabled, no_auth_logout
 
+from mediagoblin.tools.transition import DISABLE_GLOBALS
+
 
 _log = logging.getLogger(__name__)
 
 
+class Context(object):
+    """
+    MediaGoblin context object.
+
+    If a web request is being used, a Flask Request object is used
+    instead, otherwise (celery tasks, etc), attach things to this
+    object.
+
+    Usually appears as "ctx" in utilities as first argument.
+    """
+    pass
+
+
 class MediaGoblinApp(object):
     """
     WSGI application of MediaGoblin
@@ -68,11 +85,11 @@ class MediaGoblinApp(object):
         ##############
 
         # Open and setup the config
-        global_config, app_config = setup_global_and_app_config(config_path)
+        self.global_config, self.app_config = setup_global_and_app_config(config_path)
 
         media_type_warning()
 
-        setup_crypto()
+        setup_crypto(self.app_config)
 
         ##########################################
         # Setup other connections / useful objects
@@ -90,7 +107,10 @@ class MediaGoblinApp(object):
         setup_plugins()
 
         # Set up the database
-        self.db = setup_database(app_config['run_migrations'])
+        if DISABLE_GLOBALS:
+            self.db_manager = setup_database(self)
+        else:
+            self.db = setup_database(self)
 
         # Quit app if need to run dbupdate
         ## NOTE: This is currently commented out due to session errors..
@@ -98,11 +118,11 @@ class MediaGoblinApp(object):
         # check_db_up_to_date()
 
         # Register themes
-        self.theme_registry, self.current_theme = register_themes(app_config)
+        self.theme_registry, self.current_theme = register_themes(self.app_config)
 
         # Get the template environment
         self.template_loader = get_jinja_loader(
-            app_config.get('local_templates'),
+            self.app_config.get('local_templates'),
             self.current_theme,
             PluginManager().get_template_paths()
             )
@@ -110,7 +130,7 @@ class MediaGoblinApp(object):
         # Check if authentication plugin is enabled and respond accordingly.
         self.auth = check_auth_enabled()
         if not self.auth:
-            app_config['allow_comments'] = False
+            self.app_config['allow_comments'] = False
 
         # Set up storage systems
         self.public_store, self.queue_store = setup_storage()
@@ -119,16 +139,16 @@ class MediaGoblinApp(object):
         self.url_map = get_url_map()
 
         # set up staticdirector tool
-        self.staticdirector = get_staticdirector(app_config)
+        self.staticdirector = get_staticdirector(self.app_config)
 
         # Setup celery, if appropriate
-        if setup_celery and not app_config.get('celery_setup_elsewhere'):
+        if setup_celery and not self.app_config.get('celery_setup_elsewhere'):
             if os.environ.get('CELERY_ALWAYS_EAGER', 'false').lower() == 'true':
                 setup_celery_from_config(
-                    app_config, global_config,
+                    self.app_config, self.global_config,
                     force_celery_always_eager=True)
             else:
-                setup_celery_from_config(app_config, global_config)
+                setup_celery_from_config(self.app_config, self.global_config)
 
         #######################################################
         # Insert appropriate things into mediagoblin.mg_globals
@@ -136,27 +156,105 @@ class MediaGoblinApp(object):
         # certain properties need to be accessed globally eg from
         # validators, etc, which might not access to the request
         # object.
+        #
+        # Note, we are trying to transition this out;
+        # run with environment variable DISABLE_GLOBALS=true
+        # to work on it
         #######################################################
 
-        setup_globals(app=self)
+        if not DISABLE_GLOBALS:
+            setup_globals(app=self)
 
         # Workbench *currently* only used by celery, so this only
         # matters in always eager mode :)
-        setup_workbench()
+        self.workbench_manager = setup_workbench()
 
         # instantiate application meddleware
         self.meddleware = [common.import_component(m)(self)
                            for m in meddleware.ENABLED_MEDDLEWARE]
 
+    @contextmanager
+    def gen_context(self, ctx=None, **kwargs):
+        """
+        Attach contextual information to request, or generate a context object
+
+        This avoids global variables; various utilities and contextual
+        information (current translation, etc) are attached to this
+        object.
+        """
+        if DISABLE_GLOBALS:
+            with self.db_manager.session_scope() as db:
+                yield self._gen_context(db, ctx)
+        else:
+            yield self._gen_context(self.db, ctx)
+
+    def _gen_context(self, db, ctx, **kwargs):
+        # Set up context
+        # --------------
+
+        # Is a context provided?
+        if ctx is None:
+            ctx = Context()
+        
+        # Attach utilities
+        # ----------------
+
+        # Attach self as request.app
+        # Also attach a few utilities from request.app for convenience?
+        ctx.app = self
+
+        ctx.db = db
+
+        ctx.staticdirect = self.staticdirector
+
+        # Do special things if this is a request
+        # --------------------------------------
+        if isinstance(ctx, Request):
+            ctx = self._request_only_gen_context(ctx)
+
+        return ctx
+
+    def _request_only_gen_context(self, request):
+        """
+        Requests get some extra stuff attached to them that's not relevant
+        otherwise.
+        """
+        # Do we really want to load this via middleware?  Maybe?
+        request.session = self.session_manager.load_session_from_cookie(request)
+
+        request.locale = translate.get_locale_from_request(request)
+
+        # This should be moved over for certain, but how to deal with
+        # request.locale?
+        request.template_env = template.get_jinja_env(
+            self, self.template_loader, request.locale)
+
+        mg_request.setup_user_in_request(request)
+
+        ## Routing / controller loading stuff
+        request.map_adapter = self.url_map.bind_to_environ(request.environ)
+
+        def build_proxy(endpoint, **kw):
+            try:
+                qualified = kw.pop('qualified')
+            except KeyError:
+                qualified = False
+
+            return request.map_adapter.build(
+                    endpoint,
+                    values=dict(**kw),
+                    force_external=qualified)
+
+        request.urlgen = build_proxy
+
+        return request
+
     def call_backend(self, environ, start_response):
         request = Request(environ)
 
         # Compatibility with django, use request.args preferrably
         request.GET = request.args
 
-        ## Routing / controller loading stuff
-        map_adapter = self.url_map.bind_to_environ(request.environ)
-
         # By using fcgi, mediagoblin can run under a base path
         # like /mediagoblin/. request.path_info contains the
         # path inside mediagoblin. If the something needs the
@@ -174,41 +272,16 @@ class MediaGoblinApp(object):
             environ.pop('HTTPS')
 
         ## Attach utilities to the request object
-        # Do we really want to load this via middleware?  Maybe?
-        session_manager = self.session_manager
-        request.session = session_manager.load_session_from_cookie(request)
-        # Attach self as request.app
-        # Also attach a few utilities from request.app for convenience?
-        request.app = self
-
-        request.db = self.db
-        request.staticdirect = self.staticdirector
-
-        request.locale = translate.get_locale_from_request(request)
-        request.template_env = template.get_jinja_env(
-            self.template_loader, request.locale)
-
-        def build_proxy(endpoint, **kw):
-            try:
-                qualified = kw.pop('qualified')
-            except KeyError:
-                qualified = False
-
-            return map_adapter.build(
-                    endpoint,
-                    values=dict(**kw),
-                    force_external=qualified)
-
-        request.urlgen = build_proxy
+        with self.gen_context(request) as request:
+            return self._finish_call_backend(request, environ, start_response)
 
+    def _finish_call_backend(self, request, environ, start_response):
         # Log user out if authentication_disabled
         no_auth_logout(request)
 
-        mg_request.setup_user_in_request(request)
-
         request.controller_name = None
         try:
-            found_rule, url_values = map_adapter.match(return_rule=True)
+            found_rule, url_values = request.map_adapter.match(return_rule=True)
             request.matchdict = url_values
         except RequestRedirect as response:
             # Deal with 301 responses eg due to missing final slash
@@ -224,6 +297,7 @@ class MediaGoblinApp(object):
         # used for lazy context modification
         request.controller_name = found_rule.endpoint
 
+        ## TODO: get rid of meddleware, turn it into hooks only
         # pass the request through our meddleware classes
         try:
             for m in self.meddleware:
@@ -254,8 +328,9 @@ class MediaGoblinApp(object):
             response = render_http_exception(
                 request, e, e.get_description(environ))
 
-        session_manager.save_session_to_cookie(request.session,
-                                               request, response)
+        self.session_manager.save_session_to_cookie(
+            request.session,
+            request, response)
 
         return response(environ, start_response)
 
@@ -266,9 +341,10 @@ class MediaGoblinApp(object):
         try:
             return self.call_backend(environ, start_response)
         finally:
-            # Reset the sql session, so that the next request
-            # gets a fresh session
-            self.db.reset_after_request()
+            if not DISABLE_GLOBALS:
+                # Reset the sql session, so that the next request
+                # gets a fresh session
+                self.db.reset_after_request()
 
 
 def paste_app_factory(global_config, **app_config):
@@ -281,8 +357,42 @@ def paste_app_factory(global_config, **app_config):
 
     if not mediagoblin_config:
         raise IOError("Usable mediagoblin config not found.")
+    del app_config['config']
 
     mgoblin_app = MediaGoblinApp(mediagoblin_config)
+    mgoblin_app.call_backend = SharedDataMiddleware(mgoblin_app.call_backend,
+                                                    exports=app_config)
     mgoblin_app = hook_transform('wrap_wsgi', mgoblin_app)
 
     return mgoblin_app
+
+
+def paste_server_selector(wsgi_app, global_config=None, **app_config):
+    """
+    Select between gunicorn and paste depending on what ia available
+    """
+    # See if we can import the gunicorn server...
+    # otherwise we'll use the paste server
+    try:
+        import gunicorn
+    except ImportError:
+        gunicorn = None
+
+    if gunicorn is None:
+        # use paste
+        from paste.httpserver import server_runner
+
+        cleaned_app_config = dict(
+            [(key, app_config[key])
+             for key in app_config
+             if key in ["host", "port", "handler", "ssl_pem", "ssl_context",
+                        "server_version", "protocol_version", "start_loop",
+                        "daemon_threads", "socket_timeout", "use_threadpool",
+                        "threadpool_workers", "threadpool_options",
+                        "request_queue_size"]])
+
+        return server_runner(wsgi_app, global_config, **cleaned_app_config)
+    else:
+        # use gunicorn
+        from gunicorn.app.pasterapp import PasterServerApplication
+        return PasterServerApplication(wsgi_app, global_config, **app_config)
diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py
index 39df85af..3737fab6 100644
--- a/mediagoblin/auth/tools.py
+++ b/mediagoblin/auth/tools.py
@@ -16,6 +16,8 @@
 
 
 import logging
+
+import six
 import wtforms
 from sqlalchemy import or_
 
@@ -136,7 +138,7 @@ def register_user(request, register_form):
         user.save()
 
         # log the user in
-        request.session['user_id'] = unicode(user.id)
+        request.session['user_id'] = six.text_type(user.id)
         request.session.save()
 
         # send verification email
@@ -182,7 +184,7 @@ def no_auth_logout(request):
     Log out the user if no authentication is enabled, but don't delete
     the messages
     """
-    if not mg_globals.app.auth and 'user_id' in request.session:
+    if not request.app.auth and 'user_id' in request.session:
         del request.session['user_id']
         request.session.save()
 
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 3d132f84..03a46f7b 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
+
 from itsdangerous import BadSignature
 
 from mediagoblin import messages, mg_globals
@@ -84,16 +86,17 @@ def login(request):
     login_failed = False
 
     if request.method == 'POST':
-        username = login_form.username.data
 
         if login_form.validate():
-            user = check_login_simple(username, login_form.password.data)
+            user = check_login_simple(
+                login_form.username.data,
+                login_form.password.data)
 
             if user:
                 # set up login in session
                 if login_form.stay_logged_in.data:
                     request.session['stay_logged_in'] = True
-                request.session['user_id'] = unicode(user.id)
+                request.session['user_id'] = six.text_type(user.id)
                 request.session.save()
 
                 if request.form.get('next'):
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index f3f3f7ab..f769e4eb 100644
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -1,3 +1,6 @@
+[DEFAULT]
+data_basedir = %(here)s/user_dev
+
 [mediagoblin]
 # HTML title of the pages
 html_title = string(default="GNU MediaGoblin")
@@ -13,10 +16,10 @@ sql_engine = string(default="sqlite:///%(here)s/mediagoblin.db")
 run_migrations = boolean(default=False)
 
 # Where temporary files used in processing and etc are kept
-workbench_path = string(default="%(here)s/user_dev/media/workbench")
+workbench_path = string(default="%(data_basedir)s/media/workbench")
 
 # Where to store cryptographic sensible data
-crypto_path = string(default="%(here)s/user_dev/crypto")
+crypto_path = string(default="%(data_basedir)s/crypto")
 
 # Where mediagoblin-builtin static assets are kept
 direct_remote_path = string(default="/mgoblin_static/")
@@ -67,7 +70,7 @@ allow_reporting = boolean(default=True)
 show_tos = boolean(default=False)
 
 # By default not set, but you might want something like:
-# "%(here)s/user_dev/templates/"
+# "%(data_basedir)s/templates/"
 local_templates = string()
 
 # Whether or not celery is set up via an environment variable or
@@ -90,14 +93,14 @@ exif_visible = boolean(default=False)
 original_date_visible = boolean(default=False)
 
 # Theming stuff
-theme_install_dir = string(default="%(here)s/user_dev/themes/")
+theme_install_dir = string(default="%(data_basedir)s/themes/")
 theme_web_path = string(default="/theme_static/")
-theme_linked_assets_dir = string(default="%(here)s/user_dev/theme_static/")
+theme_linked_assets_dir = string(default="%(data_basedir)s/theme_static/")
 theme = string()
 
 # plugin default assets directory
 plugin_web_path = string(default="/plugin_static/")
-plugin_linked_assets_dir = string(default="%(here)s/user_dev/plugin_static/")
+plugin_linked_assets_dir = string(default="%(data_basedir)s/plugin_static/")
 
 # Default user upload limit (in Mb)
 upload_limit = integer(default=None)
@@ -110,9 +113,7 @@ user_privilege_scheme = string(default="uploader,commenter,reporter")
 
 # Frequency garbage collection will run (setting to 0 or false to disable)
 # Setting units are minutes.
-## NOTE: This is temporarily disabled, but we want to set it back:
-## garbage_collection = integer(default=60)
-garbage_collection = integer(default=0)
+garbage_collection = integer(default=60)
 
 [jinja2]
 # Jinja2 supports more directives than the minimum required by mediagoblin. 
@@ -123,12 +124,12 @@ extensions = string_list(default=list())
 
 [storage:publicstore]
 storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage")
-base_dir = string(default="%(here)s/user_dev/media/public")
+base_dir = string(default="%(data_basedir)s/media/public")
 base_url = string(default="/mgoblin_media/")
 
 [storage:queuestore]
 storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage")
-base_dir = string(default="%(here)s/user_dev/media/queue")
+base_dir = string(default="%(data_basedir)s/media/queue")
 
 [media:medium]
 # Dimensions used when creating media display images.
diff --git a/mediagoblin/db/base.py b/mediagoblin/db/base.py
index c0cefdc2..6acb0b79 100644
--- a/mediagoblin/db/base.py
+++ b/mediagoblin/db/base.py
@@ -16,13 +16,26 @@
 
 
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import scoped_session, sessionmaker, object_session
+from sqlalchemy import inspect
 
-Session = scoped_session(sessionmaker())
+from mediagoblin.tools.transition import DISABLE_GLOBALS
+
+if not DISABLE_GLOBALS:
+    from sqlalchemy.orm import scoped_session, sessionmaker
+    Session = scoped_session(sessionmaker())
 
 
 class GMGTableBase(object):
-    query = Session.query_property()
+    @property
+    def _session(self):
+        return inspect(self).session
+
+    @property
+    def _app(self):
+        return self._session.bind.app
+
+    if not DISABLE_GLOBALS:
+        query = Session.query_property()
 
     def get(self, key):
         return getattr(self, key)
@@ -31,16 +44,20 @@ class GMGTableBase(object):
         # The key *has* to exist on sql.
         return getattr(self, key)
 
-    def save(self):
-        sess = object_session(self)
-        if sess is None:
+    def save(self, commit=True):
+        sess = self._session
+        if sess is None and not DISABLE_GLOBALS:
             sess = Session()
+        assert sess is not None, "Can't save, %r has a detached session" % self
         sess.add(self)
-        sess.commit()
+        if commit:
+            sess.commit()
+        else:
+            sess.flush()
 
     def delete(self, commit=True):
         """Delete the object and commit the change immediately by default"""
-        sess = object_session(self)
+        sess = self._session
         assert sess is not None, "Not going to delete detached %r" % self
         sess.delete(self)
         if commit:
diff --git a/mediagoblin/db/migration_tools.py b/mediagoblin/db/migration_tools.py
index e39070c3..fae98643 100644
--- a/mediagoblin/db/migration_tools.py
+++ b/mediagoblin/db/migration_tools.py
@@ -14,14 +14,68 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import unicode_literals
+
+import logging
+import os
+
+from alembic import command
+from alembic.config import Config
+from alembic.migration import MigrationContext
+
+from mediagoblin.db.base import Base
 from mediagoblin.tools.common import simple_printer
 from sqlalchemy import Table
 from sqlalchemy.sql import select
 
+log = logging.getLogger(__name__)
+
+
 class TableAlreadyExists(Exception):
     pass
 
 
+class AlembicMigrationManager(object):
+
+    def __init__(self, session):
+        root_dir = os.path.abspath(os.path.dirname(os.path.dirname(
+            os.path.dirname(__file__))))
+        alembic_cfg_path = os.path.join(root_dir, 'alembic.ini')
+        self.alembic_cfg = Config(alembic_cfg_path)
+        self.session = session
+
+    def get_current_revision(self):
+        context = MigrationContext.configure(self.session.bind)
+        return context.get_current_revision()
+
+    def upgrade(self, version):
+        return command.upgrade(self.alembic_cfg, version or 'head')
+
+    def downgrade(self, version):
+        if isinstance(version, int) or version is None or version.isdigit():
+            version = 'base'
+        return command.downgrade(self.alembic_cfg, version)
+
+    def stamp(self, revision):
+        return command.stamp(self.alembic_cfg, revision=revision)
+
+    def init_tables(self):
+        Base.metadata.create_all(self.session.bind)
+        # load the Alembic configuration and generate the
+        # version table, "stamping" it with the most recent rev:
+        # XXX: we need to find a better way to detect current installations
+        # using sqlalchemy-migrate because we don't have to create all table
+        # for them
+        command.stamp(self.alembic_cfg, 'head')
+
+    def init_or_migrate(self, version=None):
+        # XXX: we need to call this method when we ditch
+        # sqlalchemy-migrate entirely
+        # if self.get_current_revision() is None:
+        #     self.init_tables()
+        self.upgrade(version)
+
+
 class MigrationManager(object):
     """
     Migration handling tool.
@@ -39,7 +93,7 @@ class MigrationManager(object):
          - migration_registry: where we should find all migrations to
            run
         """
-        self.name = unicode(name)
+        self.name = name
         self.models = models
         self.foundations = foundations
         self.session = session
@@ -230,7 +284,7 @@ class MigrationManager(object):
             for migration_number, migration_func in migrations_to_run:
                 self.printer(
                     u'   + Running migration %s, "%s"... ' % (
-                        migration_number, migration_func.func_name))
+                        migration_number, migration_func.__name__))
                 migration_func(self.session)
                 self.set_current_migration(migration_number)
                 self.printer('done.\n')
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 04588ad1..74c1194f 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -17,19 +17,26 @@
 import datetime
 import uuid
 
+import six
+
+if six.PY2:
+    import migrate
+
+import pytz
+import dateutil.tz
 from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger,
                         Integer, Unicode, UnicodeText, DateTime,
                         ForeignKey, Date, Index)
 from sqlalchemy.exc import ProgrammingError
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.sql import and_
-from migrate.changeset.constraint import UniqueConstraint
+from sqlalchemy.schema import UniqueConstraint
 
 from mediagoblin.db.extratypes import JSONEncoded, MutationDict
 from mediagoblin.db.migration_tools import (
     RegisterMigration, inspect_table, replace_table_hack)
 from mediagoblin.db.models import (MediaEntry, Collection, MediaComment, User,
-    Privilege)
+    Privilege, Generator)
 from mediagoblin.db.extratypes import JSONEncoded, MutationDict
 
 
@@ -249,7 +256,7 @@ def mediaentry_new_slug_era(db):
     for row in db.execute(media_table.select()):
         # no slug, try setting to an id
         if not row.slug:
-            append_garbage_till_unique(row, unicode(row.id))
+            append_garbage_till_unique(row, six.text_type(row.id))
         # has "=" or ":" in it... we're getting rid of those
         elif u"=" in row.slug or u":" in row.slug:
             append_garbage_till_unique(
@@ -278,7 +285,7 @@ def unique_collections_slug(db):
                 existing_slugs[row.creator].append(row.slug)
 
     for row_id in slugs_to_change:
-        new_slug = unicode(uuid.uuid4())
+        new_slug = six.text_type(uuid.uuid4())
         db.execute(collection_table.update().
                    where(collection_table.c.id == row_id).
                    values(slug=new_slug))
@@ -578,7 +585,6 @@ PRIVILEGE_FOUNDATIONS_v0 = [{'privilege_name':u'admin'},
                             {'privilege_name':u'commenter'},
                             {'privilege_name':u'active'}]
 
-
 # vR1 stands for "version Rename 1".  This only exists because we need
 # to deal with dropping some booleans and it's otherwise impossible
 # with sqlite.
@@ -890,3 +896,356 @@ def revert_username_index(db):
             db.rollback()
 
     db.commit()
+
+class Generator_R0(declarative_base()):
+    __tablename__ = "core__generators"
+    id = Column(Integer, primary_key=True)
+    name = Column(Unicode, nullable=False)
+    published = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    updated = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    object_type = Column(Unicode, nullable=False)
+
+class ActivityIntermediator_R0(declarative_base()):
+    __tablename__ = "core__activity_intermediators"
+    id = Column(Integer, primary_key=True)
+    type = Column(Unicode, nullable=False)
+
+class Activity_R0(declarative_base()):
+    __tablename__ = "core__activities"
+    id = Column(Integer, primary_key=True)
+    actor = Column(Integer, ForeignKey(User.id), nullable=False)
+    published = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    updated = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    verb = Column(Unicode, nullable=False)
+    content = Column(Unicode, nullable=True)
+    title = Column(Unicode, nullable=True)
+    generator = Column(Integer, ForeignKey(Generator_R0.id), nullable=True)
+    object = Column(Integer,
+                    ForeignKey(ActivityIntermediator_R0.id),
+                    nullable=False)
+    target = Column(Integer,
+                    ForeignKey(ActivityIntermediator_R0.id),
+                    nullable=True)
+
+@RegisterMigration(24, MIGRATIONS)
+def activity_migration(db):
+    """
+    Creates everything to create activities in GMG
+    - Adds Activity, ActivityIntermediator and Generator table
+    - Creates GMG service generator for activities produced by the server
+    - Adds the activity_as_object and activity_as_target to objects/targets
+    - Retroactively adds activities for what we can acurately work out
+    """
+    # Set constants we'll use later
+    FOREIGN_KEY = "core__activity_intermediators.id"
+    ACTIVITY_COLUMN = "activity"
+
+    # Create the new tables.
+    ActivityIntermediator_R0.__table__.create(db.bind)
+    Generator_R0.__table__.create(db.bind)
+    Activity_R0.__table__.create(db.bind)
+    db.commit()
+
+    # Initiate the tables we want to use later
+    metadata = MetaData(bind=db.bind)
+    user_table = inspect_table(metadata, "core__users")
+    activity_table = inspect_table(metadata, "core__activities")
+    generator_table = inspect_table(metadata, "core__generators")
+    collection_table = inspect_table(metadata, "core__collections")
+    media_entry_table = inspect_table(metadata, "core__media_entries")
+    media_comments_table = inspect_table(metadata, "core__media_comments")
+    ai_table = inspect_table(metadata, "core__activity_intermediators")
+
+
+    # Create the foundations for Generator
+    db.execute(generator_table.insert().values(
+        name="GNU Mediagoblin",
+        object_type="service",
+        published=datetime.datetime.now(),
+        updated=datetime.datetime.now()
+    ))
+    db.commit()
+
+    # Get the ID of that generator
+    gmg_generator = db.execute(generator_table.select(
+        generator_table.c.name==u"GNU Mediagoblin")).first()
+
+
+    # Now we want to modify the tables which MAY have an activity at some point
+    media_col = Column(ACTIVITY_COLUMN, Integer, ForeignKey(FOREIGN_KEY))
+    media_col.create(media_entry_table)
+
+    user_col = Column(ACTIVITY_COLUMN, Integer, ForeignKey(FOREIGN_KEY))
+    user_col.create(user_table)
+
+    comments_col = Column(ACTIVITY_COLUMN, Integer, ForeignKey(FOREIGN_KEY))
+    comments_col.create(media_comments_table)
+
+    collection_col = Column(ACTIVITY_COLUMN, Integer, ForeignKey(FOREIGN_KEY))
+    collection_col.create(collection_table)
+    db.commit()
+
+
+    # Now we want to retroactively add what activities we can
+    # first we'll add activities when people uploaded media.
+    # these can't have content as it's not fesible to get the
+    # correct content strings.
+    for media in db.execute(media_entry_table.select()):
+        # Now we want to create the intermedaitory
+        db_ai = db.execute(ai_table.insert().values(
+            type="media",
+        ))
+        db_ai = db.execute(ai_table.select(
+            ai_table.c.id==db_ai.inserted_primary_key[0]
+        )).first()
+
+        # Add the activity
+        activity = {
+            "verb": "create",
+            "actor": media.uploader,
+            "published": media.created,
+            "updated": media.created,
+            "generator": gmg_generator.id,
+            "object": db_ai.id
+        }
+        db.execute(activity_table.insert().values(**activity))
+
+        # Add the AI to the media.
+        db.execute(media_entry_table.update().values(
+            activity=db_ai.id
+        ).where(media_entry_table.c.id==media.id))
+
+    # Now we want to add all the comments people made
+    for comment in db.execute(media_comments_table.select()):
+        # Get the MediaEntry for the comment
+        media_entry = db.execute(
+            media_entry_table.select(
+                media_entry_table.c.id==comment.media_entry
+        )).first()
+
+        # Create an AI for target
+        db_ai_media = db.execute(ai_table.select(
+            ai_table.c.id==media_entry.activity
+        )).first().id
+
+        db.execute(
+            media_comments_table.update().values(
+                activity=db_ai_media
+        ).where(media_comments_table.c.id==media_entry.id))
+
+        # Now create the AI for the comment
+        db_ai_comment = db.execute(ai_table.insert().values(
+            type="comment"
+        )).inserted_primary_key[0]
+
+        activity = {
+            "verb": "comment",
+            "actor": comment.author,
+            "published": comment.created,
+            "updated": comment.created,
+            "generator": gmg_generator.id,
+            "object": db_ai_comment,
+            "target": db_ai_media,
+        }
+
+        # Now add the comment object
+        db.execute(activity_table.insert().values(**activity))
+
+        # Now add activity to comment
+        db.execute(media_comments_table.update().values(
+            activity=db_ai_comment
+        ).where(media_comments_table.c.id==comment.id))
+
+    # Create 'create' activities for all collections
+    for collection in db.execute(collection_table.select()):
+        # create AI
+        db_ai = db.execute(ai_table.insert().values(
+            type="collection"
+        ))
+        db_ai = db.execute(ai_table.select(
+            ai_table.c.id==db_ai.inserted_primary_key[0]
+        )).first()
+
+        # Now add link the collection to the AI
+        db.execute(collection_table.update().values(
+            activity=db_ai.id
+        ).where(collection_table.c.id==collection.id))
+
+        activity = {
+            "verb": "create",
+            "actor": collection.creator,
+            "published": collection.created,
+            "updated": collection.created,
+            "generator": gmg_generator.id,
+            "object": db_ai.id,
+        }
+
+        db.execute(activity_table.insert().values(**activity))
+
+        # Now add the activity to the collection
+        db.execute(collection_table.update().values(
+            activity=db_ai.id
+        ).where(collection_table.c.id==collection.id))
+
+    db.commit()
+
+class Location_V0(declarative_base()):
+    __tablename__ = "core__locations"
+    id = Column(Integer, primary_key=True)
+    name = Column(Unicode)
+    position = Column(MutationDict.as_mutable(JSONEncoded))
+    address = Column(MutationDict.as_mutable(JSONEncoded))
+
+@RegisterMigration(25, MIGRATIONS)
+def add_location_model(db):
+    """ Add location model """
+    metadata = MetaData(bind=db.bind)
+
+    # Create location table
+    Location_V0.__table__.create(db.bind)
+    db.commit()
+
+    # Inspect the tables we need
+    user = inspect_table(metadata, "core__users")
+    collections = inspect_table(metadata, "core__collections")
+    media_entry = inspect_table(metadata, "core__media_entries")
+    media_comments = inspect_table(metadata, "core__media_comments")
+
+    # Now add location support to the various models
+    col = Column("location", Integer, ForeignKey(Location_V0.id))
+    col.create(user)
+
+    col = Column("location", Integer, ForeignKey(Location_V0.id))
+    col.create(collections)
+
+    col = Column("location", Integer, ForeignKey(Location_V0.id))
+    col.create(media_entry)
+
+    col = Column("location", Integer, ForeignKey(Location_V0.id))
+    col.create(media_comments)
+
+    db.commit()
+
+@RegisterMigration(26, MIGRATIONS)
+def datetime_to_utc(db):
+    """ Convert datetime stamps to UTC """
+    # Get the server's timezone, this is what the database has stored
+    server_timezone = dateutil.tz.tzlocal()
+
+    ##
+    # Look up all the timestamps and convert them to UTC
+    ##
+    metadata = MetaData(bind=db.bind)
+
+    def dt_to_utc(dt):
+        # Add the current timezone
+        dt = dt.replace(tzinfo=server_timezone)
+
+        # Convert to UTC
+        return dt.astimezone(pytz.UTC)
+
+    # Convert the User model
+    user_table = inspect_table(metadata, "core__users")
+    for user in db.execute(user_table.select()):
+        db.execute(user_table.update().values(
+            created=dt_to_utc(user.created)
+        ).where(user_table.c.id==user.id))
+
+    # Convert Client
+    client_table = inspect_table(metadata, "core__clients")
+    for client in db.execute(client_table.select()):
+        db.execute(client_table.update().values(
+            created=dt_to_utc(client.created),
+            updated=dt_to_utc(client.updated)
+        ).where(client_table.c.id==client.id))
+
+    # Convert RequestToken
+    rt_table = inspect_table(metadata, "core__request_tokens")
+    for request_token in db.execute(rt_table.select()):
+        db.execute(rt_table.update().values(
+            created=dt_to_utc(request_token.created),
+            updated=dt_to_utc(request_token.updated)
+        ).where(rt_table.c.token==request_token.token))
+
+    # Convert AccessToken
+    at_table = inspect_table(metadata, "core__access_tokens")
+    for access_token in db.execute(at_table.select()):
+        db.execute(at_table.update().values(
+            created=dt_to_utc(access_token.created),
+            updated=dt_to_utc(access_token.updated)
+        ).where(at_table.c.token==access_token.token))
+
+    # Convert MediaEntry
+    media_table = inspect_table(metadata, "core__media_entries")
+    for media in db.execute(media_table.select()):
+        db.execute(media_table.update().values(
+            created=dt_to_utc(media.created)
+        ).where(media_table.c.id==media.id))
+
+    # Convert Media Attachment File
+    media_attachment_table = inspect_table(metadata, "core__attachment_files")
+    for ma in db.execute(media_attachment_table.select()):
+        db.execute(media_attachment_table.update().values(
+            created=dt_to_utc(ma.created)
+        ).where(media_attachment_table.c.id==ma.id))
+
+    # Convert MediaComment
+    comment_table = inspect_table(metadata, "core__media_comments")
+    for comment in db.execute(comment_table.select()):
+        db.execute(comment_table.update().values(
+            created=dt_to_utc(comment.created)
+        ).where(comment_table.c.id==comment.id))
+
+    # Convert Collection
+    collection_table = inspect_table(metadata, "core__collections")
+    for collection in db.execute(collection_table.select()):
+        db.execute(collection_table.update().values(
+            created=dt_to_utc(collection.created)
+        ).where(collection_table.c.id==collection.id))
+
+    # Convert Collection Item
+    collection_item_table = inspect_table(metadata, "core__collection_items")
+    for ci in db.execute(collection_item_table.select()):
+        db.execute(collection_item_table.update().values(
+            added=dt_to_utc(ci.added)
+        ).where(collection_item_table.c.id==ci.id))
+
+    # Convert Comment subscription
+    comment_sub = inspect_table(metadata, "core__comment_subscriptions")
+    for sub in db.execute(comment_sub.select()):
+        db.execute(comment_sub.update().values(
+            created=dt_to_utc(sub.created)
+        ).where(comment_sub.c.id==sub.id))
+
+    # Convert Notification
+    notification_table = inspect_table(metadata, "core__notifications")
+    for notification in db.execute(notification_table.select()):
+        db.execute(notification_table.update().values(
+            created=dt_to_utc(notification.created)
+        ).where(notification_table.c.id==notification.id))
+
+    # Convert ReportBase
+    reportbase_table = inspect_table(metadata, "core__reports")
+    for report in db.execute(reportbase_table.select()):
+        db.execute(reportbase_table.update().values(
+            created=dt_to_utc(report.created)
+        ).where(reportbase_table.c.id==report.id))
+
+    # Convert Generator
+    generator_table = inspect_table(metadata, "core__generators")
+    for generator in db.execute(generator_table.select()):
+        db.execute(generator_table.update().values(
+            published=dt_to_utc(generator.published),
+            updated=dt_to_utc(generator.updated)
+        ).where(generator_table.c.id==generator.id))
+
+    # Convert Activity
+    activity_table = inspect_table(metadata, "core__activities")
+    for activity in db.execute(activity_table.select()):
+        db.execute(activity_table.update().values(
+            published=dt_to_utc(activity.published),
+            updated=dt_to_utc(activity.updated)
+        ).where(activity_table.c.id==activity.id))
+
+    # Commit this to the database
+    db.commit()
diff --git a/mediagoblin/db/migrations/README b/mediagoblin/db/migrations/README
new file mode 100644
index 00000000..93d85eff
--- /dev/null
+++ b/mediagoblin/db/migrations/README
@@ -0,0 +1,57 @@
+Migration Guide
+---------------
+
+Alembic comes with a CLI called ``alembic``.
+
+Create a Migration
+^^^^^^^^^^^^^^^^^^
+
+Lets create our first migration::
+
+    $ alembic revision -m "add favourite_band field"
+      Generating
+      /your/gmg/path/mediagoblin/db/migrations/versions/1e3793de36a_add_favourite_band_field.py ... done
+
+By default, migration files have two methods: ``upgrade`` and ``downgrade``.
+Alembic will invoke these methods to apply the migrations to your current
+database.
+
+Now, we need to edit our newly created migration file
+``1e3793de36a_add_favourite_band_field.py`` to add a new column ``favourite_band``
+to ``core__users`` table::
+
+    def upgrade():
+        op.add_column('core__users', sa.Column('favourite_band', sa.Unicode(100)))
+
+
+    def downgrade():
+        op.drop_column('core__users', 'favourite_band')
+
+.. note::
+
+   Alembic can also generate `automatic migrations <http://alembic.readthedocs.org/en/latest/tutorial.html#auto-generating-migrations>`__.
+
+Then we can run ``gmg dbupdate`` to apply the new migration::
+
+    $ gmg dbupdate
+    INFO  [alembic.migration] Context impl SQLiteImpl.
+    INFO  [alembic.migration] Will assume non-transactional DDL.
+    INFO  [alembic.migration] Running upgrade None -> 1e3793de36a, add favourite band field
+
+If you want to revert that migration, simply run::
+
+    $ alembic downgrade -1
+
+.. warning::
+
+   Currently, Alembic cannot do ``DROP COLUMN``, ``ALTER COLUMN`` etc.
+   operations in SQLite. Please see https://bitbucket.org/zzzeek/alembic/issue/21/column-renames-not-supported-on-sqlite
+   for detailed information.
+
+Glossary
+^^^^^^^^
+
+* ``alembic.ini``: The Alembic configuration file. The ``alembic`` CLI will
+  look that file everytime it invaked.
+* ``mediagoblin/db/migrations/versions/``: Alembic will add new migration files
+  to this directory.
diff --git a/mediagoblin/db/migrations/env.py b/mediagoblin/db/migrations/env.py
new file mode 100644
index 00000000..712b6164
--- /dev/null
+++ b/mediagoblin/db/migrations/env.py
@@ -0,0 +1,71 @@
+from __future__ import with_statement
+from alembic import context
+from sqlalchemy import engine_from_config, pool
+from logging.config import fileConfig
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = None
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(url=url, target_metadata=target_metadata)
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    engine = engine_from_config(
+                config.get_section(config.config_ini_section),
+                prefix='sqlalchemy.',
+                poolclass=pool.NullPool)
+
+    connection = engine.connect()
+    context.configure(
+                connection=connection,
+                target_metadata=target_metadata
+                )
+
+    try:
+        with context.begin_transaction():
+            context.run_migrations()
+    finally:
+        connection.close()
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
+
diff --git a/mediagoblin/db/migrations/script.py.mako b/mediagoblin/db/migrations/script.py.mako
new file mode 100644
index 00000000..95702017
--- /dev/null
+++ b/mediagoblin/db/migrations/script.py.mako
@@ -0,0 +1,22 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision}
+Create Date: ${create_date}
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}
diff --git a/mediagoblin/db/migrations/versions/.gitkeep b/mediagoblin/db/migrations/versions/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/mediagoblin/db/migrations/versions/.gitkeep
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py
index 1f2e7ec3..4602c709 100644
--- a/mediagoblin/db/mixin.py
+++ b/mediagoblin/db/mixin.py
@@ -31,17 +31,20 @@ import uuid
 import re
 from datetime import datetime
 
+from pytz import UTC
 from werkzeug.utils import cached_property
 
-from mediagoblin import mg_globals
 from mediagoblin.media_types import FileTypeNotSupported
 from mediagoblin.tools import common, licenses
 from mediagoblin.tools.pluginapi import hook_handle
 from mediagoblin.tools.text import cleaned_markdown_conversion
 from mediagoblin.tools.url import slugify
+from mediagoblin.tools.translate import pass_to_ugettext as _
 
 
 class UserMixin(object):
+    object_type = "person"
+
     @property
     def bio_html(self):
         return cleaned_markdown_conversion(self.bio)
@@ -84,42 +87,45 @@ class GenerateSlugMixin(object):
            generated bits until it's unique.  That'll be a little bit of junk,
            but at least it has the basis of a nice slug.
         """
+
         #Is already a slug assigned? Check if it is valid
         if self.slug:
-            self.slug = slugify(self.slug)
+            slug = slugify(self.slug)
 
         # otherwise, try to use the title.
         elif self.title:
             # assign slug based on title
-            self.slug = slugify(self.title)
+            slug = slugify(self.title)
 
-        # We don't want any empty string slugs
-        if self.slug == u"":
-            self.slug = None
+        else:
+            # We don't have any information to set a slug
+            return
 
-        # Do we have anything at this point?
-        # If not, we're not going to get a slug
-        # so just return... we're not going to force one.
-        if not self.slug:
-            return  # giving up!
+        # We don't want any empty string slugs
+        if slug == u"":
+            return
 
         # Otherwise, let's see if this is unique.
-        if self.check_slug_used(self.slug):
+        if self.check_slug_used(slug):
             # It looks like it's being used... lame.
 
             # Can we just append the object's id to the end?
             if self.id:
-                slug_with_id = u"%s-%s" % (self.slug, self.id)
+                slug_with_id = u"%s-%s" % (slug, self.id)
                 if not self.check_slug_used(slug_with_id):
                     self.slug = slug_with_id
                     return  # success!
 
             # okay, still no success;
             # let's whack junk on there till it's unique.
-            self.slug += '-' + uuid.uuid4().hex[:4]
+            slug += '-' + uuid.uuid4().hex[:4]
             # keep going if necessary!
-            while self.check_slug_used(self.slug):
-                self.slug += uuid.uuid4().hex[:4]
+            while self.check_slug_used(slug):
+                slug += uuid.uuid4().hex[:4]
+
+        # self.check_slug_used(slug) must be False now so we have a slug that
+        # we can use now.
+        self.slug = slug
 
 
 class MediaEntryMixin(GenerateSlugMixin):
@@ -131,6 +137,11 @@ class MediaEntryMixin(GenerateSlugMixin):
         return check_media_slug_used(self.uploader, slug, self.id)
 
     @property
+    def object_type(self):
+        """ Converts media_type to pump-like type - don't use internally """
+        return self.media_type.split(".")[-1]
+
+    @property
     def description_html(self):
         """
         Rendered version of the description, run through
@@ -192,14 +203,14 @@ class MediaEntryMixin(GenerateSlugMixin):
         # TODO: implement generic fallback in case MEDIA_MANAGER does
         # not specify one?
         if u'thumb' in self.media_files:
-            thumb_url = mg_globals.app.public_store.file_url(
+            thumb_url = self._app.public_store.file_url(
                             self.media_files[u'thumb'])
         else:
             # No thumbnail in media available. Get the media's
             # MEDIA_MANAGER for the fallback icon and return static URL
             # Raises FileTypeNotSupported in case no such manager is enabled
             manager = self.media_manager
-            thumb_url = mg_globals.app.staticdirector(manager[u'default_thumb'])
+            thumb_url = self._app.staticdirector(manager[u'default_thumb'])
         return thumb_url
 
     @property
@@ -208,8 +219,8 @@ class MediaEntryMixin(GenerateSlugMixin):
         will return self.thumb_url if original url doesn't exist"""
         if u"original" not in self.media_files:
             return self.thumb_url
-        
-        return mg_globals.app.public_store.file_url(
+
+        return self._app.public_store.file_url(
             self.media_files[u"original"]
             )
 
@@ -297,6 +308,8 @@ class MediaEntryMixin(GenerateSlugMixin):
 
 
 class MediaCommentMixin(object):
+    object_type = "comment"
+
     @property
     def content_html(self):
         """
@@ -321,6 +334,8 @@ class MediaCommentMixin(object):
 
 
 class CollectionMixin(GenerateSlugMixin):
+    object_type = "collection"
+
     def check_slug_used(self, slug):
         # import this here due to a cyclic import issue
         # (db.models -> db.mixin -> db.util -> db.models)
@@ -363,3 +378,149 @@ class CollectionItemMixin(object):
         Run through Markdown and the HTML cleaner.
         """
         return cleaned_markdown_conversion(self.note)
+
+class ActivityMixin(object):
+    object_type = "activity"
+
+    VALID_VERBS = ["add", "author", "create", "delete", "dislike", "favorite",
+                   "follow", "like", "post", "share", "unfavorite", "unfollow",
+                   "unlike", "unshare", "update", "tag"]
+
+    def get_url(self, request):
+        return request.urlgen(
+            "mediagoblin.user_pages.activity_view",
+            username=self.get_actor.username,
+            id=self.id,
+            qualified=True
+        )
+
+    def generate_content(self):
+        """ Produces a HTML content for object """
+        # some of these have simple and targetted. If self.target it set
+        # it will pick the targetted. If they DON'T have a targetted version
+        # the information in targetted won't be added to the content.
+        verb_to_content = {
+            "add": {
+                "simple" : _("{username} added {object}"),
+                "targetted":  _("{username} added {object} to {target}"),
+            },
+            "author": {"simple": _("{username} authored {object}")},
+            "create": {"simple": _("{username} created {object}")},
+            "delete": {"simple": _("{username} deleted {object}")},
+            "dislike": {"simple": _("{username} disliked {object}")},
+            "favorite": {"simple": _("{username} favorited {object}")},
+            "follow": {"simple": _("{username} followed {object}")},
+            "like": {"simple": _("{username} liked {object}")},
+            "post": {
+                "simple": _("{username} posted {object}"),
+                "targetted": _("{username} posted {object} to {target}"),
+            },
+            "share": {"simple": _("{username} shared {object}")},
+            "unfavorite": {"simple": _("{username} unfavorited {object}")},
+            "unfollow": {"simple": _("{username} stopped following {object}")},
+            "unlike": {"simple": _("{username} unliked {object}")},
+            "unshare": {"simple": _("{username} unshared {object}")},
+            "update": {"simple": _("{username} updated {object}")},
+            "tag": {"simple": _("{username} tagged {object}")},
+        }
+
+        object_map = {
+            "image": _("an image"),
+            "comment": _("a comment"),
+            "collection": _("a collection"),
+            "video": _("a video"),
+            "audio": _("audio"),
+            "person": _("a person"),
+        }
+
+        obj = self.get_object
+        target = self.get_target
+        actor = self.get_actor
+        content = verb_to_content.get(self.verb, None)
+
+        if content is None or obj is None:
+            return
+
+        # Decide what to fill the object with
+        if hasattr(obj, "title") and obj.title.strip(" "):
+            object_value = obj.title
+        elif obj.object_type in object_map:
+            object_value = object_map[obj.object_type]
+        else:
+            object_value = _("an object")
+
+        # Do we want to add a target (indirect object) to content?
+        if target is not None and "targetted" in content:
+            if hasattr(target, "title") and target.title.strip(" "):
+                target_value = target.title
+            elif target.object_type in object_map:
+                target_value = object_map[target.object_type]
+            else:
+                target_value = _("an object")
+
+            self.content = content["targetted"].format(
+                username=actor.username,
+                object=object_value,
+                target=target_value
+            )
+        else:
+            self.content = content["simple"].format(
+                username=actor.username,
+                object=object_value
+            )
+
+        return self.content
+
+    def serialize(self, request):
+        href = request.urlgen(
+            "mediagoblin.api.object",
+            object_type=self.object_type,
+            id=self.id,
+            qualified=True
+        )
+        published = UTC.localize(self.published)
+        updated = UTC.localize(self.updated)
+        obj = {
+            "id": href,
+            "actor": self.get_actor.serialize(request),
+            "verb": self.verb,
+            "published": published.isoformat(),
+            "updated": updated.isoformat(),
+            "content": self.content,
+            "url": self.get_url(request),
+            "object": self.get_object.serialize(request),
+            "objectType": self.object_type,
+            "links": {
+                "self": {
+                    "href": href,
+                },
+            },
+        }
+
+        if self.generator:
+            obj["generator"] = self.get_generator.serialize(request)
+
+        if self.title:
+            obj["title"] = self.title
+
+        target = self.get_target
+        if target is not None:
+            obj["target"] = target.serialize(request)
+
+        return obj
+
+    def unseralize(self, data):
+        """
+        Takes data given and set it on this activity.
+
+        Several pieces of data are not written on because of security
+        reasons. For example changing the author or id of an activity.
+        """
+        if "verb" in data:
+            self.verb = data["verb"]
+
+        if "title" in data:
+            self.title = data["title"]
+
+        if "content" in data:
+            self.content = data["content"]
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 2ff30d22..e8fb17a7 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -18,13 +18,15 @@
 TODO: indexes on foreignkeys, where useful.
 """
 
+from __future__ import print_function
+
 import logging
 import datetime
 
 from sqlalchemy import Column, Integer, Unicode, UnicodeText, DateTime, \
         Boolean, ForeignKey, UniqueConstraint, PrimaryKeyConstraint, \
         SmallInteger, Date
-from sqlalchemy.orm import relationship, backref, with_polymorphic
+from sqlalchemy.orm import relationship, backref, with_polymorphic, validates
 from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.sql.expression import desc
 from sqlalchemy.ext.associationproxy import association_proxy
@@ -34,20 +36,90 @@ from mediagoblin.db.extratypes import (PathTupleWithSlashes, JSONEncoded,
                                        MutationDict)
 from mediagoblin.db.base import Base, DictReadAttrProxy
 from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, \
-        MediaCommentMixin, CollectionMixin, CollectionItemMixin
+        MediaCommentMixin, CollectionMixin, CollectionItemMixin, \
+        ActivityMixin
 from mediagoblin.tools.files import delete_media_files
 from mediagoblin.tools.common import import_component
+from mediagoblin.tools.routing import extract_url_arguments
 
-# It's actually kind of annoying how sqlalchemy-migrate does this, if
-# I understand it right, but whatever.  Anyway, don't remove this :P
-#
-# We could do migration calls more manually instead of relying on
-# this import-based meddling...
-from migrate import changeset
+import six
+from pytz import UTC
 
 _log = logging.getLogger(__name__)
 
+class Location(Base):
+    """ Represents a physical location """
+    __tablename__ = "core__locations"
+
+    id = Column(Integer, primary_key=True)
+    name = Column(Unicode)
+
+    # GPS coordinates
+    position = Column(MutationDict.as_mutable(JSONEncoded))
+    address = Column(MutationDict.as_mutable(JSONEncoded))
+
+    @classmethod
+    def create(cls, data, obj):
+        location = cls()
+        location.unserialize(data)
+        location.save()
+        obj.location = location.id
+        return location
+
+    def serialize(self, request):
+        location = {"objectType": "place"}
+
+        if self.name is not None:
+            location["displayName"] = self.name
+
+        if self.position:
+            location["position"] = self.position
 
+        if self.address:
+            location["address"] = self.address
+
+        return location
+
+    def unserialize(self, data):
+        if "displayName" in data:
+            self.name = data["displayName"]
+
+        self.position = {}
+        self.address = {}
+
+        # nicer way to do this?
+        if "position" in data:
+            # TODO: deal with ISO 9709 formatted string as position
+            if "altitude" in data["position"]:
+                self.position["altitude"] = data["position"]["altitude"]
+
+            if "direction" in data["position"]:
+                self.position["direction"] = data["position"]["direction"]
+
+            if "longitude" in data["position"]:
+                self.position["longitude"] = data["position"]["longitude"]
+
+            if "latitude" in data["position"]:
+                self.position["latitude"] = data["position"]["latitude"]
+
+        if "address" in data:
+            if "formatted" in data["address"]:
+                self.address["formatted"] = data["address"]["formatted"]
+
+            if "streetAddress" in data["address"]:
+                self.address["streetAddress"] = data["address"]["streetAddress"]
+
+            if "locality" in data["address"]:
+                self.address["locality"] = data["address"]["locality"]
+
+            if "region" in data["address"]:
+                self.address["region"] = data["address"]["region"]
+
+            if "postalCode" in data["address"]:
+                self.address["postalCode"] = data["addresss"]["postalCode"]
+
+            if "country" in data["address"]:
+                self.address["country"] = data["address"]["country"]
 
 class User(Base, UserMixin):
     """
@@ -64,7 +136,7 @@ class User(Base, UserMixin):
     # point.
     email = Column(Unicode, nullable=False)
     pw_hash = Column(Unicode)
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
     # Intented to be nullable=False, but migrations would not work for it
     # set to nullable=True implicitly.
     wants_comment_notification = Column(Boolean, default=True)
@@ -74,6 +146,10 @@ class User(Base, UserMixin):
     bio = Column(UnicodeText)  # ??
     uploaded = Column(Integer, default=0)
     upload_limit = Column(Integer)
+    location = Column(Integer, ForeignKey("core__locations.id"))
+    get_location = relationship("Location", lazy="joined")
+
+    activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
 
     ## TODO
     # plugin data would be in a separate model
@@ -138,11 +214,13 @@ class User(Base, UserMixin):
 
 
     def serialize(self, request):
+        published = UTC.localize(self.created)
         user = {
             "id": "acct:{0}@{1}".format(self.username, request.host),
+            "published": published.isoformat(),
             "preferredUsername": self.username,
             "displayName": "{0}@{1}".format(self.username, request.host),
-            "objectType": "person",
+            "objectType": self.object_type,
             "pump_io": {
                 "shared": False,
                 "followed": False,
@@ -150,21 +228,21 @@ class User(Base, UserMixin):
             "links": {
                 "self": {
                     "href": request.urlgen(
-                            "mediagoblin.federation.user.profile",
+                            "mediagoblin.api.user.profile",
                              username=self.username,
                              qualified=True
                              ),
                 },
                 "activity-inbox": {
                     "href": request.urlgen(
-                            "mediagoblin.federation.inbox",
+                            "mediagoblin.api.inbox",
                             username=self.username,
                             qualified=True
                             )
                 },
                 "activity-outbox": {
                     "href": request.urlgen(
-                            "mediagoblin.federation.feed",
+                            "mediagoblin.api.feed",
                             username=self.username,
                             qualified=True
                             )
@@ -176,9 +254,18 @@ class User(Base, UserMixin):
             user.update({"summary": self.bio})
         if self.url:
             user.update({"url": self.url})
+        if self.location:
+            user.update({"location": self.get_location.serialize(request)})
 
         return user
 
+    def unserialize(self, data):
+        if "summary" in data:
+            self.bio = data["summary"]
+
+        if "location" in data:
+            Location.create(data, self)
+
 class Client(Base):
     """
         Model representing a client - Used for API Auth
@@ -189,8 +276,8 @@ class Client(Base):
     secret = Column(Unicode, nullable=False)
     expirey = Column(DateTime, nullable=True)
     application_type = Column(Unicode, nullable=False)
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now)
-    updated = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
+    updated = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
 
     # optional stuff
     redirect_uri = Column(JSONEncoded, nullable=True)
@@ -218,8 +305,10 @@ class RequestToken(Base):
     authenticated = Column(Boolean, default=False)
     verifier = Column(Unicode, nullable=True)
     callback = Column(Unicode, nullable=False, default=u"oob")
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now)
-    updated = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
+    updated = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
+
+    get_client = relationship(Client)
 
 class AccessToken(Base):
     """
@@ -231,8 +320,10 @@ class AccessToken(Base):
     secret = Column(Unicode, nullable=False)
     user = Column(Integer, ForeignKey(User.id))
     request_token = Column(Unicode, ForeignKey(RequestToken.token))
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now)
-    updated = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
+    updated = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
+
+    get_requesttoken = relationship(RequestToken)
 
 
 class NonceTimestamp(Base):
@@ -254,7 +345,7 @@ class MediaEntry(Base, MediaEntryMixin):
     uploader = Column(Integer, ForeignKey(User.id), nullable=False, index=True)
     title = Column(Unicode, nullable=False)
     slug = Column(Unicode)
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now,
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow,
         index=True)
     description = Column(UnicodeText) # ??
     media_type = Column(Unicode, nullable=False)
@@ -262,6 +353,8 @@ class MediaEntry(Base, MediaEntryMixin):
         # or use sqlalchemy.types.Enum?
     license = Column(Unicode)
     file_size = Column(Integer, default=0)
+    location = Column(Integer, ForeignKey("core__locations.id"))
+    get_location = relationship("Location", lazy="joined")
 
     fail_error = Column(Unicode)
     fail_metadata = Column(JSONEncoded)
@@ -309,6 +402,8 @@ class MediaEntry(Base, MediaEntryMixin):
     media_metadata = Column(MutationDict.as_mutable(JSONEncoded),
         default=MutationDict())
 
+    activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
+
     ## TODO
     # fail_error
 
@@ -344,7 +439,7 @@ class MediaEntry(Base, MediaEntryMixin):
         return the value of the key.
         """
         media_file = MediaFile.query.filter_by(media_entry=self.id,
-                                               name=unicode(file_key)).first()
+                                               name=six.text_type(file_key)).first()
 
         if media_file:
             if metadata_key:
@@ -357,11 +452,11 @@ class MediaEntry(Base, MediaEntryMixin):
         Update the file_metadata of a MediaFile.
         """
         media_file = MediaFile.query.filter_by(media_entry=self.id,
-                                               name=unicode(file_key)).first()
+                                               name=six.text_type(file_key)).first()
 
         file_metadata = media_file.file_metadata or {}
 
-        for key, value in kwargs.iteritems():
+        for key, value in six.iteritems(kwargs):
             file_metadata[key] = value
 
         media_file.file_metadata = file_metadata
@@ -386,7 +481,7 @@ class MediaEntry(Base, MediaEntryMixin):
             media_data.get_media_entry = self
         else:
             # Update old media data
-            for field, value in kwargs.iteritems():
+            for field, value in six.iteritems(kwargs):
                 setattr(media_data, field, value)
 
     @memoized_property
@@ -394,7 +489,11 @@ class MediaEntry(Base, MediaEntryMixin):
         return import_component(self.media_type + '.models:BACKREF_NAME')
 
     def __repr__(self):
-        safe_title = self.title.encode('ascii', 'replace')
+        if six.PY2:
+            # obj.__repr__() should return a str on Python 2
+            safe_title = self.title.encode('utf-8', 'replace')
+        else:
+            safe_title = self.title
 
         return '<{classname} {id}: {title}>'.format(
                 classname=self.__class__.__name__,
@@ -415,7 +514,7 @@ class MediaEntry(Base, MediaEntryMixin):
         # Delete all related files/attachments
         try:
             delete_media_files(self)
-        except OSError, error:
+        except OSError as error:
             # Returns list of files we failed to delete
             _log.error('No such files from the user "{1}" to delete: '
                        '{0}'.format(str(error), self.get_uploader))
@@ -430,38 +529,36 @@ class MediaEntry(Base, MediaEntryMixin):
         # pass through commit=False/True in kwargs
         super(MediaEntry, self).delete(**kwargs)
 
-    @property
-    def objectType(self):
-        """ Converts media_type to pump-like type - don't use internally """
-        return self.media_type.split(".")[-1]
-
     def serialize(self, request, show_comments=True):
         """ Unserialize MediaEntry to object """
+        href = request.urlgen(
+            "mediagoblin.api.object",
+            object_type=self.object_type,
+            id=self.id,
+            qualified=True
+        )
         author = self.get_uploader
+        published = UTC.localize(self.created)
+        updated = UTC.localize(self.created)
         context = {
-            "id": self.id,
+            "id": href,
             "author": author.serialize(request),
-            "objectType": self.objectType,
-            "url": self.url_for_self(request.urlgen),
+            "objectType": self.object_type,
+            "url": self.url_for_self(request.urlgen, qualified=True),
             "image": {
                 "url": request.host_url + self.thumb_url[1:],
             },
             "fullImage":{
                 "url": request.host_url + self.original_url[1:],
             },
-            "published": self.created.isoformat(),
-            "updated": self.created.isoformat(),
+            "published": published.isoformat(),
+            "updated": updated.isoformat(),
             "pump_io": {
                 "shared": False,
             },
             "links": {
                 "self": {
-                    "href": request.urlgen(
-                        "mediagoblin.federation.object",
-                        objectType=self.objectType,
-                        id=self.id,
-                        qualified=True
-                    ),
+                    "href": href,
                 },
 
             }
@@ -476,20 +573,40 @@ class MediaEntry(Base, MediaEntryMixin):
         if self.license:
             context["license"] = self.license
 
+        if self.location:
+            context["location"] = self.get_location.serialize(request)
+
         if show_comments:
-            comments = [comment.serialize(request) for comment in self.get_comments()]
+            comments = [
+                comment.serialize(request) for comment in self.get_comments()]
             total = len(comments)
             context["replies"] = {
                 "totalItems": total,
                 "items": comments,
                 "url": request.urlgen(
-                        "mediagoblin.federation.object.comments",
-                        objectType=self.objectType,
+                        "mediagoblin.api.object.comments",
+                        object_type=self.object_type,
                         id=self.id,
                         qualified=True
                         ),
             }
 
+        # Add image height and width if possible. We didn't use to store this
+        # data and we're not able (and maybe not willing) to re-process all
+        # images so it's possible this might not exist.
+        if self.get_file_metadata("thumb", "height"):
+            height = self.get_file_metadata("thumb", "height")
+            context["image"]["height"] = height
+        if self.get_file_metadata("thumb", "width"):
+            width = self.get_file_metadata("thumb", "width")
+            context["image"]["width"] = width
+        if self.get_file_metadata("original", "height"):
+            height = self.get_file_metadata("original", "height")
+            context["fullImage"]["height"] = height
+        if self.get_file_metadata("original", "height"):
+            width = self.get_file_metadata("original", "width")
+            context["fullImage"]["width"] = width
+
         return context
 
     def unserialize(self, data):
@@ -503,6 +620,9 @@ class MediaEntry(Base, MediaEntryMixin):
         if "license" in data:
             self.license = data["license"]
 
+        if "location" in data:
+            Licence.create(data["location"], self)
+
         return True
 
 class FileKeynames(Base):
@@ -561,7 +681,7 @@ class MediaAttachmentFile(Base):
         nullable=False)
     name = Column(Unicode, nullable=False)
     filepath = Column(PathTupleWithSlashes)
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
 
     @property
     def dict_view(self):
@@ -595,7 +715,7 @@ class MediaTag(Base):
         nullable=False, index=True)
     tag = Column(Integer, ForeignKey(Tag.id), nullable=False, index=True)
     name = Column(Unicode)
-    # created = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    # created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
 
     __table_args__ = (
         UniqueConstraint('tag', 'media_entry'),
@@ -626,8 +746,10 @@ class MediaComment(Base, MediaCommentMixin):
     media_entry = Column(
         Integer, ForeignKey(MediaEntry.id), nullable=False, index=True)
     author = Column(Integer, ForeignKey(User.id), nullable=False)
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
     content = Column(UnicodeText, nullable=False)
+    location = Column(Integer, ForeignKey("core__locations.id"))
+    get_location = relationship("Location", lazy="joined")
 
     # Cascade: Comments are owned by their creator. So do the full thing.
     # lazy=dynamic: People might post a *lot* of comments,
@@ -650,44 +772,60 @@ class MediaComment(Base, MediaCommentMixin):
                                                    lazy="dynamic",
                                                    cascade="all, delete-orphan"))
 
+
+    activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
+
     def serialize(self, request):
         """ Unserialize to python dictionary for API """
+        href = request.urlgen(
+            "mediagoblin.api.object",
+            object_type=self.object_type,
+            id=self.id,
+            qualified=True
+        )
         media = MediaEntry.query.filter_by(id=self.media_entry).first()
         author = self.get_author
+        published = UTC.localize(self.created)
         context = {
-            "id": self.id,
-            "objectType": "comment",
+            "id": href,
+            "objectType": self.object_type,
             "content": self.content,
             "inReplyTo": media.serialize(request, show_comments=False),
-            "author": author.serialize(request)
+            "author": author.serialize(request),
+            "published": published.isoformat(),
+            "updated": published.isoformat(),
         }
 
+        if self.location:
+            context["location"] = self.get_location.seralize(request)
+
         return context
 
-    def unserialize(self, data):
+    def unserialize(self, data, request):
         """ Takes API objects and unserializes on existing comment """
-        # Do initial checks to verify the object is correct
-        required_attributes = ["content", "inReplyTo"]
-        for attr in required_attributes:
-            if attr not in data:
+        # Handle changing the reply ID
+        if "inReplyTo" in data:
+            # Validate that the ID is correct
+            try:
+                media_id = int(extract_url_arguments(
+                    url=data["inReplyTo"]["id"],
+                    urlmap=request.app.url_map
+                )["id"])
+            except ValueError:
                 return False
 
-        # Validate inReplyTo has ID
-        if "id" not in data["inReplyTo"]:
-            return False
+            media = MediaEntry.query.filter_by(id=media_id).first()
+            if media is None:
+                return False
 
-        # Validate that the ID is correct
-        try:
-            media_id = int(data["inReplyTo"]["id"])
-        except ValueError:
-            return False
+            self.media_entry = media.id
 
-        media = MediaEntry.query.filter_by(id=media_id).first()
-        if media is None:
-            return False
+        if "content" in data:
+            self.content = data["content"]
+
+        if "location" in data:
+            Location.create(data["location"], self)
 
-        self.media_entry = media.id
-        self.content = data["content"]
         return True
 
 
@@ -702,10 +840,13 @@ class Collection(Base, CollectionMixin):
     id = Column(Integer, primary_key=True)
     title = Column(Unicode, nullable=False)
     slug = Column(Unicode)
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now,
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow,
                      index=True)
     description = Column(UnicodeText)
     creator = Column(Integer, ForeignKey(User.id), nullable=False)
+    location = Column(Integer, ForeignKey("core__locations.id"))
+    get_location = relationship("Location", lazy="joined")
+
     # TODO: No of items in Collection. Badly named, can we migrate to num_items?
     items = Column(Integer, default=0)
 
@@ -714,6 +855,8 @@ class Collection(Base, CollectionMixin):
                                backref=backref("collections",
                                                cascade="all, delete-orphan"))
 
+    activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
+
     __table_args__ = (
         UniqueConstraint('creator', 'slug'),
         {})
@@ -734,6 +877,18 @@ class Collection(Base, CollectionMixin):
             creator=self.creator,
             title=safe_title)
 
+    def serialize(self, request):
+        # Get all serialized output in a list
+        items = []
+        for item in self.get_collection_items():
+            items.append(item.serialize(request))
+
+        return {
+            "totalItems": self.items,
+            "url": self.url_for_self(request.urlgen, qualified=True),
+            "items": items,
+        }
+
 
 class CollectionItem(Base, CollectionItemMixin):
     __tablename__ = "core__collection_items"
@@ -743,7 +898,7 @@ class CollectionItem(Base, CollectionItemMixin):
         Integer, ForeignKey(MediaEntry.id), nullable=False, index=True)
     collection = Column(Integer, ForeignKey(Collection.id), nullable=False)
     note = Column(UnicodeText, nullable=True)
-    added = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    added = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
     position = Column(Integer)
 
     # Cascade: CollectionItems are owned by their Collection. So do the full thing.
@@ -770,6 +925,9 @@ class CollectionItem(Base, CollectionItemMixin):
             collection=self.collection,
             entry=self.media_entry)
 
+    def serialize(self, request):
+        return self.get_media_entry.serialize(request)
+
 
 class ProcessingMetaData(Base):
     __tablename__ = 'core__processing_metadata'
@@ -792,7 +950,7 @@ class CommentSubscription(Base):
     __tablename__ = 'core__comment_subscriptions'
     id = Column(Integer, primary_key=True)
 
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
 
     media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False)
     media_entry = relationship(MediaEntry,
@@ -823,7 +981,7 @@ class Notification(Base):
     id = Column(Integer, primary_key=True)
     type = Column(Unicode)
 
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
 
     user_id = Column(Integer, ForeignKey('core__users.id'), nullable=False,
                      index=True)
@@ -883,9 +1041,8 @@ class ProcessingNotification(Notification):
         'polymorphic_identity': 'processing_notification'
     }
 
-with_polymorphic(
-    Notification,
-    [ProcessingNotification, CommentNotification])
+# the with_polymorphic call has been moved to the bottom above MODELS
+# this is because it causes conflicts with relationship calls.
 
 class ReportBase(Base):
     """
@@ -930,7 +1087,7 @@ class ReportBase(Base):
             lazy="dynamic",
             cascade="all, delete-orphan"),
         primaryjoin="User.id==ReportBase.reported_user_id")
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now())
+    created = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
     discriminator = Column('type', Unicode(50))
     resolver_id = Column(Integer, ForeignKey(User.id))
     resolver = relationship(
@@ -1068,13 +1225,198 @@ class PrivilegeUserAssociation(Base):
         ForeignKey(Privilege.id),
         primary_key=True)
 
+class Generator(Base):
+    """ Information about what created an activity """
+    __tablename__ = "core__generators"
+
+    id = Column(Integer, primary_key=True)
+    name = Column(Unicode, nullable=False)
+    published = Column(DateTime, default=datetime.datetime.utcnow)
+    updated = Column(DateTime, default=datetime.datetime.utcnow)
+    object_type = Column(Unicode, nullable=False)
+
+    def __repr__(self):
+        return "<{klass} {name}>".format(
+            klass=self.__class__.__name__,
+            name=self.name
+        )
+
+    def serialize(self, request):
+        href = request.urlgen(
+            "mediagoblin.api.object",
+            object_type=self.object_type,
+            id=self.id,
+            qualified=True
+        )
+        published = UTC.localize(self.published)
+        updated = UTC.localize(self.updated)
+        return {
+            "id": href,
+            "displayName": self.name,
+            "published": published.isoformat(),
+            "updated": updated.isoformat(),
+            "objectType": self.object_type,
+        }
+
+    def unserialize(self, data):
+        if "displayName" in data:
+            self.name = data["displayName"]
+
+
+class ActivityIntermediator(Base):
+    """
+    This is used so that objects/targets can have a foreign key back to this
+    object and activities can a foreign key to this object. This objects to be
+    used multiple times for the activity object or target and also allows for
+    different types of objects to be used as an Activity.
+    """
+    __tablename__ = "core__activity_intermediators"
+
+    id = Column(Integer, primary_key=True)
+    type = Column(Unicode, nullable=False)
+
+    TYPES = {
+        "user": User,
+        "media": MediaEntry,
+        "comment": MediaComment,
+        "collection": Collection,
+    }
+
+    def _find_model(self, obj):
+        """ Finds the model for a given object """
+        for key, model in self.TYPES.items():
+            if isinstance(obj, model):
+                return key, model
+
+        return None, None
+
+    def set(self, obj):
+        """ This sets itself as the activity """
+        key, model = self._find_model(obj)
+        if key is None:
+            raise ValueError("Invalid type of object given")
+
+        self.type = key
+
+        # We need to populate the self.id so we need to save but, we don't
+        # want to save this AI in the database (yet) so commit=False.
+        self.save(commit=False)
+        obj.activity = self.id
+        obj.save()
+
+    def get(self):
+        """ Finds the object for an activity """
+        if self.type is None:
+            return None
+
+        model = self.TYPES[self.type]
+        return model.query.filter_by(activity=self.id).first()
+
+    @validates("type")
+    def validate_type(self, key, value):
+        """ Validate that the type set is a valid type """
+        assert value in self.TYPES
+        return value
+
+class Activity(Base, ActivityMixin):
+    """
+    This holds all the metadata about an activity such as uploading an image,
+    posting a comment, etc.
+    """
+    __tablename__ = "core__activities"
+
+    id = Column(Integer, primary_key=True)
+    actor = Column(Integer,
+                   ForeignKey("core__users.id"),
+                   nullable=False)
+    published = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
+    updated = Column(DateTime, nullable=False, default=datetime.datetime.utcnow)
+    verb = Column(Unicode, nullable=False)
+    content = Column(Unicode, nullable=True)
+    title = Column(Unicode, nullable=True)
+    generator = Column(Integer,
+                       ForeignKey("core__generators.id"),
+                       nullable=True)
+    object = Column(Integer,
+                    ForeignKey("core__activity_intermediators.id"),
+                    nullable=False)
+    target = Column(Integer,
+                    ForeignKey("core__activity_intermediators.id"),
+                    nullable=True)
+
+    get_actor = relationship(User,
+                             backref=backref("activities",
+                                             cascade="all, delete-orphan"))
+    get_generator = relationship(Generator)
+
+    def __repr__(self):
+        if self.content is None:
+            return "<{klass} verb:{verb}>".format(
+                klass=self.__class__.__name__,
+                verb=self.verb
+            )
+        else:
+            return "<{klass} {content}>".format(
+                klass=self.__class__.__name__,
+                content=self.content
+            )
+
+    @property
+    def get_object(self):
+        if self.object is None:
+            return None
+
+        ai = ActivityIntermediator.query.filter_by(id=self.object).first()
+        return ai.get()
+
+    def set_object(self, obj):
+        self.object = self._set_model(obj)
+
+    @property
+    def get_target(self):
+        if self.target is None:
+            return None
+
+        ai = ActivityIntermediator.query.filter_by(id=self.target).first()
+        return ai.get()
+
+    def set_target(self, obj):
+        self.target = self._set_model(obj)
+
+    def _set_model(self, obj):
+        # Firstly can we set obj
+        if not hasattr(obj, "activity"):
+            raise ValueError(
+                "{0!r} is unable to be set on activity".format(obj))
+
+        if obj.activity is None:
+            # We need to create a new AI
+            ai = ActivityIntermediator()
+            ai.set(obj)
+            ai.save()
+            return ai.id
+
+        # Okay we should have an existing AI
+        return ActivityIntermediator.query.filter_by(id=obj.activity).first().id
+
+    def save(self, set_updated=True, *args, **kwargs):
+        if set_updated:
+            self.updated = datetime.datetime.now()
+        super(Activity, self).save(*args, **kwargs)
+
+with_polymorphic(
+    Notification,
+    [ProcessingNotification, CommentNotification])
+
 MODELS = [
     User, MediaEntry, Tag, MediaTag, MediaComment, Collection, CollectionItem,
     MediaFile, FileKeynames, MediaAttachmentFile, ProcessingMetaData,
     Notification, CommentNotification, ProcessingNotification, Client,
     CommentSubscription, ReportBase, CommentReport, MediaReport, UserBan,
 	Privilege, PrivilegeUserAssociation,
-    RequestToken, AccessToken, NonceTimestamp]
+    RequestToken, AccessToken, NonceTimestamp,
+    Activity, ActivityIntermediator, Generator,
+    Location]
 
 """
  Foundations are the default rows that are created immediately after the tables
@@ -1125,7 +1467,7 @@ def show_table_init(engine_uri):
 
 if __name__ == '__main__':
     from sys import argv
-    print repr(argv)
+    print(repr(argv))
     if len(argv) == 2:
         uri = argv[1]
     else:
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 4ff0945f..8f81c8d9 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -15,38 +15,117 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from sqlalchemy import create_engine, event
+from contextlib import contextmanager
 import logging
 
-from mediagoblin.db.base import Base, Session
+import six
+from sqlalchemy import create_engine, event
+
 from mediagoblin import mg_globals
+from mediagoblin.db.base import Base
 
 _log = logging.getLogger(__name__)
 
+from mediagoblin.tools.transition import DISABLE_GLOBALS
+
+def set_models_as_attributes(obj):
+    """
+    Set all models as attributes on this object, for convenience
+
+    TODO: This should eventually be deprecated.
+    """
+    for k, v in six.iteritems(Base._decl_class_registry):
+        setattr(obj, k, v)
+
+
+if not DISABLE_GLOBALS:
+    from mediagoblin.db.base import Session
+
+    class DatabaseMaster(object):
+        def __init__(self, engine):
+            self.engine = engine
+
+            set_models_as_attributes(self)
+
+        def commit(self):
+            Session.commit()
 
-class DatabaseMaster(object):
-    def __init__(self, engine):
-        self.engine = engine
+        def save(self, obj):
+            Session.add(obj)
+            Session.flush()
 
-        for k, v in Base._decl_class_registry.iteritems():
-            setattr(self, k, v)
+        def check_session_clean(self):
+            for dummy in Session():
+                _log.warn("STRANGE: There are elements in the sql session. "
+                          "Please report this and help us track this down.")
+                break
 
-    def commit(self):
-        Session.commit()
+        def reset_after_request(self):
+            Session.rollback()
+            Session.remove()
 
-    def save(self, obj):
-        Session.add(obj)
-        Session.flush()
+        @property
+        def query(self):
+            return Session.query
 
-    def check_session_clean(self):
-        for dummy in Session():
-            _log.warn("STRANGE: There are elements in the sql session. "
-                      "Please report this and help us track this down.")
-            break
+else:
+    from sqlalchemy.orm import sessionmaker
+
+    class DatabaseManager(object):
+        """
+        Manage database connections.
+
+        The main method here is session_scope which can be used with a
+        "with" statement to get a session that is properly torn down
+        by the end of execution.
+        """
+        def __init__(self, engine):
+            self.engine = engine
+            self.Session = sessionmaker(bind=engine)
+            set_models_as_attributes(self)
+
+        @contextmanager
+        def session_scope(self):
+            """
+            This is a context manager, use like::
+
+              with dbmanager.session_scope() as request.db:
+                  some_view(request)
+            """
+            session = self.Session()
+
+            #####################################
+            # Functions to emulate DatabaseMaster
+            #####################################
+            def save(obj):
+                session.add(obj)
+                session.flush()
+
+            def check_session_clean():
+                # Is this implemented right?
+                for dummy in session:
+                    _log.warn("STRANGE: There are elements in the sql session. "
+                              "Please report this and help us track this down.")
+                    break
+
+            def reset_after_request():
+                session.rollback()
+                session.remove()
+
+            # now attach
+            session.save = save
+            session.check_session_clean = check_session_clean
+            session.reset_after_request = reset_after_request
+
+            set_models_as_attributes(session)
+            #####################################
+
+            try:
+                yield session
+            finally:
+                session.rollback()
+                session.close()
 
-    def reset_after_request(self):
-        Session.rollback()
-        Session.remove()
 
 
 def load_models(app_config):
@@ -75,9 +154,14 @@ def _sqlite_disable_fk_pragma_on_connect(dbapi_con, con_record):
     dbapi_con.execute('pragma foreign_keys=off')
 
 
-def setup_connection_and_db_from_config(app_config, migrations=False):
+def setup_connection_and_db_from_config(app_config, migrations=False, app=None):
     engine = create_engine(app_config['sql_engine'])
 
+    # @@: Maybe make a weak-ref so an engine can get garbage
+    # collected?  Not that we expect to make a lot of MediaGoblinApp
+    # instances in a single process...
+    engine.app = app
+
     # Enable foreign key checking for sqlite
     if app_config['sql_engine'].startswith('sqlite://'):
         if migrations:
@@ -88,9 +172,13 @@ def setup_connection_and_db_from_config(app_config, migrations=False):
 
     # logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
 
-    Session.configure(bind=engine)
+    if DISABLE_GLOBALS:
+        return DatabaseManager(engine)
+
+    else:
+        Session.configure(bind=engine)
 
-    return DatabaseMaster(engine)
+        return DatabaseMaster(engine)
 
 
 def check_db_migrations_current(db):
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 515fd6cd..7c026691 100644
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -17,10 +17,14 @@
 import sys
 
 from mediagoblin import mg_globals as mgg
-from mediagoblin.db.base import Session
 from mediagoblin.db.models import MediaEntry, Tag, MediaTag, Collection
 from mediagoblin.gmg_commands.dbupdate import gather_database_data
 
+from mediagoblin.tools.transition import DISABLE_GLOBALS
+
+if not DISABLE_GLOBALS:
+    from mediagoblin.db.base import Session
+
 ##########################
 # Random utility functions
 ##########################
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index 5bf60048..b5ec0ce8 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -16,10 +16,11 @@
 
 from functools import wraps
 
-from urlparse import urljoin
 from werkzeug.exceptions import Forbidden, NotFound
 from oauthlib.oauth1 import ResourceEndpoint
 
+from six.moves.urllib.parse import urljoin
+
 from mediagoblin import mg_globals as mgg
 from mediagoblin import messages
 from mediagoblin.db.models import MediaEntry, User, MediaComment, AccessToken
@@ -406,7 +407,7 @@ def oauth_required(controller):
         request_validator = GMGRequestValidator()
         resource_endpoint = ResourceEndpoint(request_validator)
         valid, r = resource_endpoint.validate_protected_resource_request(
-                uri=request.url,
+                uri=request.base_url,
                 http_method=request.method,
                 body=request.data,
                 headers=dict(request.headers),
@@ -418,9 +419,9 @@ def oauth_required(controller):
 
         # Fill user if not already
         token = authorization[u"oauth_token"]
-        access_token = AccessToken.query.filter_by(token=token).first()
-        if access_token is not None and request.user is None:
-            user_id = access_token.user
+        request.access_token = AccessToken.query.filter_by(token=token).first()
+        if request.access_token is not None and request.user is None:
+            user_id = request.access_token.user
             request.user = User.query.filter_by(id=user_id).first()
 
         return controller(request, *args, **kwargs)
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index c0bece8b..cf5056cf 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -25,7 +25,7 @@ from mediagoblin.auth.tools import normalize_user_or_email_field
 
 
 class EditForm(wtforms.Form):
-    title = wtforms.TextField(
+    title = wtforms.StringField(
         _('Title'),
         [wtforms.validators.Length(min=0, max=500)])
     description = wtforms.TextAreaField(
@@ -33,12 +33,12 @@ class EditForm(wtforms.Form):
         description=_("""You can use
                       <a href="http://daringfireball.net/projects/markdown/basics">
                       Markdown</a> for formatting."""))
-    tags = wtforms.TextField(
+    tags = wtforms.StringField(
         _('Tags'),
         [tag_length_validator],
         description=_(
             "Separate tags by commas."))
-    slug = wtforms.TextField(
+    slug = wtforms.StringField(
         _('Slug'),
         [wtforms.validators.InputRequired(message=_("The slug can't be empty"))],
         description=_(
@@ -56,11 +56,12 @@ class EditProfileForm(wtforms.Form):
         description=_("""You can use
                       <a href="http://daringfireball.net/projects/markdown/basics">
                       Markdown</a> for formatting."""))
-    url = wtforms.TextField(
+    url = wtforms.StringField(
         _('Website'),
         [wtforms.validators.Optional(),
          wtforms.validators.URL(message=_("This address contains errors"))])
 
+    location = wtforms.StringField(_('Hometown'))
 
 class EditAccountForm(wtforms.Form):
     wants_comment_notification = wtforms.BooleanField(
@@ -78,14 +79,14 @@ class EditAccountForm(wtforms.Form):
 
 
 class EditAttachmentsForm(wtforms.Form):
-    attachment_name = wtforms.TextField(
+    attachment_name = wtforms.StringField(
         'Title')
     attachment_file = wtforms.FileField(
         'File')
 
 
 class EditCollectionForm(wtforms.Form):
-    title = wtforms.TextField(
+    title = wtforms.StringField(
         _('Title'),
         [wtforms.validators.Length(min=0, max=500), wtforms.validators.InputRequired(message=_("The title can't be empty"))])
     description = wtforms.TextAreaField(
@@ -93,7 +94,7 @@ class EditCollectionForm(wtforms.Form):
         description=_("""You can use
                       <a href="http://daringfireball.net/projects/markdown/basics">
                       Markdown</a> for formatting."""))
-    slug = wtforms.TextField(
+    slug = wtforms.StringField(
         _('Slug'),
         [wtforms.validators.InputRequired(message=_("The slug can't be empty"))],
         description=_(
@@ -115,7 +116,7 @@ class ChangePassForm(wtforms.Form):
 
 
 class ChangeEmailForm(wtforms.Form):
-    new_email = wtforms.TextField(
+    new_email = wtforms.StringField(
         _('New email address'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_user=False)])
@@ -152,8 +153,8 @@ class MetaDataValidator(object):
                 errors.pop())
 
 class MetaDataForm(wtforms.Form):
-    identifier = wtforms.TextField(_(u'Identifier'),[MetaDataValidator()])
-    value = wtforms.TextField(_(u'Value'))
+    identifier = wtforms.StringField(_(u'Identifier'),[MetaDataValidator()])
+    value = wtforms.StringField(_(u'Value'))
 
 class EditMetaDataForm(wtforms.Form):
     media_metadata = wtforms.FieldList(
diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index a2d03d26..b349975d 100644
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -28,3 +28,5 @@ add_route('mediagoblin.edit.verify_email', '/edit/verify_email/',
     'mediagoblin.edit.views:verify_email')
 add_route('mediagoblin.edit.email', '/edit/email/',
     'mediagoblin.edit.views:change_email')
+add_route('mediagoblin.edit.deauthorize_applications', '/edit/deauthorize/',
+    'mediagoblin.edit.views:deauthorize_applications')
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index e998d6be..97e33e6a 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
+
 from datetime import datetime
 
 from itsdangerous import BadSignature
@@ -45,7 +47,7 @@ from mediagoblin.tools.text import (
     convert_to_tag_list_of_dicts, media_tags_as_string)
 from mediagoblin.tools.url import slugify
 from mediagoblin.db.util import check_media_slug_used, check_collection_slug_used
-from mediagoblin.db.models import User
+from mediagoblin.db.models import User, Client, AccessToken, Location
 
 import mimetypes
 
@@ -82,7 +84,7 @@ def edit_media(request, media):
             media.tags = convert_to_tag_list_of_dicts(
                                    form.tags.data)
 
-            media.license = unicode(form.license.data) or None
+            media.license = six.text_type(form.license.data) or None
             media.slug = slug
             media.save()
 
@@ -140,7 +142,7 @@ def edit_attachments(request, media):
 
             attachment_public_filepath \
                 = mg_globals.public_store.get_unique_filepath(
-                ['media_entries', unicode(media.id), 'attachment',
+                ['media_entries', six.text_type(media.id), 'attachment',
                  public_filename])
 
             attachment_public_file = mg_globals.public_store.get_file(
@@ -200,13 +202,28 @@ def edit_profile(request, url_user=None):
 
     user = url_user
 
+    # Get the location name
+    if user.location is None:
+        location = ""
+    else:
+        location = user.get_location.name
+
     form = forms.EditProfileForm(request.form,
         url=user.url,
-        bio=user.bio)
+        bio=user.bio,
+        location=location)
 
     if request.method == 'POST' and form.validate():
-        user.url = unicode(form.url.data)
-        user.bio = unicode(form.bio.data)
+        user.url = six.text_type(form.url.data)
+        user.bio = six.text_type(form.bio.data)
+
+        # Save location
+        if form.location.data and user.location is None:
+            user.get_location = Location(name=unicode(form.location.data))
+        elif form.location.data:
+            location = user.get_location
+            location.name = unicode(form.location.data)
+            location.save()
 
         user.save()
 
@@ -256,6 +273,34 @@ def edit_account(request):
         {'user': user,
          'form': form})
 
+@require_active_login
+def deauthorize_applications(request):
+    """ Deauthroize OAuth applications """
+    if request.method == 'POST' and "application" in request.form:
+        token = request.form["application"]
+        access_token = AccessToken.query.filter_by(token=token).first()
+        if access_token is None:
+            messages.add_message(
+                request,
+                messages.ERROR,
+                _("Unknown application, not able to deauthorize")
+            )
+        else:
+            access_token.delete()
+            messages.add_message(
+                request,
+                messages.SUCCESS,
+                _("Application has been deauthorized")
+            )
+
+    access_tokens = AccessToken.query.filter_by(user=request.user.id)
+    applications = [(a.get_requesttoken, a) for a in access_tokens]
+
+    return render_to_response(
+        request,
+        'mediagoblin/edit/deauthorize_applications.html',
+        {'applications': applications}
+    )
 
 @require_active_login
 def delete_account(request):
@@ -321,9 +366,9 @@ def edit_collection(request, collection):
             form.slug.errors.append(
                 _(u'A collection with that slug already exists for this user.'))
         else:
-            collection.title = unicode(form.title.data)
-            collection.description = unicode(form.description.data)
-            collection.slug = unicode(form.slug.data)
+            collection.title = six.text_type(form.title.data)
+            collection.description = six.text_type(form.description.data)
+            collection.slug = six.text_type(form.slug.data)
 
             collection.save()
 
@@ -450,10 +495,10 @@ def edit_metadata(request, media):
         json_ld_metadata = compact_and_validate(metadata_dict)
         media.media_metadata = json_ld_metadata
         media.save()
-        return redirect_obj(request, media)      
+        return redirect_obj(request, media)
 
     if len(form.media_metadata) == 0:
-        for identifier, value in media.media_metadata.iteritems():
+        for identifier, value in six.iteritems(media.media_metadata):
             if identifier == "@context": continue
             form.media_metadata.append_entry({
                 'identifier':identifier,
diff --git a/mediagoblin/errormiddleware.py b/mediagoblin/errormiddleware.py
index c6789f32..da729d14 100644
--- a/mediagoblin/errormiddleware.py
+++ b/mediagoblin/errormiddleware.py
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from paste.exceptions.errormiddleware import make_error_middleware
-
 MGOBLIN_ERROR_MESSAGE = """\
 <div style="text-align:center;font-family: monospace">
   <h1>YEOWCH... that's an error!</h1>
@@ -56,5 +54,11 @@ def mgoblin_error_middleware(app, global_conf, **kw):
     It should take all of Paste's default options, so see:
       http://pythonpaste.org/modules/exceptions.html
     """
+    # No paste?  Fail in a friendly way!
+    try:
+        from paste.exceptions.errormiddleware import make_error_middleware
+    except ImportError:
+        return app
+
     kw['error_message'] = MGOBLIN_ERROR_MESSAGE
     return make_error_middleware(app, global_conf, **kw)
diff --git a/mediagoblin/federation/routing.py b/mediagoblin/federation/routing.py
deleted file mode 100644
index e9fa6252..00000000
--- a/mediagoblin/federation/routing.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from mediagoblin.tools.routing import add_route
-
-# Add user profile
-add_route(
-    "mediagoblin.federation.user",
-    "/api/user/<string:username>/",
-    "mediagoblin.federation.views:user_endpoint"
-)
-
-add_route(
-    "mediagoblin.federation.user.profile",
-    "/api/user/<string:username>/profile",
-    "mediagoblin.federation.views:profile_endpoint"
-)
-
-# Inbox and Outbox (feed)
-add_route(
-    "mediagoblin.federation.feed",
-    "/api/user/<string:username>/feed",
-    "mediagoblin.federation.views:feed_endpoint"
-)
-
-add_route(
-    "mediagoblin.federation.user.uploads",
-    "/api/user/<string:username>/uploads",
-    "mediagoblin.federation.views:uploads_endpoint"
-)
-
-add_route(
-    "mediagoblin.federation.inbox",
-    "/api/user/<string:username>/inbox",
-    "mediagoblin.federation.views:feed_endpoint"
-)
-
-# object endpoints
-add_route(
-    "mediagoblin.federation.object",
-    "/api/<string:objectType>/<string:id>",
-    "mediagoblin.federation.views:object_endpoint"
-    )
-add_route(
-    "mediagoblin.federation.object.comments",
-    "/api/<string:objectType>/<string:id>/comments",
-    "mediagoblin.federation.views:object_comments"
-)
-
-add_route(
-    "mediagoblin.webfinger.well-known.host-meta",
-    "/.well-known/host-meta",
-    "mediagoblin.federation.views:host_meta"
-)
-
-add_route(
-    "mediagoblin.webfinger.well-known.host-meta.json",
-    "/.well-known/host-meta.json",
-    "mediagoblin.federation.views:host_meta"
-)
-
-add_route(
-    "mediagoblin.webfinger.well-known.webfinger",
-    "/.well-known/webfinger",
-    "mediagoblin.federation.views:lrdd_lookup"
-)
-
-add_route(
-    "mediagoblin.webfinger.whoami",
-    "/api/whoami",
-    "mediagoblin.federation.views:whoami"
-)
\ No newline at end of file
diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py
index 0cb239a2..e5f9a395 100644
--- a/mediagoblin/gmg_commands/__init__.py
+++ b/mediagoblin/gmg_commands/__init__.py
@@ -16,9 +16,16 @@
 
 import argparse
 import os
+import shutil
+
+import six
 
 from mediagoblin.tools.common import import_component
 
+import logging
+_log = logging.getLogger(__name__)
+logging.basicConfig()
+
 
 SUBCOMMAND_MAP = {
     'shell': {
@@ -61,6 +68,10 @@ SUBCOMMAND_MAP = {
         'setup': 'mediagoblin.gmg_commands.deletemedia:parser_setup',
         'func': 'mediagoblin.gmg_commands.deletemedia:deletemedia',
         'help': 'Delete media entries'},
+    'serve': {
+            'setup': 'mediagoblin.gmg_commands.serve:parser_setup',
+            'func': 'mediagoblin.gmg_commands.serve:serve',
+            'help': 'PasteScript replacement'},
     'batchaddmedia': {
         'setup': 'mediagoblin.gmg_commands.batchaddmedia:parser_setup',
         'func': 'mediagoblin.gmg_commands.batchaddmedia:batchaddmedia',
@@ -70,20 +81,6 @@ SUBCOMMAND_MAP = {
     #     'func': 'mediagoblin.gmg_commands.theme:theme',
     #     'help': 'Theming commands',
     #     }
-
-    ## These might be useful, mayyyybe, but don't really work anymore
-    ## due to mongo change and the "versatility" of sql options.
-    ##
-    ## For now, commenting out.  Might re-enable soonish?
-    #
-    # 'env_export': {
-    #     'setup': 'mediagoblin.gmg_commands.import_export:import_export_parse_setup',
-    #     'func': 'mediagoblin.gmg_commands.import_export:env_export',
-    #     'help': 'Exports the data for this MediaGoblin instance'},
-    # 'env_import': {
-    #     'setup': 'mediagoblin.gmg_commands.import_export:import_export_parse_setup',
-    #     'func': 'mediagoblin.gmg_commands.import_export:env_import',
-    #     'help': 'Imports the data for this MediaGoblin instance'},
     }
 
 
@@ -98,7 +95,7 @@ def main_cli():
             "otherwise mediagoblin.ini"))
 
     subparsers = parser.add_subparsers(help='sub-command help')
-    for command_name, command_struct in SUBCOMMAND_MAP.iteritems():
+    for command_name, command_struct in six.iteritems(SUBCOMMAND_MAP):
         if 'help' in command_struct:
             subparser = subparsers.add_parser(
                 command_name, help=command_struct['help'])
@@ -121,6 +118,27 @@ def main_cli():
         else:
             args.conf_file = 'mediagoblin.ini'
 
+    # This is a hopefully TEMPORARY hack for adding a mediagoblin.ini
+    # if none exists, to make up for a deficiency as we are migrating
+    # our docs to the new "no mediagoblin.ini by default" workflow.
+    # Normally, the docs should provide instructions for this, but
+    # since 0.7.1 docs say "install from master!" and yet we removed
+    # mediagoblin.ini, we need to cover our bases...
+
+    parent_directory = os.path.split(os.path.abspath(args.conf_file))[0]
+    if os.path.split(args.conf_file)[1] == 'mediagoblin.ini' \
+       and not os.path.exists(args.conf_file) \
+       and os.path.exists(
+           os.path.join(
+               parent_directory, 'mediagoblin.example.ini')):
+        # Do the copy-over of the mediagoblin config for the user
+        _log.warning(
+            "No mediagoblin.ini found and no other path given, "
+            "so making one for you.")
+        shutil.copy(
+            os.path.join(parent_directory, "mediagoblin.example.ini"),
+            os.path.join(parent_directory, "mediagoblin.ini"))
+
     args.func(args)
 
 
diff --git a/mediagoblin/gmg_commands/addmedia.py b/mediagoblin/gmg_commands/addmedia.py
index c33a8c56..2aa8f96a 100644
--- a/mediagoblin/gmg_commands/addmedia.py
+++ b/mediagoblin/gmg_commands/addmedia.py
@@ -14,8 +14,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function
+
 import os
 
+import six
+
 from mediagoblin.gmg_commands import util as commands_util
 from mediagoblin.submit.lib import (
     submit_media, get_upload_file_limits,
@@ -68,14 +72,14 @@ def addmedia(args):
     # get the user
     user = app.db.User.query.filter_by(username=args.username.lower()).first()
     if user is None:
-        print "Sorry, no user by username '%s'" % args.username
+        print("Sorry, no user by username '%s'" % args.username)
         return
     
     # check for the file, if it exists...
     filename = os.path.split(args.filename)[-1]
     abs_filename = os.path.abspath(args.filename)
     if not os.path.exists(abs_filename):
-        print "Can't find a file with filename '%s'" % args.filename
+        print("Can't find a file with filename '%s'" % args.filename)
         return
 
     upload_limit, max_file_size = get_upload_file_limits(user)
@@ -84,22 +88,23 @@ def addmedia(args):
         # this is kinda terrible
         if some_string is None:
             return None
-        else:
-            return unicode(some_string)
+        if six.PY2:
+            return six.text_type(some_string, 'utf-8')
+        return some_string
 
     try:
         submit_media(
             mg_app=app,
             user=user,
-            submitted_file=file(abs_filename, 'r'), filename=filename,
+            submitted_file=open(abs_filename, 'rb'), filename=filename,
             title=maybe_unicodeify(args.title),
             description=maybe_unicodeify(args.description),
             license=maybe_unicodeify(args.license),
             tags_string=maybe_unicodeify(args.tags) or u"",
             upload_limit=upload_limit, max_file_size=max_file_size)
     except FileUploadLimit:
-        print "This file is larger than the upload limits for this site."
+        print("This file is larger than the upload limits for this site.")
     except UserUploadLimit:
-        print "This file will put this user past their upload limits."
+        print("This file will put this user past their upload limits.")
     except UserPastUploadLimit:
-        print "This user is already past their upload limits."
+        print("This user is already past their upload limits.")
diff --git a/mediagoblin/gmg_commands/batchaddmedia.py b/mediagoblin/gmg_commands/batchaddmedia.py
index 4931bda2..4137b55c 100644
--- a/mediagoblin/gmg_commands/batchaddmedia.py
+++ b/mediagoblin/gmg_commands/batchaddmedia.py
@@ -14,10 +14,16 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
-import requests, codecs
+from __future__ import print_function
+
+import codecs
 import csv
-from urlparse import urlparse
+import os
+
+import requests
+import six
+
+from six.moves.urllib.parse import urlparse
 
 from mediagoblin.gmg_commands import util as commands_util
 from mediagoblin.submit.lib import (
@@ -60,8 +66,8 @@ def batchaddmedia(args):
     # get the user
     user = app.db.User.query.filter_by(username=args.username.lower()).first()
     if user is None:
-        print _(u"Sorry, no user by username '{username}' exists".format(
-                    username=args.username))
+        print(_(u"Sorry, no user by username '{username}' exists".format(
+                    username=args.username)))
         return
 
     upload_limit, max_file_size = get_upload_file_limits(user)
@@ -73,7 +79,7 @@ def batchaddmedia(args):
     else:
         error = _(u'File at {path} not found, use -h flag for help'.format(
                     path=args.metadata_path))
-        print error
+        print(error)
         return
 
     abs_metadata_filename = os.path.abspath(metadata_path)
@@ -85,7 +91,7 @@ def batchaddmedia(args):
         if some_string is None:
             return None
         else:
-            return unicode(some_string)
+            return six.text_type(some_string)
 
     with codecs.open(
             abs_metadata_filename, 'r', encoding='utf-8') as all_metadata:
@@ -110,13 +116,13 @@ def batchaddmedia(args):
         license = file_metadata.get('license')
         try:
             json_ld_metadata = compact_and_validate(file_metadata)
-        except ValidationError, exc:
+        except ValidationError as exc:
             error = _(u"""Error with media '{media_id}' value '{error_path}': {error_msg}
 Metadata was not uploaded.""".format(
                 media_id=media_id,
                 error_path=exc.path[0],
                 error_msg=exc.message))
-            print error
+            print(error)
             continue
 
         url = urlparse(original_location)
@@ -136,9 +142,9 @@ Metadata was not uploaded.""".format(
             try:
                 media_file = file(file_abs_path, 'r')
             except IOError:
-                print _(u"""\
+                print(_(u"""\
 FAIL: Local file {filename} could not be accessed.
-{filename} will not be uploaded.""".format(filename=filename))
+{filename} will not be uploaded.""".format(filename=filename)))
                 continue
         try:
             submit_media(
@@ -152,22 +158,22 @@ FAIL: Local file {filename} could not be accessed.
                 metadata=json_ld_metadata,
                 tags_string=u"",
                 upload_limit=upload_limit, max_file_size=max_file_size)
-            print _(u"""Successfully submitted {filename}!
+            print(_(u"""Successfully submitted {filename}!
 Be sure to look at the Media Processing Panel on your website to be sure it
-uploaded successfully.""".format(filename=filename))
+uploaded successfully.""".format(filename=filename)))
             files_uploaded += 1
         except FileUploadLimit:
-            print _(
-u"FAIL: This file is larger than the upload limits for this site.")
+            print(_(
+u"FAIL: This file is larger than the upload limits for this site."))
         except UserUploadLimit:
-            print _(
-"FAIL: This file will put this user past their upload limits.")
+            print(_(
+"FAIL: This file will put this user past their upload limits."))
         except UserPastUploadLimit:
-            print _("FAIL: This user is already past their upload limits.")
-    print _(
+            print(_("FAIL: This user is already past their upload limits."))
+    print(_(
 "{files_uploaded} out of {files_attempted} files successfully submitted".format(
         files_uploaded=files_uploaded,
-        files_attempted=files_attempted))
+        files_attempted=files_attempted)))
 
 
 def unicode_csv_reader(unicode_csv_data, dialect=csv.excel, **kwargs):
diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py
index 27283a20..31827cd0 100644
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -16,10 +16,11 @@
 
 import logging
 
+import six
 from sqlalchemy.orm import sessionmaker
 
 from mediagoblin.db.open import setup_connection_and_db_from_config
-from mediagoblin.db.migration_tools import MigrationManager
+from mediagoblin.db.migration_tools import MigrationManager, AlembicMigrationManager
 from mediagoblin.init import setup_global_and_app_config
 from mediagoblin.tools.common import import_component
 
@@ -106,6 +107,13 @@ forgotten to add it? ({1})'.format(plugin, exc))
     return managed_dbdata
 
 
+def run_alembic_migrations(db, app_config, global_config):
+    """Initializes a database and runs all Alembic migrations."""
+    Session = sessionmaker(bind=db.engine)
+    manager = AlembicMigrationManager(Session())
+    manager.init_or_migrate()
+
+
 def run_dbupdate(app_config, global_config):
     """
     Initialize or migrate the database as specified by the config file.
@@ -116,9 +124,14 @@ def run_dbupdate(app_config, global_config):
 
     # Set up the database
     db = setup_connection_and_db_from_config(app_config, migrations=True)
-    #Run the migrations
+    # Run the migrations
     run_all_migrations(db, app_config, global_config)
 
+    # TODO: Make this happen regardless of python 2 or 3 once ensured
+    # to be "safe"!
+    if six.PY3:
+        run_alembic_migrations(db, app_config, global_config)
+
 
 def run_all_migrations(db, app_config, global_config):
     """
@@ -131,7 +144,7 @@ def run_all_migrations(db, app_config, global_config):
     """
     # Gather information from all media managers / projects
     dbdatas = gather_database_data(
-            global_config.get('plugins', {}).keys())
+            list(global_config.get('plugins', {}).keys()))
 
     Session = sessionmaker(bind=db.engine)
 
diff --git a/mediagoblin/gmg_commands/deletemedia.py b/mediagoblin/gmg_commands/deletemedia.py
index ab5a81f6..bf50abde 100644
--- a/mediagoblin/gmg_commands/deletemedia.py
+++ b/mediagoblin/gmg_commands/deletemedia.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function
 import sys
 
 from mediagoblin.gmg_commands import util as commands_util
@@ -29,7 +30,7 @@ def deletemedia(args):
 
     media_ids = set([int(mid) for mid in args.media_ids.split(',') if mid.isdigit()])
     if not media_ids:
-        print 'Can\'t find any valid media ID(s).'
+        print('Can\'t find any valid media ID(s).')
         sys.exit(1)
     found_medias = set()
     filter_ids = app.db.MediaEntry.id.in_(media_ids)
@@ -37,8 +38,8 @@ def deletemedia(args):
     for media in medias:
         found_medias.add(media.id)
         media.delete()
-        print 'Media ID %d has been deleted.' % media.id
+        print('Media ID %d has been deleted.' % media.id)
     for media in media_ids - found_medias:
-        print 'Can\'t find a media with ID %d.' % media
-    print 'Done.'
+        print('Can\'t find a media with ID %d.' % media)
+    print('Done.')
     sys.exit(0)
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
deleted file mode 100644
index fbac09f6..00000000
--- a/mediagoblin/gmg_commands/import_export.py
+++ /dev/null
@@ -1,256 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from mediagoblin import mg_globals
-from mediagoblin.db.open import setup_connection_and_db_from_config
-from mediagoblin.gmg_commands import util as commands_util
-from mediagoblin.storage.filestorage import BasicFileStorage
-from mediagoblin.init import setup_storage, setup_global_and_app_config
-
-import shutil
-import tarfile
-import tempfile
-import subprocess
-import os.path
-import os
-import sys
-import logging
-from contextlib import closing
-
-_log = logging.getLogger('gmg.import_export')
-logging.basicConfig()
-_log.setLevel(logging.INFO)
-
-
-def import_export_parse_setup(subparser):
-    # TODO: Add default
-    subparser.add_argument(
-        'tar_file')
-    subparser.add_argument(
-        '--mongodump_path', default='mongodump',
-        help='mongodump binary')
-    subparser.add_argument(
-        '--mongorestore_path', default='mongorestore',
-        help='mongorestore binary')
-    subparser.add_argument(
-        '--cache_path',
-        help='Temporary directory where files will be temporarily dumped')
-
-
-def _import_media(db, args):
-    '''
-    Import media files
-
-    Must be called after _import_database()
-    '''
-    _log.info('-> Importing media...')
-
-    media_cache = BasicFileStorage(
-        args._cache_path['media'])
-
-    # TODO: Add import of queue files
-    queue_cache = BasicFileStorage(args._cache_path['queue'])
-
-    for entry in db.MediaEntry.query.filter_by():
-        for name, path in entry.media_files.items():
-            _log.info('Importing: {0} - {1}'.format(
-                    entry.title.encode('ascii', 'replace'),
-                    name))
-
-            media_file = mg_globals.public_store.get_file(path, mode='wb')
-            media_file.write(
-                media_cache.get_file(path, mode='rb').read())
-
-    _log.info('...Media imported')
-
-
-def _import_database(db, args):
-    '''
-    Restore mongo database from ___.bson files
-    '''
-    _log.info('-> Importing database...')
-
-    p = subprocess.Popen([
-            args.mongorestore_path,
-            '-d', db.name,
-            os.path.join(args._cache_path['database'], db.name)])
-
-    p.wait()
-
-    _log.info('...Database imported')
-
-
-def env_import(args):
-    '''
-    Restore mongo database and media files from a tar archive
-    '''
-    if not args.cache_path:
-        args.cache_path = tempfile.mkdtemp()
-
-    setup_global_and_app_config(args.conf_file)
-
-    # Creates mg_globals.public_store and mg_globals.queue_store
-    setup_storage()
-
-    global_config, app_config = setup_global_and_app_config(args.conf_file)
-    db = setup_connection_and_db_from_config(
-        app_config)
-
-    tf = tarfile.open(
-        args.tar_file,
-        mode='r|gz')
-
-    tf.extractall(args.cache_path)
-
-    args.cache_path = os.path.join(
-        args.cache_path, 'mediagoblin-data')
-    args = _setup_paths(args)
-
-    # Import database from extracted data
-    _import_database(db, args)
-
-    _import_media(db, args)
-
-    _clean(args)
-
-
-def _setup_paths(args):
-    '''
-    Populate ``args`` variable with cache subpaths
-    '''
-    args._cache_path = dict()
-    PATH_MAP = {
-        'media': 'media',
-        'queue': 'queue',
-        'database': 'database'}
-
-    for key, val in PATH_MAP.items():
-        args._cache_path[key] = os.path.join(args.cache_path, val)
-
-    return args
-
-
-def _create_archive(args):
-    '''
-    Create the tar archive
-    '''
-    _log.info('-> Compressing to archive')
-
-    tf = tarfile.open(
-        args.tar_file,
-        mode='w|gz')
-
-    with closing(tf):
-        tf.add(args.cache_path, 'mediagoblin-data/')
-
-    _log.info('...Archiving done')
-
-
-def _clean(args):
-    '''
-    Remove cache directory
-    '''
-    shutil.rmtree(args.cache_path)
-
-
-def _export_check(args):
-    '''
-    Run security checks for export command
-    '''
-    if os.path.exists(args.tar_file):
-        overwrite = raw_input(
-            'The output file already exists. '
-            'Are you **SURE** you want to overwrite it? '
-            '(yes/no)> ')
-        if not overwrite == 'yes':
-            print 'Aborting.'
-
-            return False
-
-    return True
-
-
-def _export_database(db, args):
-    _log.info('-> Exporting database...')
-
-    p = subprocess.Popen([
-            args.mongodump_path,
-            '-d', db.name,
-            '-o', args._cache_path['database']])
-
-    p.wait()
-
-    _log.info('...Database exported')
-
-
-def _export_media(db, args):
-    _log.info('-> Exporting media...')
-
-    media_cache = BasicFileStorage(
-        args._cache_path['media'])
-
-    # TODO: Add export of queue files
-    queue_cache = BasicFileStorage(args._cache_path['queue'])
-
-    for entry in db.MediaEntry.query.filter_by():
-        for name, path in entry.media_files.items():
-            _log.info(u'Exporting {0} - {1}'.format(
-                    entry.title,
-                    name))
-            try:
-                mc_file = media_cache.get_file(path, mode='wb')
-                mc_file.write(
-                    mg_globals.public_store.get_file(path, mode='rb').read())
-            except Exception as e:
-                _log.error('Failed: {0}'.format(e))
-
-    _log.info('...Media exported')
-
-
-def env_export(args):
-    '''
-    Export database and media files to a tar archive
-    '''
-    commands_util.check_unrecognized_args(args)
-    if args.cache_path:
-        if os.path.exists(args.cache_path):
-            _log.error('The cache directory must not exist '
-                       'before you run this script')
-            _log.error('Cache directory: {0}'.format(args.cache_path))
-
-            return False
-    else:
-        args.cache_path = tempfile.mkdtemp()
-
-    args = _setup_paths(args)
-
-    if not _export_check(args):
-        _log.error('Checks did not pass, exiting')
-        sys.exit(0)
-
-    globa_config, app_config = setup_global_and_app_config(args.conf_file)
-
-    setup_storage()
-
-    db = setup_connection_and_db_from_config(app_config)
-
-    _export_database(db, args)
-
-    _export_media(db, args)
-
-    _create_archive(args)
-
-    _clean(args)
diff --git a/mediagoblin/gmg_commands/reprocess.py b/mediagoblin/gmg_commands/reprocess.py
index e2f19ea3..85cae6df 100644
--- a/mediagoblin/gmg_commands/reprocess.py
+++ b/mediagoblin/gmg_commands/reprocess.py
@@ -13,6 +13,9 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import print_function
+
 import argparse
 import os
 
@@ -143,7 +146,7 @@ def available(args):
         manager = get_processing_manager_for_type(media_type)
     except ProcessingManagerDoesNotExist:
         entry = MediaEntry.query.filter_by(id=args.id_or_type).first()
-        print 'No such processing manager for {0}'.format(entry.media_type)
+        print('No such processing manager for {0}'.format(entry.media_type))
 
     if args.state:
         processors = manager.list_all_processors_by_state(args.state)
@@ -152,25 +155,25 @@ def available(args):
     else:
         processors = manager.list_eligible_processors(media_entry)
 
-    print "Available processors:"
-    print "====================="
-    print ""
+    print("Available processors:")
+    print("=====================")
+    print("")
 
     if args.action_help:
         for processor in processors:
-            print processor.name
-            print "-" * len(processor.name)
+            print(processor.name)
+            print("-" * len(processor.name))
 
             parser = processor.generate_parser()
             parser.print_help()
-            print ""
+            print("")
 
     else:
         for processor in processors:
             if processor.description:
-                print " - %s: %s" % (processor.name, processor.description)
+                print(" - %s: %s" % (processor.name, processor.description))
             else:
-                print " - %s" % processor.name
+                print(" - %s" % processor.name)
 
 
 def run(args, media_id=None):
@@ -185,12 +188,12 @@ def run(args, media_id=None):
             processor_class = manager.get_processor(
                 args.reprocess_command, media_entry)
         except ProcessorDoesNotExist:
-            print 'No such processor "%s" for media with id "%s"' % (
-                args.reprocess_command, media_entry.id)
+            print('No such processor "%s" for media with id "%s"' % (
+                args.reprocess_command, media_entry.id))
             return
         except ProcessorNotEligible:
-            print 'Processor "%s" exists but media "%s" is not eligible' % (
-                args.reprocess_command, media_entry.id)
+            print('Processor "%s" exists but media "%s" is not eligible' % (
+                args.reprocess_command, media_entry.id))
             return
 
         reprocess_parser = processor_class.generate_parser()
@@ -203,7 +206,7 @@ def run(args, media_id=None):
 
     except ProcessingManagerDoesNotExist:
         entry = MediaEntry.query.filter_by(id=media_id).first()
-        print 'No such processing manager for {0}'.format(entry.media_type)
+        print('No such processing manager for {0}'.format(entry.media_type))
 
 
 def bulk_run(args):
@@ -233,12 +236,12 @@ def thumbs(args):
                 processor_class = manager.get_processor(
                     'resize', media_entry)
             except ProcessorDoesNotExist:
-                print 'No such processor "%s" for media with id "%s"' % (
-                    'resize', media_entry.id)
+                print('No such processor "%s" for media with id "%s"' % (
+                    'resize', media_entry.id))
                 return
             except ProcessorNotEligible:
-                print 'Processor "%s" exists but media "%s" is not eligible' % (
-                    'resize', media_entry.id)
+                print('Processor "%s" exists but media "%s" is not eligible' % (
+                    'resize', media_entry.id))
                 return
 
             reprocess_parser = processor_class.generate_parser()
@@ -260,7 +263,7 @@ def thumbs(args):
                 reprocess_info=reprocess_request)
 
         except ProcessingManagerDoesNotExist:
-            print 'No such processing manager for {0}'.format(entry.media_type)
+            print('No such processing manager for {0}'.format(entry.media_type))
 
 
 def initial(args):
@@ -276,7 +279,7 @@ def initial(args):
                 media_entry,
                 reprocess_action='initial')
         except ProcessingManagerDoesNotExist:
-            print 'No such processing manager for {0}'.format(entry.media_type)
+            print('No such processing manager for {0}'.format(entry.media_type))
 
 
 def reprocess(args):
diff --git a/mediagoblin/gmg_commands/serve.py b/mediagoblin/gmg_commands/serve.py
new file mode 100644
index 00000000..64400fdd
--- /dev/null
+++ b/mediagoblin/gmg_commands/serve.py
@@ -0,0 +1,66 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import print_function
+
+from paste.deploy import loadapp, loadserver
+
+
+class ServeCommand(object):
+
+    def loadserver(self, server_spec, name, relative_to, **kwargs):
+        return loadserver(server_spec, name=name, relative_to=relative_to,
+                          **kwargs)
+
+    def loadapp(self, app_spec, name, relative_to, **kwargs):
+        return loadapp(app_spec, name=name, relative_to=relative_to, **kwargs)
+
+    def daemonize(self):
+        # TODO: pass to gunicorn if available
+        pass
+
+    def restart_with_reloader(self):
+        pass
+
+    def restart_with_monitor(self, reloader=False):
+        pass
+
+    def run(self):
+        print('Running...')
+
+
+def parser_setup(subparser):
+    subparser.add_argument('config', metavar='CONFIG_FILE')
+    subparser.add_argument('command',
+                           choices=['start', 'stop', 'restart', 'status'],
+                           nargs='?', default='start')
+    subparser.add_argument('-n', '--app-name',
+                           dest='app_name',
+                           metavar='NAME',
+                           help="Load the named application (default main)")
+    subparser.add_argument('-s', '--server',
+                           dest='server',
+                           metavar='SERVER_TYPE',
+                           help="Use the named server.")
+    subparser.add_argument('--reload',
+                           dest='reload',
+                           action='store_true',
+                           help="Use auto-restart file monitor")
+
+
+def serve(args):
+    serve_cmd = ServeCommand()  # TODO: pass args to it
+    serve_cmd.run()
diff --git a/mediagoblin/gmg_commands/shell.py b/mediagoblin/gmg_commands/shell.py
index 4998acd7..4d3ec241 100644
--- a/mediagoblin/gmg_commands/shell.py
+++ b/mediagoblin/gmg_commands/shell.py
@@ -20,6 +20,8 @@ import code
 from mediagoblin import mg_globals
 from mediagoblin.gmg_commands import util as commands_util
 
+from mediagoblin.tools.transition import DISABLE_GLOBALS
+
 
 def shell_parser_setup(subparser):
     subparser.add_argument(
@@ -27,14 +29,23 @@ def shell_parser_setup(subparser):
         action="store_true")
 
 
-SHELL_BANNER = """\
-GNU MediaGoblin shell!
-----------------------
-Available vars:
- - mgoblin_app: instantiated mediagoblin application
- - mg_globals: mediagoblin.globals
- - db: database instance
-"""
+if DISABLE_GLOBALS:
+    SHELL_BANNER = (
+        "GNU MediaGoblin shell!\n"
+        "----------------------\n"
+        "Available vars:\n"
+        " - app: instantiated mediagoblin application\n"
+        " - db: database session\n"
+        " - ctx: context object\n")
+else:
+    SHELL_BANNER = (
+        "GNU MediaGoblin shell!\n"
+        "----------------------\n"
+        "Available vars:\n"
+        " - app: instantiated mediagoblin application\n"
+        " - mg_globals: mediagoblin.globals\n"
+        " - db: database instance\n"
+        " - ctx: context object\n")
 
 def py_shell(**user_namespace):
     """
@@ -59,18 +70,27 @@ def ipython_shell(**user_namespace):
         user_ns=user_namespace)
     return True
 
+
 def shell(args):
     """
     Setup a shell for the user either a normal Python shell or an IPython one
     """
-    user_namespace = {
-        'mg_globals': mg_globals,
-        'mgoblin_app': commands_util.setup_app(args),
-        'db': mg_globals.database}
-
-    if args.ipython:
-        ipython_shell(**user_namespace)
-    else:
-        # Try ipython_shell first and fall back if not available
-        if not ipython_shell(**user_namespace):
-            py_shell(**user_namespace)
+    app = commands_util.setup_app(args)
+
+    def run_shell(db, ctx):
+        user_namespace = {
+            'mg_globals': mg_globals,
+            'app': app,
+            'db': db,
+            "ctx": ctx}
+
+        if args.ipython:
+            ipython_shell(**user_namespace)
+        else:
+            # Try ipython_shell first and fall back if not available
+            if not ipython_shell(**user_namespace):
+                py_shell(**user_namespace)
+
+    with app.gen_context() as ctx:
+        db = ctx.db
+        run_shell(db, ctx)
diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py
index d34f50e2..158a1a2d 100644
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@ -14,6 +14,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function
+
+import six
+
 from mediagoblin.gmg_commands import util as commands_util
 from mediagoblin import auth
 from mediagoblin import mg_globals
@@ -45,13 +49,13 @@ def adduser(args):
         ).count()
 
     if users_with_username:
-        print u'Sorry, a user with that name already exists.'
+        print(u'Sorry, a user with that name already exists.')
 
     else:
         # Create the user
         entry = db.User()
-        entry.username = args.username.lower()
-        entry.email = unicode(args.email)
+        entry.username = six.text_type(args.username.lower())
+        entry.email = six.text_type(args.email)
         entry.pw_hash = auth.gen_password_hash(args.password)
         default_privileges = [
             db.Privilege.query.filter(
@@ -66,7 +70,7 @@ def adduser(args):
         entry.all_privileges = default_privileges
         entry.save()
 
-        print "User created (and email marked as verified)"
+        print(u"User created (and email marked as verified)")
 
 
 def makeadmin_parser_setup(subparser):
@@ -81,16 +85,16 @@ def makeadmin(args):
     db = mg_globals.database
 
     user = db.User.query.filter_by(
-        username=unicode(args.username.lower())).one()
+        username=six.text_type(args.username.lower())).one()
     if user:
         user.all_privileges.append(
             db.Privilege.query.filter(
                 db.Privilege.privilege_name==u'admin').one()
         )
         user.save()
-        print 'The user is now Admin'
+        print(u'The user is now Admin')
     else:
-        print 'The user doesn\'t exist'
+        print(u'The user doesn\'t exist')
 
 
 def changepw_parser_setup(subparser):
@@ -108,19 +112,20 @@ def changepw(args):
     db = mg_globals.database
 
     user = db.User.query.filter_by(
-        username=unicode(args.username.lower())).one()
+        username=six.text_type(args.username.lower())).one()
     if user:
         user.pw_hash = auth.gen_password_hash(args.password)
         user.save()
-        print 'Password successfully changed'
+        print(u'Password successfully changed')
     else:
-        print 'The user doesn\'t exist'
+        print(u'The user doesn\'t exist')
 
 
 def deleteuser_parser_setup(subparser):
     subparser.add_argument(
         'username',
-        help="Username to delete")
+        help="Username to delete",
+        type=six.text_type)
 
 
 def deleteuser(args):
@@ -128,10 +133,9 @@ def deleteuser(args):
 
     db = mg_globals.database
 
-    user = db.User.query.filter_by(
-        username=unicode(args.username.lower())).first()
+    user = db.User.query.filter_by(username=args.username.lower()).first()
     if user:
         user.delete()
-        print 'The user %s has been deleted' % args.username
+        print('The user %s has been deleted' % args.username)
     else:
-        print 'The user %s doesn\'t exist' % args.username
+        print('The user %s doesn\'t exist' % args.username)
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 7432ac4a..00000000
--- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/mediagoblin.po
index 5fc73217..ead2e570 100644
--- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ar/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -12,16 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2014-09-21 11:08-0500\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/mediagoblin/language/ar/)\n"
+"Language-Team: Arabic "
+"(http://www.transifex.com/projects/p/mediagoblin/language/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Generator: Translate Toolkit 1.10.0\n"
 "Generated-By: Babel 1.3\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
 msgid "Sorry, registration is disabled on this instance."
@@ -63,9 +66,11 @@ msgstr ""
 
 #: mediagoblin/auth/views.py:161
 msgid ""
-"Your email address has been verified. You may now login, edit your profile, "
-"and submit images!"
-msgstr "تم التحقق من بريدك الإلكتروني. يمكنك الآن الولوج، وتحرير مل�ك الشخصي، ونشر الصور!"
+"Your email address has been verified. You may now login, edit your "
+"profile, and submit images!"
+msgstr ""
+"تم التحقق من بريدك الإلكتروني. يمكنك الآن الولوج، وتحرير مل�ك الشخصي، ونشر "
+"الصور!"
 
 #: mediagoblin/auth/views.py:167
 msgid "The verification key or user id is incorrect"
@@ -102,9 +107,13 @@ msgstr "وص� هذا العمل."
 #: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
-msgstr "بامكانك استخدام �\n<a href=\"http://daringfireball.net/projects/markdown/basics\">�\nMarkdown</a> للإدراج."
+msgstr ""
+"بامكانك استخدام �\n"
+"<a href=\"http://daringfireball.net/projects/markdown/basics\">�\n"
+"Markdown</a> للإدراج."
 
 #: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
 #: mediagoblin/submit/forms.py:45
@@ -198,7 +207,7 @@ msgstr ""
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/tests/test_util.py:143
 msgid "Password"
 msgstr "كلمة السر"
 
@@ -339,7 +348,8 @@ msgstr ""
 #: mediagoblin/gmg_commands/batchaddmedia.py:157
 msgid ""
 "Successfully submitted {filename}!\n"
-"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"Be sure to look at the Media Processing Panel on your website to be sure "
+"it\n"
 "uploaded successfully."
 msgstr ""
 
@@ -361,10 +371,12 @@ msgstr ""
 
 #: mediagoblin/meddleware/csrf.py:134
 msgid ""
-"CSRF cookie not present. This is most likely the result of a cookie blocker "
-"or somesuch.<br/>Make sure to permit the settings of cookies for this "
-"domain."
-msgstr "CSRF كوكيز غير موجودة, وهذا من الممكن ان يكون نتيجة لمانع الكوكيز او شئ من هذا القبيل.<br/>تأكد من أنك قمت بالسماح لخصائص الكوكيز لهذا الميدان."
+"CSRF cookie not present. This is most likely the result of a cookie "
+"blocker or somesuch.<br/>Make sure to permit the settings of cookies for "
+"this domain."
+msgstr ""
+"CSRF كوكيز غير موجودة, وهذا من الممكن ان يكون نتيجة لمانع الكوكيز او شئ من "
+"هذا القبيل.<br/>تأكد من أنك قمت بالسماح لخصائص الكوكيز لهذا الميدان."
 
 #: mediagoblin/media_types/__init__.py:79
 #: mediagoblin/media_types/__init__.py:101
@@ -616,11 +628,11 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:241
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:246 mediagoblin/oauth/views.py:297
 msgid "No request token found."
 msgstr ""
 
@@ -670,12 +682,18 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
 msgid ""
 "\n"
-"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
-"      then paste it into a new line in the text box above. There should be only\n"
-"      one url per line. The url that you paste into the text box should be under\n"
-"      the header describing how prominent a feature it will be (whether Primary,\n"
-"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
-"      inside the text box, click the Submit Query button, and your media should be\n"
+"      Go to the page of the media entry you want to feature. Copy it's "
+"URL and\n"
+"      then paste it into a new line in the text box above. There should "
+"be only\n"
+"      one url per line. The url that you paste into the text box should "
+"be under\n"
+"      the header describing how prominent a feature it will be (whether "
+"Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to "
+"feature are\n"
+"      inside the text box, click the Submit Query button, and your media "
+"should be\n"
 "      displayed on the front page.\n"
 "    "
 msgstr ""
@@ -687,21 +705,33 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
 msgid ""
 "\n"
-"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
-"        of media you would like to feature or unfeature and look at the bar to\n"
-"        the side of the media entry. If the piece of media has not been featured\n"
-"        yet you should see a button that says \"Feature\". Press that button and\n"
-"        the media will be featured as a Primary Feature at the top of the page.\n"
-"        All other featured media entries will remain as features, but will be\n"
+"        Yes. If you would prefer, you may go to the media homepage of the"
+" piece\n"
+"        of media you would like to feature or unfeature and look at the "
+"bar to\n"
+"        the side of the media entry. If the piece of media has not been "
+"featured\n"
+"        yet you should see a button that says \"Feature\". Press that "
+"button and\n"
+"        the media will be featured as a Primary Feature at the top of the"
+" page.\n"
+"        All other featured media entries will remain as features, but "
+"will be\n"
 "        pushed further down the page.<br /><br />\n"
 "\n"
-"        If you go to the media homepage of a piece of media that is currently\n"
-"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
-"        where previously there was the button which said \"Feature\". Click\n"
-"        Unfeature and that media entry will no longer be displayed on the\n"
-"        front page, although you can feature it again at any point. Promote\n"
+"        If you go to the media homepage of a piece of media that is "
+"currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and"
+" \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". "
+"Click\n"
+"        Unfeature and that media entry will no longer be displayed on the"
+"\n"
+"        front page, although you can feature it again at any point. "
+"Promote\n"
 "        moves the featured media higher up on the page and makes it more\n"
-"        prominent and Demote moves the featured media lower down and makes it\n"
+"        prominent and Demote moves the featured media lower down and "
+"makes it\n"
 "        less prominent.\n"
 "    "
 msgstr ""
@@ -713,13 +743,19 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
 msgid ""
 "\n"
-"      These categories just describe how prominent a feature will be on your\n"
-"      front page. Primary Features are placed at the top of the front page and are\n"
-"      much larger. Next are Secondary Features, which are slightly smaller.\n"
-"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"      These categories just describe how prominent a feature will be on "
+"your\n"
+"      front page. Primary Features are placed at the top of the front "
+"page and are\n"
+"      much larger. Next are Secondary Features, which are slightly "
+"smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br "
+"/><br />\n"
 "\n"
-"      Primary Features also can display longer descriptions than Secondary\n"
-"      Features, and Secondary Features can display longer descriptions than\n"
+"      Primary Features also can display longer descriptions than "
+"Secondary\n"
+"      Features, and Secondary Features can display longer descriptions "
+"than\n"
 "      Tertiary Features."
 msgstr ""
 
@@ -732,12 +768,18 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
 msgid ""
 "\n"
-"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
-"      portion of its description will be displayed on your website's front page.\n"
-"      The number of characters displayed varies on the prominence of the feature.\n"
-"      Primary Features display the first 512 characters of their description,\n"
-"      Secondary Features display the first 256 characters of their description,\n"
-"      and Tertiary Features display the first 128 characters of their description.\n"
+"      When a media entry is featured, the entry's title, it's thumbnail "
+"and a\n"
+"      portion of its description will be displayed on your website's "
+"front page.\n"
+"      The number of characters displayed varies on the prominence of the "
+"feature.\n"
+"      Primary Features display the first 512 characters of their "
+"description,\n"
+"      Secondary Features display the first 256 characters of their "
+"description,\n"
+"      and Tertiary Features display the first 128 characters of their "
+"description.\n"
 "    "
 msgstr ""
 
@@ -748,7 +790,8 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
 msgid ""
 "\n"
-"      Unfeature a media by removing its line from the above textarea and then\n"
+"      Unfeature a media by removing its line from the above textarea and "
+"then\n"
 "      pressing the Submit Query button.\n"
 "    "
 msgstr ""
@@ -760,9 +803,12 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
 msgid ""
 "\n"
-"      When copying and pasting urls into the above text box, be aware that if\n"
-"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
-"      featured. Make sure that all your intended Media Entries are featured.\n"
+"      When copying and pasting urls into the above text box, be aware "
+"that if\n"
+"      you make a typo, once you press Submit Query, your media entry will"
+" NOT be\n"
+"      featured. Make sure that all your intended Media Entries are "
+"featured.\n"
 "    "
 msgstr ""
 
@@ -818,7 +864,8 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
 msgid ""
 "If you would like to feature a\n"
-"        piece of media, go to that media entry's homepage and click the button\n"
+"        piece of media, go to that media entry's homepage and click the "
+"button\n"
 "        that says <a class=\"button_action\">Feature</a>."
 msgstr ""
 
@@ -826,10 +873,14 @@ msgstr ""
 #, python-format
 msgid ""
 "You're seeing this page because you are a user capable of\n"
-"        featuring media, a regular user would see a blank page, so be sure to\n"
-"        have media featured as long as your instance has the 'archivalook'\n"
-"        plugin enabled. A more advanced tool to manage features can be found\n"
-"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+"        featuring media, a regular user would see a blank page, so be "
+"sure to\n"
+"        have media featured as long as your instance has the "
+"'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be "
+"found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management "
+"panel.</a>"
 msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
@@ -898,24 +949,27 @@ msgstr "اسم المستخدم او الايميل"
 
 #: mediagoblin/plugins/basic_auth/views.py:54
 msgid ""
-"If that email address (case sensitive!) is registered an email has been sent"
-" with instructions on how to change your password."
-msgstr "إذا كان هذا الايميل(حساس للحرو� الكبيرة والصغيرة!) م�سجل, �قد تم إرسال ايميل به تعليمات عن كي�ية تغيير رقمك السري."
+"If that email address (case sensitive!) is registered an email has been "
+"sent with instructions on how to change your password."
+msgstr ""
+"إذا كان هذا الايميل(حساس للحرو� الكبيرة والصغيرة!) م�سجل, �قد تم إرسال ايميل "
+"به تعليمات عن كي�ية تغيير رقمك السري."
 
 #: mediagoblin/plugins/basic_auth/views.py:65
 msgid "Couldn't find someone with that username."
 msgstr "لم نتمكن من العثور على أحد له أسم المستخدم هذا."
 
 #: mediagoblin/plugins/basic_auth/views.py:68
-msgid ""
-"An email has been sent with instructions on how to change your password."
+msgid "An email has been sent with instructions on how to change your password."
 msgstr "لقد تم إرسال ايميل به تعليمات عن كي�ية تغيير رقمك السري."
 
 #: mediagoblin/plugins/basic_auth/views.py:75
 msgid ""
-"Could not send password recovery email as your username is inactive or your "
-"account's email address has not been verified."
-msgstr "تعذر إرسال رسالة استعادة كلمة السر لأن اسم المستخدم معطل أو لأننا لم نتحقق من بريدك الإلكتروني."
+"Could not send password recovery email as your username is inactive or "
+"your account's email address has not been verified."
+msgstr ""
+"تعذر إرسال رسالة استعادة كلمة السر لأن اسم المستخدم معطل أو لأننا لم نتحقق "
+"من بريدك الإلكتروني."
 
 #: mediagoblin/plugins/basic_auth/views.py:123
 msgid "The user id is incorrect."
@@ -1021,7 +1075,9 @@ msgstr "اسم العميل المنش�ئ"
 msgid ""
 "This will be visible to users allowing your\n"
 "                application to authenticate as them."
-msgstr "سو� يكون هذا مرئي بالنسبة للمستخدمين حتى يتاح\nللبرنامج خاصتك بالتصديق عليهم."
+msgstr ""
+"سو� يكون هذا مرئي بالنسبة للمستخدمين حتى يتاح\n"
+"للبرنامج خاصتك بالتصديق عليهم."
 
 #: mediagoblin/plugins/oauth/forms.py:40
 msgid "Type"
@@ -1030,12 +1086,22 @@ msgstr "النوع"
 #: mediagoblin/plugins/oauth/forms.py:45
 msgid ""
 "<strong>Confidential</strong> - The client can\n"
-"                make requests to the GNU MediaGoblin instance that can not be\n"
-"                intercepted by the user agent (e.g. server-side client).<br />\n"
-"                <strong>Public</strong> - The client can't make confidential\n"
-"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                make requests to the GNU MediaGoblin instance that can "
+"not be\n"
+"                intercepted by the user agent (e.g. server-side "
+"client).<br />\n"
+"                <strong>Public</strong> - The client can't make "
+"confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-"
+"side\n"
 "                JavaScript client)."
-msgstr "<strong>سري</strong> - يستطيع العميل\nان يقوم بطلب نسخة من GNU MediaGoblin والتي من الممكن ان \nيعترضه وكيل المستخدم (مثلا الخادم من جانب العميل).<br />\n<strong>عام</strong> - لا يستطيع العميل ارسال طلبات سرية\nلنسخة من GNU MediaGoblin (مثلا \nخادم الجا�ا سكريبت من جانب العميل)."
+msgstr ""
+"<strong>سري</strong> - يستطيع العميل\n"
+"ان يقوم بطلب نسخة من GNU MediaGoblin والتي من الممكن ان \n"
+"يعترضه وكيل المستخدم (مثلا الخادم من جانب العميل).<br />\n"
+"<strong>عام</strong> - لا يستطيع العميل ارسال طلبات سرية\n"
+"لنسخة من GNU MediaGoblin (مثلا \n"
+"خادم الجا�ا سكريبت من جانب العميل)."
 
 #: mediagoblin/plugins/oauth/forms.py:52
 msgid "Redirect URI"
@@ -1045,7 +1111,9 @@ msgstr "تحويل لينك"
 msgid ""
 "The redirect URI for the applications, this field\n"
 "            is <strong>required</strong> for public clients."
-msgstr "الرابط الموجه للبرنامج, هذا الحقل\n<strong>مطلوب</strong> لجمهور العملاء."
+msgstr ""
+"الرابط الموجه للبرنامج, هذا الحقل\n"
+"<strong>مطلوب</strong> لجمهور العملاء."
 
 #: mediagoblin/plugins/oauth/forms.py:66
 msgid "This field is required for public clients"
@@ -1167,8 +1235,8 @@ msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:144
 msgid ""
-"You can't delete your only Persona email address unless you have a password "
-"set."
+"You can't delete your only Persona email address unless you have a "
+"password set."
 msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:149
@@ -1176,8 +1244,7 @@ msgid "That Persona email address is not registered to this account."
 msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:176
-msgid ""
-"Sorry, an account is already registered with that Persona email address."
+msgid "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:192
@@ -1227,7 +1294,8 @@ msgstr "المل�"
 #: mediagoblin/submit/forms.py:41
 msgid ""
 "You can use\n"
-"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                        Markdown</a> for formatting."
 msgstr ""
 
@@ -1382,22 +1450,34 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr "أهلًا يا %(username)s،\n\nا�تح الرابط التالي\n�ي متص�حك لت�عيل حسابك �ي غنو ميدياغوبلن:\n\n%(verification_url)s"
+msgstr ""
+"أهلًا يا %(username)s،\n"
+"\n"
+"ا�تح الرابط التالي\n"
+"�ي متص�حك لت�عيل حسابك �ي غنو ميدياغوبلن:\n"
+"\n"
+"%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
 #, python-format
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org/\" title='Version "
-"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
-msgstr "برعاية  <a href=\"http://mediagoblin.org/\" title='Version %(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> مشروع."
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> "
+"project."
+msgstr ""
+"برعاية  <a href=\"http://mediagoblin.org/\" title='Version %"
+"(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> مشروع."
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
 #, python-format
 msgid ""
 "Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a"
+" href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+"تم النشر و�قا ل <a "
 "href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
-"href=\"%(source_link)s\">Source code</a> available."
-msgstr "تم النشر و�قا ل <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Source code</a> متاح."
+"href=\"%(source_link)s\">Source code</a> متاح."
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
 msgid "Terms of Service"
@@ -1413,15 +1493,19 @@ msgstr "اهلا, مرحبا بك �ي موقع MediaGoblin."
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
 msgid ""
-"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
-"extraordinarily great piece of media hosting software."
-msgstr "هذا الموقع يقوم بتشغيل <a href=\"http://mediagoblin.org\">MediaGoblin</a>, وهو برنامج استضا�ة ميديا �ائق الروعة."
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, "
+"an extraordinarily great piece of media hosting software."
+msgstr ""
+"هذا الموقع يقوم بتشغيل <a href=\"http://mediagoblin.org\">MediaGoblin</a>, وهو "
+"برنامج استضا�ة ميديا �ائق الروعة."
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
 msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr "لكي تضي� الميديا خاصتك, تضع التعليقات, والمزيد, يجب عليك الدخول بحساب MediaGoblin الخاص بك."
+"To add your own media, place comments, and more, you can log in with your"
+" MediaGoblin account."
+msgstr ""
+"لكي تضي� الميديا خاصتك, تضع التعليقات, والمزيد, يجب عليك الدخول بحساب "
+"MediaGoblin الخاص بك."
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
 msgid "Don't have one yet? It's easy!"
@@ -1437,7 +1521,9 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
 msgid ""
 "\n"
-"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+"            <a class=\"button_action\" "
+"href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your "
+"own server</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -1479,7 +1565,9 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
-msgstr "هل تريد �علا إلغاء المستخدم '%(user_name)s' وكل الميديا/التعليقات المتعلقة به؟"
+msgstr ""
+"هل تريد �علا إلغاء المستخدم '%(user_name)s' وكل الميديا/التعليقات المتعلقة "
+"به؟"
 
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
 msgid "Yes, really delete my account"
@@ -1542,12 +1630,14 @@ msgstr ""
 msgid ""
 "Hi,\n"
 "\n"
-"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"We wanted to verify that you are %(username)s. If this is the case, then"
+" \n"
 "please follow the link below to verify your new email address.\n"
 "\n"
 "%(verification_url)s\n"
 "\n"
-"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"If you are not %(username)s or didn't request an email change, you can "
+"ignore\n"
 "this email."
 msgstr ""
 
@@ -1596,14 +1686,14 @@ msgid ""
 "Sorry, this audio will not work because \n"
 "\tyour web browser does not support HTML5 \n"
 "\taudio."
-msgstr "عذرا, لن يتم تشغيل الصوت لأن �\n»متص�حك لا يدعم HTML5 �\n»صوتيا."
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
 msgid ""
 "You can get a modern web browser that \n"
 "\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
 "\t  http://getfirefox.com</a>!"
-msgstr "تستطيع الحصول على متص�ح حديث  �\n»يمكنه تشغيل الصوت �ي <a href=\"http://getfirefox.com\">�\n» http://getfirefox.com</a>!"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
@@ -1673,22 +1763,27 @@ msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
-msgstr "عذرا, لن يتم تشغيل هذا ال�يديو لأن �\n»متص�حك لا يدعم HTML5 �\n»�يديو."
+msgstr ""
+"عذرا, لن يتم تشغيل هذا ال�يديو لأن �\n"
+"»متص�حك لا يدعم HTML5 �\n"
+"»�يديو."
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:66
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
-msgstr "تستطيع الحصول على متص�ح حديث  �\n»يمكنه تشغيل هذا ال�يديو �ي <a href=\"http://getfirefox.com\">�\n» http://getfirefox.com</a>!"
+msgstr ""
+"تستطيع الحصول على متص�ح حديث  �\n"
+"»يمكنه تشغيل هذا ال�يديو �ي <a href=\"http://getfirefox.com\">�\n"
+"» http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:88
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
-msgid ""
-"Here you can track the state of media being processed on this instance."
+msgid "Here you can track the state of media being processed on this instance."
 msgstr "يمكنك متابعة عملية معالجة وسائط معرضك من هنا."
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
@@ -2038,7 +2133,8 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
 msgid ""
 "\n"
-"    Here you can look up users in order to take punitive actions on them.\n"
+"    Here you can look up users in order to take punitive actions on them."
+"\n"
 "  "
 msgstr ""
 
@@ -2135,8 +2231,12 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s مجموعات"
 #, python-format
 msgid ""
 "Hi %(username)s,\n"
-"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
-msgstr "اهلا, %(username)s,\n%(comment_author)s قام بالتعليق على مشاركتك (%(comment_url)s) �ي %(instance_name)s\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at "
+"%(instance_name)s\n"
+msgstr ""
+"اهلا, %(username)s,\n"
+"%(comment_author)s قام بالتعليق على مشاركتك (%(comment_url)s) �ي %"
+"(instance_name)s\n"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -2148,7 +2248,14 @@ msgstr "%(username)s ميديا"
 msgid ""
 "<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
 "href=\"%(tag_url)s\">%(tag)s</a>"
-msgstr "<a href=\"%(user_url)s\">\n%(username)s\n</a>\n's ميديا بالمحدد\n<a href=\"%(tag_url)s\">\n%(tag)s\n</a>"
+msgstr ""
+"<a href=\"%(user_url)s\">\n"
+"%(username)s\n"
+"</a>\n"
+"'s ميديا بالمحدد\n"
+"<a href=\"%(tag_url)s\">\n"
+"%(tag)s\n"
+"</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
 #, python-format
@@ -2179,8 +2286,7 @@ msgid "Add a new collection"
 msgstr "إضا�ة مجموعة جديدة"
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
-msgid ""
-"You can track the state of media being processed for your gallery here."
+msgid "You can track the state of media being processed for your gallery here."
 msgstr "يمكنك متابعة عملية معالجة وسائط معرضك من هنا."
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
@@ -2238,8 +2344,7 @@ msgid "Almost done! Your account still needs to be activated."
 msgstr "أوشكنا على الانتهاء! ما زال حسابك بحاجة إلى الت�عيل."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
-msgid ""
-"An email should arrive in a few moments with instructions on how to do so."
+msgid "An email should arrive in a few moments with instructions on how to do so."
 msgstr "ستصلك رسالة إلكترونية خلال لحظات بها التعليمات."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
@@ -2252,16 +2357,18 @@ msgstr "أعد إرسال رسالة التحقق"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
 msgid ""
-"Someone has registered an account with this username, but it still has to be"
-" activated."
+"Someone has registered an account with this username, but it still has to"
+" be activated."
 msgstr "سجّل أحدهم حسابًا بهذا الاسم، ولكننا بانتظار الت�عيل حتى الآن."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
 #, python-format
 msgid ""
-"If you are that person but you've lost your verification email, you can <a "
-"href=\"%(login_url)s\">log in</a> and resend it."
-msgstr "إن كنت أنت ذلك الشخص لكنك �قدت رسالة التحقق، يمكنك <a href=\"%(login_url)s\">الولوج</a> وإعادة إرسالها."
+"If you are that person but you've lost your verification email, you can "
+"<a href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+"إن كنت أنت ذلك الشخص لكنك �قدت رسالة التحقق، يمكنك <a href=\"%"
+"(login_url)s\">الولوج</a> وإعادة إرسالها."
 
 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
 msgid "(remove)"
@@ -2331,39 +2438,43 @@ msgstr "تحدد ب"
 msgid "Could not read the image file."
 msgstr "لم نستطيع قراءة هذه الصورة."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:39
 msgid "Oops!"
 msgstr "ويحي!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:40
 msgid "An error occured"
 msgstr "حدث خطأ"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:54
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:56
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:64
 msgid "Operation not allowed"
 msgstr "غير مسموح بهذه العملية"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:65
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
-msgstr "عذرا دي�, لا استطيع ترك ت�عل هذا!</p><p>لقد حاولت تشغيل خاصية ليست مسموحة لك. هل كنت تحاول إلغاء جميع حسابات المستخدمين مجددا؟"
+msgstr ""
+"عذرا دي�, لا استطيع ترك ت�عل هذا!</p><p>لقد حاولت تشغيل خاصية ليست مسموحة "
+"لك. هل كنت تحاول إلغاء جميع حسابات المستخدمين مجددا؟"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:73
 msgid ""
-"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
-" the address is correct, maybe the page you're looking for has been moved or"
-" deleted."
-msgstr "يبدو أنه لا توجد ص�حة بهذا العنوان, عذرا</p><p>إذا كنت متأكد من صحة العنوان, من الممكن أن تكون الص�حة التي تبحث عنها قد تم نقلها أو إلغاءها."
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're "
+"sure the address is correct, maybe the page you're looking for has been "
+"moved or deleted."
+msgstr ""
+"يبدو أنه لا توجد ص�حة بهذا العنوان, عذرا</p><p>إذا كنت متأكد من صحة العنوان, "
+"من الممكن أن تكون الص�حة التي تبحث عنها قد تم نقلها أو إلغاءها."
 
 #: mediagoblin/tools/timesince.py:62
 msgid "year"
@@ -2395,7 +2506,8 @@ msgstr "تعليق"
 
 #: mediagoblin/user_pages/forms.py:25
 msgid ""
-"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
 "target=\"_blank\">Markdown</a> for formatting."
 msgstr ""
 
@@ -2418,7 +2530,9 @@ msgstr "إدراج ملاحظة"
 #: mediagoblin/user_pages/forms.py:49
 msgid ""
 "You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
@@ -2474,8 +2588,8 @@ msgstr "لم يتم إلغاء المادة لأنك لم تقم بإختيار
 
 #: mediagoblin/user_pages/views.py:421
 msgid ""
-"You are about to delete an item from another user's collection. Proceed with"
-" caution."
+"You are about to delete an item from another user's collection. Proceed "
+"with caution."
 msgstr "أنت على وشك حذ� مادة من مجموعة مستخدم آخر. كن حذرا."
 
 #: mediagoblin/user_pages/views.py:453
@@ -2485,10 +2599,10 @@ msgstr "لقد قمت بإلغاء المجموعة \"%s\""
 
 #: mediagoblin/user_pages/views.py:460
 msgid ""
-"The collection was not deleted because you didn't check that you were sure."
+"The collection was not deleted because you didn't check that you were "
+"sure."
 msgstr "لم يتم إلغاء المجموعة لأنك لم تقم بإختيار انك متأكد من ذلك."
 
 #: mediagoblin/user_pages/views.py:468
-msgid ""
-"You are about to delete another user's collection. Proceed with caution."
+msgid "You are about to delete another user's collection. Proceed with caution."
 msgstr "أنت على وشك حذ� مجموعة مستخدم آخر. كن حذرا."
diff --git a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 5b3b70bf..00000000
--- a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/bg/mediagoblin.po
index 3ed37a81..db792584 100644
--- a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/bg/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/mediagoblin/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -19,67 +19,167 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "�еправилно потребител�ко име или е-поща."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr ""
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -95,7 +195,7 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -111,11 +211,11 @@ msgstr "Етикети"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -143,125 +243,137 @@ msgstr ""
 msgid "This address contains errors"
 msgstr "�дре�ът �ъдържа грешки"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Заглавието е задължително"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Опи�ание на колекци�та"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Стара парола"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "�ова парола"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "�ов адре� на е-поща"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Парола"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr ""
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Промените в профила �а запазени"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "�а�тройките на профила �а запазени"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "�дре�ът на е-пощата ви е проверен."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Грешна парола"
 
@@ -292,7 +404,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -300,58 +412,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -377,28 +489,28 @@ msgstr "Опи�ание"
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -418,7 +530,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Редактиране"
 
@@ -428,7 +540,7 @@ msgstr "Редактиране"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -555,46 +667,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -612,26 +724,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -976,11 +1088,7 @@ msgstr "Изпращане на указани�"
 msgid "Forgot your password?"
 msgstr "Забравили �те паролата �и?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Ме�тоположение"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Разглеждане � <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1047,7 +1155,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1060,8 +1168,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1069,39 +1177,39 @@ msgstr ""
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Грешка при проверката на %s: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Проверката е отменена"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1125,7 +1233,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1157,26 +1265,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1200,15 +1308,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1227,11 +1335,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Тр�бва да предо�тавите файл"
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr ""
@@ -1254,26 +1362,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Проверете е-пощата �и!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "изход"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Пром�на на�тройките на профила"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1281,29 +1389,29 @@ msgstr "Пром�на на�тройките на профила"
 msgid "Media processing panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Изход"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Създаване на нова колекци�"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1357,7 +1465,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1448,13 +1556,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr ""
 
@@ -1472,6 +1580,47 @@ msgstr "Запазване на промените"
 msgid "Changing %(username)s's email"
 msgstr "Пром�на е-пощата на %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1497,7 +1646,7 @@ msgstr "Пром�на на�тройките на профила на %(usernam
 msgid "Delete my account"
 msgstr "Изтриване на профила ми"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Е-поща"
 
@@ -1551,19 +1700,6 @@ msgstr ""
 msgid "New comments"
 msgstr "�ови коментари"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Отбел�зване на в�ички като прочетени"
@@ -1576,38 +1712,38 @@ msgstr "Отбел�зване на в�ички като прочетени"
 msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Изтегл�не"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1615,70 +1751,70 @@ msgstr ""
 msgid "Created"
 msgstr "Създадено"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Файл PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Файлов формат"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1763,7 +1899,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2069,17 +2205,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Добав�не на коментар"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Добав�не на коментара"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Добавено"
 
@@ -2151,12 +2287,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Преглед на коментара"
 
@@ -2315,6 +2451,10 @@ msgstr "по-ново"
 msgid "older"
 msgstr "по-�таро"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Ме�тоположение"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2323,38 +2463,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr ""
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Опа!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Възникна грешка"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "�еправилна за�вка"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Дей�твието не е позволено"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2422,69 +2562,69 @@ msgstr "Може да ползвате\n                      <a href=\"http://d
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Коментарът ви е публикуван."
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Тр�бва да изберете или добавите колекци�"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" вече е в колекци�та \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" е добавено към колекци�та \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Изтрихте запи� от колекци�та."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Изтрихте колекци�та \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 8a098e83..00000000
--- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/mediagoblin.po
index 30a06d97..26780106 100644
--- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ca/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/mediagoblin/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -24,67 +24,167 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
-msgstr "Ho sentim, el registre està desactivat en aquest cas."
+msgstr "Ho sentim, el registre està desactivat en aquesta instància."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Ho sentim, no és possible avisar en aquest cas."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "No es permet l'autenticació en aquesta instància."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Nom d'usuari o adreça de correu incorrecte"
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Aquest camp no permet introduir adreces de correu"
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Aquest camp necessita una adreça de correu"
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Lamentablement aquest usuari ja existeix."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Perdó, ja existeix un usuari amb aquesta adreça de correu."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "La clau de verificació o l'identificador d'usuari és incorrecte."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Ja s'ha verificat la vostra adreça electrònica. Ara podeu entrar, editar el vostre perfil i penjar imatge!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "La clau de verificació o la identificació de l'usuari no són correctes."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Has d'estar conectat per saber a qui hem d'enviar el correu!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Ja has verificat la teva adreça de correu!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Torna'm a enviar el correu de verificació"
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -100,7 +200,7 @@ msgid "Description of this work"
 msgstr "Descripció d'aquest treball."
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +216,11 @@ msgstr "Etiquetes"
 msgid "Separate tags by commas."
 msgstr "Separa els tags amb comes."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Fitxa"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "La fitxa no pot ser buida"
 
@@ -148,125 +248,137 @@ msgstr "Lloc web"
 msgid "This address contains errors"
 msgstr "Aquesta adreça conté errors"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Envia'm correu quan d'altres comentin al meu mitjà"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Habiliteu les notificacions internes d'esdeveniments."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Llicència per defecte"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Aquesta serà la vostra llicència per defecte en els formularis de carregada d'arxius."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "El títol no pot ser buit"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Descripció d'aquesta col.lecció"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "La part del títol de l'adreça d'aquesta col.lecció. Normalment no cal que canviis això."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Contrasenya antiga"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Introdueix la teva contrasenya antiga per comprovar que aquest compte és teu."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Nova adreça de correu"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Contrasenya"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Introduïu la vostra contrasenya d'aquest compte"
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
-msgstr ""
+msgstr "Identificador"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Ja existeix una entrada amb aquesta fitxa per aquest usuari"
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Esteu editant fitxers d'un altre usuari. Aneu amb compte."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "S'ha adjuntat %s correctament."
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Només podeu editar el vostre perfil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Esteu editant el perfil d'un usuari. Aneu amb compte"
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Els canvis al perfil s'han guardat"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Els detalls del compte s'han guardat"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Heu de confirmar l'eliminació del vostre compte."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Ja tens una col.lecció anomenada \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Ja existeix una col·lecció d'aquest usuari sota aquesta fitxa"
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Estas editant la col.lecció d'un altre usuari. Prossegueix amb cautela."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "S'ha verificat la vostra adreça de correu"
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Contrasenya errònia"
 
@@ -297,7 +409,7 @@ msgstr "S'ha omès \"%s\" perquè ja està llest.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "S'ha trobat un enllaç antic per a \"%s\" i s'ha eliminat.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -305,58 +417,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
-msgstr ""
+msgstr "Nombre del usuario al cual le pertenecen éstos contenidos."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
-msgstr ""
+msgstr "Ruta al archivo csv que contiene la información de metadatos."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -382,28 +494,28 @@ msgstr "Descripció"
 msgid "I am sure I want to delete this"
 msgstr "Estic segur que vull esborrar això"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Visca! S'ha enviat!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "El mitjà no s'ha esborrat perque no has marcat que n'estiguessis segur."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -423,7 +535,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Editar"
 
@@ -433,7 +545,7 @@ msgstr "Editar"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Esborrar"
 
@@ -560,46 +672,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "indefinidament"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Alerta de "
 
@@ -617,26 +729,26 @@ msgstr "Us heu subscrit als comentaris de %s."
 msgid "You will not receive notifications for comments on %s."
 msgstr "Ja no rebreu més notificacions de comentaris de %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Heu de donar una oauth_token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "No s'ha trobat un testimoni de petició."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Ho sentim, la mida del fitxer és massa gran."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Ho sentim, pujant aquest fitxer assolireu el vostre límit de pujada."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Ho sentim, hey assolit el límit de pujada."
 
@@ -981,11 +1093,7 @@ msgstr "Enviar instruccions"
 msgid "Forgot your password?"
 msgstr "Has oblidat la teva contrasenya?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Ubicació"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Veure a <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1052,7 +1160,7 @@ msgstr "La URI de redirecció per les aplicacions, aquest camp\n            és
 msgid "This field is required for public clients"
 msgstr "Aquest camp és requeriment per a clients públics"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "El client {0} ha sigut enregistrat!"
 
@@ -1065,8 +1173,8 @@ msgid "Your OAuth clients"
 msgstr "Els vostres clients OAuth"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Ja hi ha un compte registrat amb aquesta OpenID."
 
@@ -1074,39 +1182,39 @@ msgstr "Ja hi ha un compte registrat amb aquesta OpenID."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "No s'ha pogut trobar aquest servidor d'OpenID"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "No s'ha trobat un servei d'OpenID per a %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Ha fallat la verificació de %s: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "S'ha cancel·lat la verificació"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "S'ha desat el vostre localitzador d'OpenID."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "No podeu eliminar el vostre únic localitzador d'OpenID sense haver definit una contrasenya"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Aquest OpenID no està registrat amb aquest compte"
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "S'ha eliminat l'OpenID"
 
@@ -1130,7 +1238,7 @@ msgstr "OpenIDs"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1162,26 +1270,26 @@ msgstr "O registreu-vos amb un OpenID."
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Ho sentim, ja hi ha un compte registrat per aquest correu de Persona."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "L'adreça de correu de Persona s'ha eliminat satisfactòriament."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "No podeu eliminar només l'adreça de Persona si no li heu definit una contrasenya."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Aquesta adreça de correu de Persona no està registrada a aquest compte."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Disculpeu, ja s'ha registrat un compte de Persona amb aquesta adreça de correu."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "La vostra adreça de Persona s'ha desat satisfactòriament."
 
@@ -1205,15 +1313,15 @@ msgstr "O inicieu la sessió amb Persona!"
 msgid "Or register with Persona!"
 msgstr "O registreu-vos amb Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Aquest tipus de fitxer no és vàlid."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Ha fallat la còpia al magatzem públic."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "No s'ha trobat cap fitxer adient per processar."
 
@@ -1232,11 +1340,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Podeu usar\n                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                        Markdown</a> per a formatar el text."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Heu d'escollir un fitxer."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "S'ha afegit la col.leccio \"%s\"!"
@@ -1259,26 +1367,26 @@ msgstr "Heu estat expulsat"
 msgid "until %(until_when)s"
 msgstr "fins %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Verifica el teu correu electrònic"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "surt"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Compte de <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Modificar els ajustaments del compte"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1286,29 +1394,29 @@ msgstr "Modificar els ajustaments del compte"
 msgid "Media processing panel"
 msgstr "Quadre de processament de fitxers"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Surt"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Tots els fitxers"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Crea una nova col·lecció"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Tauler d'administració de l'usuari"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Tauler d'informes reportats de l'usuari"
 
@@ -1362,8 +1470,8 @@ msgid "Authorization Complete"
 msgstr "Autorització completa"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Copieu i enganxeu això al vostre client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1453,13 +1561,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Editant afegits per a %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Fitxers adjunts"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Afegeix un fitxer adjunt"
 
@@ -1477,6 +1585,47 @@ msgstr "Desa els canvis"
 msgid "Changing %(username)s's email"
 msgstr "Canviant l'adreça de %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "Fa %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1502,7 +1651,7 @@ msgstr "Modificant els detalls del compte de %(username)s"
 msgid "Delete my account"
 msgstr "Elimina el meu compte"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Adreça de correu"
 
@@ -1556,19 +1705,6 @@ msgstr "Hola,\n\nhem volgut verificar que ets %(username)s. Si és el cas, feu c
 msgid "New comments"
 msgstr "Nous comentaris"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "Fa %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Marqueu-los tots com a llegits"
@@ -1581,38 +1717,38 @@ msgstr "Marqueu-los tots com a llegits"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Mitjà marcat amb: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Descarregar"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Ho sento, aquest audiothis àudio no funcionarà perque \n »el teu navegador web no contempla suport d'àudio \n »HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Pots obtenir un navegador web modern que \n »podrà reproduir l'àudio, a <a href=\"http://getfirefox.com\">\n » http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Arxiu original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "Arxiu WebM (Vorbis codec)"
 
@@ -1620,70 +1756,70 @@ msgstr "Arxiu WebM (Vorbis codec)"
 msgid "Created"
 msgstr "Creat"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Imatge per %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Fitxer PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspectiva."
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Davant"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Amunt"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Costat"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Descarrega el model"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Format del fitxer"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Alçada de l'objecte"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Aquest vídeo no funciona perquè\nel vostre navegador web no soporta\nvídeos HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Publiqueu nou contingut com a vos"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "Arxiu WebM (VP8/Vorbis)"
 
@@ -1768,7 +1904,7 @@ msgid "Return to Reports Panel"
 msgstr "Torneu al Tauler de Reportar informes."
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Informeu-ne"
 
@@ -2074,17 +2210,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Afegeix un comentari"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Afegir aquest comentari"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Afegit"
 
@@ -2156,12 +2292,12 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a href=\"%(t
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Mitjans de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Navegant mitjà per a <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Previsualització del comentari"
 
@@ -2320,6 +2456,10 @@ msgstr "més nou"
 msgid "older"
 msgstr "més antic"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Ubicació"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Informar mitjà"
@@ -2328,38 +2468,38 @@ msgstr "Informar mitjà"
 msgid "Tagged with"
 msgstr "Etiquetat com"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "No s'ha pogut llegir l'arxiu d'imatge"
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Ups!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "S'ha trobat un error"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Petició incorrecta"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "La petició enviada al servidor no és vàlida. Si us plau, reviseu-la."
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Operació no permesa"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "David, no et puc deixar fer això!</p><p>Has intentat fer alguna cosa que no se't permet fer... com eliminar, una altra vegada, tots els comptes!"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2427,69 +2567,69 @@ msgstr "Podeu usar\n                      <a href=\"http://daringfireball.net/pr
 msgid "Reason for Reporting"
 msgstr "Raó per informar"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Els comentaris estan desactivats."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Uups, el teu comentari era buit."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "El teu comentari s'ha publicat!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Si et plau, comprova les teves entrades i intenta-ho de nou."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Has de sel.leccionar o afegir una col.lecció"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" ja és a la col.lecció \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" afegir a la col.lecció \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Has esborrat el mitjà"
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Ets a punt d'esborrar el mitjà d'un altre usuari. Prossegueix amb cautela."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Has esborrat l'element de la col.lecció"
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "L'element no s'ha eliminat perque no has marcat que n'estiguessis segur."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Ets a punt d'esborrar un element de la col.lecció d'un altre usuari. Prossegueix amb cautela."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Has esborrat la col.lecció \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "La col.lecció no s'ha esborrat perquè no has marcat que n'estiguessis segur."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Ets a punt d'esborrar la col.lecció d'un altre usuari. Prossegueix amb cautela."
diff --git a/mediagoblin/i18n/ca@valencia/mediagoblin.po b/mediagoblin/i18n/ca@valencia/mediagoblin.po
new file mode 100644
index 00000000..e967794c
--- /dev/null
+++ b/mediagoblin/i18n/ca@valencia/mediagoblin.po
@@ -0,0 +1,2680 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-18 16:03-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ca@valencia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.10.0\n"
+"Generated-By: Babel 1.3\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your "
+"profile, and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure "
+"it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie "
+"blocker or somesuch.<br/>Make sure to permit the settings of cookies for "
+"this domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's "
+"URL and\n"
+"      then paste it into a new line in the text box above. There should "
+"be only\n"
+"      one url per line. The url that you paste into the text box should "
+"be under\n"
+"      the header describing how prominent a feature it will be (whether "
+"Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to "
+"feature are\n"
+"      inside the text box, click the Submit Query button, and your media "
+"should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the"
+" piece\n"
+"        of media you would like to feature or unfeature and look at the "
+"bar to\n"
+"        the side of the media entry. If the piece of media has not been "
+"featured\n"
+"        yet you should see a button that says \"Feature\". Press that "
+"button and\n"
+"        the media will be featured as a Primary Feature at the top of the"
+" page.\n"
+"        All other featured media entries will remain as features, but "
+"will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is "
+"currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and"
+" \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". "
+"Click\n"
+"        Unfeature and that media entry will no longer be displayed on the"
+"\n"
+"        front page, although you can feature it again at any point. "
+"Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and "
+"makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on "
+"your\n"
+"      front page. Primary Features are placed at the top of the front "
+"page and are\n"
+"      much larger. Next are Secondary Features, which are slightly "
+"smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br "
+"/><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than "
+"Secondary\n"
+"      Features, and Secondary Features can display longer descriptions "
+"than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail "
+"and a\n"
+"      portion of its description will be displayed on your website's "
+"front page.\n"
+"      The number of characters displayed varies on the prominence of the "
+"feature.\n"
+"      Primary Features display the first 512 characters of their "
+"description,\n"
+"      Secondary Features display the first 256 characters of their "
+"description,\n"
+"      and Tertiary Features display the first 128 characters of their "
+"description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and "
+"then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware "
+"that if\n"
+"      you make a typo, once you press Submit Query, your media entry will"
+" NOT be\n"
+"      featured. Make sure that all your intended Media Entries are "
+"featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the "
+"button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be "
+"sure to\n"
+"        have media featured as long as your instance has the "
+"'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be "
+"found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management "
+"panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been "
+"sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid "An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or "
+"your account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can "
+"not be\n"
+"                intercepted by the user agent (e.g. server-side "
+"client).<br />\n"
+"                <strong>Public</strong> - The client can't make "
+"confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-"
+"side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a "
+"password set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid "Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> "
+"project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a"
+" href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, "
+"an extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your"
+" MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" "
+"href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your "
+"own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing"
+" the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then"
+" \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can "
+"ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid "Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them."
+"\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at "
+"%(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid "You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid "An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to"
+" be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can "
+"<a href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're "
+"sure the address is correct, maybe the page you're looking for has been "
+"moved or deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed "
+"with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were "
+"sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid "You are about to delete another user's collection. Proceed with caution."
+msgstr ""
diff --git a/mediagoblin/i18n/cs/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/cs/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index ec94b753..00000000
--- a/mediagoblin/i18n/cs/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/cs/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/cs/mediagoblin.po
index 87af7b0b..5f1e81c9 100644
--- a/mediagoblin/i18n/cs/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/cs/mediagoblin.po
@@ -1,86 +1,189 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
-# digitaldreamer <digitaldreamer@email.cz>, 2014
+# digitaldreamer <digitaldreamer@email.cz>, 2014, 2015.
 # Mirek2 <mazelm@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-20 17:20+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-02-26 10:33+0000\n"
 "Last-Translator: digitaldreamer <digitaldreamer@email.cz>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/mediagoblin/language/cs/)\n"
+"Language-Team: Czech "
+"(http://www.transifex.com/projects/p/mediagoblin/language/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 2.5.0\n"
+"Generated-By: Babel 1.3\n"
+"X-POOTLE-MTIME: 1424946782.0\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Promiňte, na této instanci je možnost registrace vypnuta."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Promiňte, nahlášení je na tomto serveru vypnuto."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Promiňte, autentikace je na této instanci vypnuta."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Neplatné uživatelské jméno nebo emailová adresa."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Do tohoto pole emailová adresa nepatří."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Toto pole vyžaduje emailovou adresu."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Omlouváme se, uživatel s tímto jménem už existuje."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Promiňte, uživatel s touto emailovou adresou již existuje."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "Chybný ověřovací klí� nebo id užvatele."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Vaše emailová adresa byla ověřena. Nyní se můžete přihlásit, upravit si svůj profil, a nahrávat obrázky!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Neplatný ověřovací klí� nebo id uživatele"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Napřed se musíte přihlásit, abychom věděli komu máme email poslat!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Svojí emailovou adresu máte již ověřenu!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Váš ověřovací email byl znovu odeslán."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr "{username} přidal(a) {object}"
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr "{username} přidal(a) {object} do {target}"
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr "{username} publikoval(a) {object}"
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr "{username} vytvořil(a) {object}"
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr "{username} smazal(a) {object}"
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr "{username} se nelíbí {object}"
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr "{username} si přidal(a) k oblíbeným {object}"
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr "{username} za�al(a) sledovat {object}"
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr "{username} se líbí {object}"
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr "{username} vložil(a) {object}"
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr "{username} vložil(a) {object} do {target}"
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr "{username} sdílí {object}"
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr "{username} si odstranil(a) z oblíbených {object}"
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr "{username} přestal(a) sledovat {object}"
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr "{username} se už nelíbí {object}"
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr "{username} zrušil(a) sdílení {object}"
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr "{username} aktualizoval(a) {object}"
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr "{username} ozna�il(a) štítkem {object}"
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr "obrázek"
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr "komentář"
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr "sbírku"
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr "video"
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr "audio"
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr "osobu"
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr "objekt"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -96,7 +199,7 @@ msgid "Description of this work"
 msgstr "Popis tohoto díla"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -112,11 +215,11 @@ msgstr "Štítky"
 msgid "Separate tags by commas."
 msgstr "Oddělte štítky �árkami."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Krátký název"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Krátký název nemůže být prázdný"
 
@@ -144,125 +247,137 @@ msgstr "Webové stránky"
 msgid "This address contains errors"
 msgstr "Tato adresa obsahuje chyby"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr "Rodné město"
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Poslat email vždy, když někdo napíše komentář k mým tvorbám"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Zasílat oznámení o událostech na tomto webu."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Oblíbená licence"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Toto bude vaše výchozí licence ve formuláři pro upload."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Nadpis nesmí být prázdný"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Popis této sbírky"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Název, který je sou�ástí adresy této sbírky. Většinou není třeba ho měnit."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Staré heslo"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Zadejte své staré heslo, abyste potvrdil(a), že vlastníte tento ú�et."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nové heslo"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Nová emailová adresa"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Heslo"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Zadejte své heslo pro ověření, že jste majitelem tohoto ú�tu."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr "Identifikátor"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr "Hodnota"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "U tohoto uživatele již existuje jiná tvorba s tímto krátkým názvem."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Upravujete tvorbu jiného uživatele. Bu�te opatrná/ý."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Přidal(a) jste přílohu %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Editovat můžete jen svůj vlastní profil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Upravujete profil uživatele. Bu�te opatrná/ý."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Změny profilu uloženy"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Nastavení ú�tu uloženo"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr "Neznámá aplikace, nelze zrušit autorizaci"
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr "Aplikaci byla zrušena autorizace"
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Smazání vašeho ú�tu je třeba potvrdit."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Už máte sbírku se jménem „%s“!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "U tohoto uživatele již existuje jiná sbírka s tímto krátkým názvem."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Upravujete sbírku dalšího uživatele. Bu�te opatrná/ý."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Vaše emailová adresa byla ověřena."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Špatné heslo"
 
@@ -293,7 +408,7 @@ msgstr "Přeskakuji \"%s\"; jež je nastaven.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Byl nalezen starý odkaz pro \"%s\"; odstraňuji.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -301,58 +416,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr "Podrobnější instrukce jak správně používat tento\nskript (a jak formátovat soubor .csv s metadaty) najdete v dokumentaci\nMediaGoblinu na stránce o uploadování skrze příkazovou řádku\n<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr "Jméno uživatele, kterému patří tyto tvorby"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr "Cesta k souboru .csv obsahujícímu metadata."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr "Nezpracovávat okamžitě, předat serveru Celery."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr "Promiňte, ale uživatel '{username}' neexistuje."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr "Soubor {path} nebyl nalezen, použijte argument -h pro nápovědu."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr "Chyba u tvorby '{media_id}' cesta '{error_path}': {error_msg}\n\nMetadata nebyla odeslána."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr "CHYBA: Lokální soubor {filename} není přístupný.\nSoubor {filename} nebude odeslán na server."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr "Soubor {filename} byl úspěšně odeslán!\nPro jistotu se můžete podívat na Panel zpracování tvoreb na vašich stránkách, kde uvidíte\nzda upload proběhl úspěšně."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr "CHYBA: Velikost tohoto souboru překra�uje maximální velikost povolenou na těchto stránkách."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr "CHYBA: Odesláním tohoto souboru by sou�asný uživatel překro�il svůj limit pro nahrávání souborů."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr "CHYBA: Tento uživatel již vy�erpal svůj limit pro nahrávání souborů."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr "{files_uploaded} z celkového po�tu {files_attempted} souborů úspěšně odesláno."
 
@@ -378,28 +493,28 @@ msgstr "Popis"
 msgid "I am sure I want to delete this"
 msgstr "Jsem si jist(a), že to chci smazat"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Jupí! Odesláno!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr "Jupí! Upravený příspěvek byl odeslán!"
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr "Smazal(a) jste blog."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Tvorba nebyla odstraněna, protože jste nezaškrtl(a), že jste si jist(a)."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr "Chystáte se smazat blog jiného uživatele. Bu�te opatrná/ý"
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr "Blog nebyl smazán, protože k tomu nemáte oprávnění."
 
@@ -419,7 +534,7 @@ msgstr "Smazat Blog"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Upravit"
 
@@ -429,7 +544,7 @@ msgstr "Upravit"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Smazat"
 
@@ -556,46 +671,46 @@ msgstr "Zpráva pro uživatele:"
 msgid "Resolution content:"
 msgstr "Obsah řešení:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr "\n{mod} odebral(a) uživateli {user} oprávnění {privilege}."
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr "\n{mod} udělil(a) uživateli {user} zákaz až do {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr "do {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "trvale"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr "\n{mod} poslal(a) varovný email uživateli {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr "\n{mod} smazal(a) komentář."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr "\n{mod} smazal(a) tvorbu."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Varování od"
 
@@ -613,26 +728,26 @@ msgstr "Odebírám komentáře na %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Nebudou vám zasílána oznámení o komentářích na %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Je vyžadován oauth_token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Požadavek nemá token."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Promiňte, soubor je příliš velký."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Promiňte, vložením tohoto souboru byste již překro�ili svůj datový limit."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Promiňte, již jste vy�erpali svůj datový limit."
 
@@ -977,11 +1092,7 @@ msgstr "Poslat návod"
 msgid "Forgot your password?"
 msgstr "Zapoměl(a) jste své heslo?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Místo"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Zobrazit <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1048,7 +1159,7 @@ msgstr "URI pro přesměrování aplikací, toto pole\nje <strong>vyžadováno</
 msgid "This field is required for public clients"
 msgstr "Toto pole je vyžadováno pro veřejné klienty"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Klient {0} byl zaregistrován!"
 
@@ -1061,8 +1172,8 @@ msgid "Your OAuth clients"
 msgstr "Vaši OAuth klienti"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Promiňte, pro toto OpenID je již ú�et zaregistrován."
 
@@ -1070,39 +1181,39 @@ msgstr "Promiňte, pro toto OpenID je již ú�et zaregistrován."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Promiňte, server pro OpenID nebyl nalezen"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Nebyla nalezena žádná služba OpenID pro %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Ověřování %s selhalo: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Ověření bylo zrušeno"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Vaše OpenID adresa byla úspěšně uložena."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Nemůžete smazat svou jedinou adresu OpenID pokud nemáte nastavené heslo"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Toto OpenID není k tomuto ú�tu registrováno."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID bylo úspěšně odstraněno."
 
@@ -1126,7 +1237,7 @@ msgstr "OpenID"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1158,26 +1269,26 @@ msgstr "Nebo se zaregistrujte s OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Promiňte, pro tento email Persona je již ú�et zaregistrován."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "Emailová adresa Persona byla úspěšně odstraněna."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Nemůžete odstranit svou jedinou emailovou adresu Persona pokud nemáte nastavené heslo."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Tato emailová adresa Persona není k tomuto ú�tu registrována."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Promiňte, na tuto emailovou adresu Persona je již ú�et registrován."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Váš email Persona byl úspěšně uložen."
 
@@ -1201,15 +1312,15 @@ msgstr "Nebo se přihlašte pomocí Persony!"
 msgid "Or register with Persona!"
 msgstr "Nebo se zaregistrujte s Personou!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Neplatný soubor pro tento typ tvorby."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Kopírování do veřejného uložiště selhalo."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "Přijatelný soubor ke zpracování nebyl nalezen"
 
@@ -1228,11 +1339,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Pro formátování můžete používat <a href=\"http://cs.wikipedia.org/wiki/Markdown\" target=\"_blank\">Markdown</a>."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Musíte poskytnout soubor."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Sbírka „%s“ přidána!"
@@ -1255,26 +1366,26 @@ msgstr "Byl vám udělen zákaz,"
 msgid "until %(until_when)s"
 msgstr "do %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Ověřte svůj email!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "odhlásit"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Ú�et <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Změnit nastavení ú�tu"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1282,29 +1393,29 @@ msgstr "Změnit nastavení ú�tu"
 msgid "Media processing panel"
 msgstr "Panel zpracování tvoreb"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Odhlásit"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Přidat tvorbu"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Vytvořit novou sbírku"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr "Moderátorské funkce:"
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Panel pro správu uživatelů"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Panel pro správu hlášení"
 
@@ -1358,8 +1469,8 @@ msgid "Authorization Complete"
 msgstr "Autorizace kompletní"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Toto zkopírujte a vložte do svého klienta:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr "Tento <strong>ověřovací kód</strong> zkopírujte a vložte do svého klienta:"
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1449,13 +1560,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Upravujete přílohy %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Přílohy"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Přiložit soubor"
 
@@ -1473,6 +1584,47 @@ msgstr "Uložit změny"
 msgid "Changing %(username)s's email"
 msgstr "Měním email uživatele %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr "Zrušit autorizaci aplikací"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr "Zrušení autorizace aplikací"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr "Tyto aplikace mají přístup k Vašemu ú�tu GNU MediaGoblin. Zrušení autorizace\naplikaci toto právo odebere, a aplikace pak již nebude moci používat Váš ú�et."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr "Žádné aplikace nejsou autorizovány."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr "Typ:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr "Autorizované:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "před %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1498,7 +1650,7 @@ msgstr "Měníte nastavení ú�tu %(username)s"
 msgid "Delete my account"
 msgstr "Smazat můj ú�et"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Email"
 
@@ -1552,19 +1704,6 @@ msgstr "Dobrý den,\n\nPotřebujeme ověřit, jestli jste %(username)s. Pokud an
 msgid "New comments"
 msgstr "Nové komentáře"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "před %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Ozna�it jako pře�tené"
@@ -1577,38 +1716,38 @@ msgstr "Ozna�it jako pře�tené"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Tvorba se štítky: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Stáhnout"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Původní"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr "Promiňte, tento zvukový soubor nelze přehrát,\n\tprotože váš prohlíže� nepodporuje HTML5\n\taudio."
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Můžete si stáhnout moderní prohlíže�, který \n\tumí přehrávat tento typ zvuku, na <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr "Moderní prohlíže�, který umí přehrávat tento typ zvuku\n\tsi můžete stáhnout na <a href=\"http://getfirefox.com\">\n\thttp://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Původní soubor"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "Soubor WebM (kodek Vorbis)"
 
@@ -1616,70 +1755,70 @@ msgstr "Soubor WebM (kodek Vorbis)"
 msgid "Created"
 msgstr "Vytvořeno"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Obrázek %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Soubor PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspektiva"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Zepředu"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Zvrchu"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Ze strany"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Stáhnout model"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Formát souboru"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Výška objektu"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Omlouváme se, ale toto video nelze přehrát, protože\nváš prohlíže� nepodporuje HTML5\nvideo."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Můžete si stáhnout moderní prohlíže�, který \n      umí přehrát toto video, na <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "Soubor WebM (VP8/Vorbis)"
 
@@ -1764,7 +1903,7 @@ msgid "Return to Reports Panel"
 msgstr "Návrat do Panelu Hlášení"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Hlášení"
 
@@ -2070,17 +2209,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Příspěvek od uživatele <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Přidat komentář"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Přidat tento komentář"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Přidáno"
 
@@ -2152,12 +2291,12 @@ msgstr "Tvorba <a href=\"%(user_url)s\">%(username)s</a> se štítkem <a href=\"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Tvorba <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Prohlížení tvoreb uživatele <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Náhled Komentáře"
 
@@ -2316,6 +2455,10 @@ msgstr "novější"
 msgid "older"
 msgstr "starší"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Místo"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Nahlásit tvorbu"
@@ -2324,38 +2467,38 @@ msgstr "Nahlásit tvorbu"
 msgid "Tagged with"
 msgstr "Štítky"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Soubor obrázku nelze pře�íst."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Jejda!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Došlo k chybě"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Špatný Požadavek"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "Požadavek zaslaný na tento server je neplatný, prosím zkontrolujte ho."
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Tato operace není dovolena"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Promiň Dave, nemůžu ti dovolit to udělat!</p><p>Pokoušeli jste se použít funkci, ke které nemáte oprávnění."
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2423,69 +2566,69 @@ msgstr "Pro formátování můžete používat <a href=\"http://cs.wikipedia.org
 msgid "Reason for Reporting"
 msgstr "Důvod hlášení"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Promiňte, komentáře jsou vypnuty"
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Chybka, váš komentář byl prázdný."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Váš komentář byl odeslán!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Zkontrolujte prosím své tvorby a zkuste to znovu."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Musíte vybrat nebo přidat sbírku"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "„%s“ už je ve sbírce „%s“"
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "„%s“ přidáno do sbírky „%s“"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Tuto tvorbu jste smazal(a)."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Chystáte se smazat tvorbu jiného uživatele. Bu�te opatrná/ý."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Smazal(a) jste položku ze sbírky."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Objekt nebyl odstraněn, protože jste nezaškrtli, že jste si jistí."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Chystáte se smazat položku ze sbírky dalšího uživatele. Bu�te opatrná/ý."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Smazal(a) jste sbírku „%s“"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Sbírka nebyla odstraněna, protože jste nezaškrtli, že jste si jistí."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Chystáte se smazat sbírku dalšího uživatele. Bu�te opatrná/ý."
diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/cy/mediagoblin.po
index d8237a6c..15da9e11 100644
--- a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/cy/mediagoblin.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2014 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-09-21 11:08-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.10.0\n"
 "Generated-By: Babel 1.3\n"
 
 #: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
@@ -2537,4 +2537,3 @@ msgstr ""
 #: mediagoblin/user_pages/views.py:468
 msgid "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
-
diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index fc22b30a..00000000
--- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/mediagoblin.po
index 94d3f744..a59089dc 100644
--- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/da/mediagoblin.po
@@ -1,9 +1,10 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
 # Aputsiaĸ Niels Janussen <aj@isit.gl>, 2013-2014
+# Mikkel Munch Mortensen <3xm@detfalskested.dk>, 2014
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012
 # Olle Jonsson <olle.jonsson@gmail.com>, 2012
 # Tanja Trudslev <tanja.trudslev@gmail.com>, 2012
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/mediagoblin/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,67 +23,167 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Desværre, registrering er ikke muligt på denne instans"
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
-msgstr ""
+msgstr "Desværre, rapportering er ikke muligt på denne instans"
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Beklager, godkendelse er slået fra på denne instans."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Ugyldigt brugernavn eller e-mailadresse."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Dette felt accepterer ikke e-mailadresser."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Dette felt kræver en e-mailadresse."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Desværre, det brugernavn er allerede brugt"
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Desværre, en bruger er allerede oprettet for den email"
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "Nøglen til bekræftigelse eller bruger-id er ugyldigt."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Din email adresse er blevet bekræftet. Du kan nu logge på, ændre din profil, og indsende billeder!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Bekræftelsesnøglen eller brugerid er forkert"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Du er nødt til at være logget ind, så vi ved hvem vi skal emaile!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Du har allerede bekræftet din email adresse!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Email til godkendelse sendt igen."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -98,7 +199,7 @@ msgid "Description of this work"
 msgstr "Beskrivelse af arbejdet"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -114,11 +215,11 @@ msgstr "Tags"
 msgid "Separate tags by commas."
 msgstr "Separer tags med kommaer."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Webnavn"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Webnavnet kan ikke stå tomt"
 
@@ -126,7 +227,7 @@ msgstr "Webnavnet kan ikke stå tomt"
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
-msgstr "Titeldelen af dette medie's adresse. Du behøver normalt ikke ændre dette."
+msgstr "Titeldelen af dette medies adresse. Du behøver normalt ikke ændre dette."
 
 #: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
 #: mediagoblin/submit/forms.py:50
@@ -146,125 +247,137 @@ msgstr "Websted"
 msgid "This address contains errors"
 msgstr "Denne adresse indeholder fejl"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Email mig når andre kommenterer på mine medier"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Aktivér insite-notifikationer for begivenheder."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Præferencer for licens"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Dette vil blive dit standardlicens i formularer til overførsler."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Titlen kan ikke være tom"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Beskrivelse af denne samling"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Titeldelen af denne samlings's adresse. Du behøver normalt ikke ændre dette."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Gammelt kodeord"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Skriv dit gamle kodeord for at bevise det er din konto."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Ny kodeord"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Ny e-mailadresse"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Kodeord"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Angiv dit kodeord for at bevise at du ejer denne konto."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
-msgstr ""
+msgstr "Identifikator"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
-msgstr ""
+msgstr "Værdi"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Et post med dette webnavn findes allerede for denne bruger."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Du er ved at ændre en anden brugers' medier. Pas på."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Du tilføjede den vedhæftede fil %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Du kan kun redigere din egen profil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Du er ved at ændre en bruger's profil. Pas på."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Profilændringer gemt"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Kontoindstillinger gemt"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Du skal bekræfte at du vil slette din konto."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Du har allerede en samling ved navn \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "En samling med dette webnavn findes allerede for denne bruger."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Du er ved at ændre en anden bruger's samling. Pas på."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Din e-mailadresse er blevet bekræftet."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Forkert kodeord"
 
@@ -274,7 +387,7 @@ msgstr "Kan ikke linke til tema... intet tema sat\n"
 
 #: mediagoblin/gmg_commands/assetlink.py:73
 msgid "No asset directory for this theme\n"
-msgstr ""
+msgstr "Intet asset-bibliotek til dette tema\n"
 
 #: mediagoblin/gmg_commands/assetlink.py:76
 msgid "However, old link directory symlink found; removed.\n"
@@ -295,75 +408,75 @@ msgstr "Springer over \"%s\"; allerede konfigureret.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Gammel henvisning fundet for \"%s\"; fjerner.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
 "documentation page on command line uploading\n"
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
-msgstr ""
+msgstr "For mere information om hvordan du kører dette script (og hvordan\nmetadata-CSV-filen skal formateres) henvises til MediaGoblin-\ndokumentationen om command line uploading\n<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
-msgstr ""
+msgstr "Navn på brugeren som disse medieartikler tilhører"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
-msgstr ""
+msgstr "Stien til CSV-filen der indeholder metadatainformation."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
-msgstr ""
+msgstr "Undlad ivrig behandlig, overlad til celery"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
-msgstr ""
+msgstr "Desværre, der findes ingen bruger med brugernavnet '{username}'"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
-msgstr ""
+msgstr "Filen ved {path} findes ikke, brug flaget -h for hjælp"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
-msgstr ""
+msgstr "Fejl med medie '{media_id}' værdi '{error_path}': '{error_msg}'\nMetadata blev ikke uploadet."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
-msgstr ""
+msgstr "FEJL: Den lokale fil {filename} kunne ikke tilgås.\n{filename} vil ikke blive uploadet."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
-msgstr ""
+msgstr "{filename} er gemt!\nHusk at tjekke panelet til mediebehandling på dit website for at sikre dig at filen er korrekt uploadet."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
-msgstr ""
+msgstr "FEJL: Denne fil er større en grænsen for uploads på dette site."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
-msgstr ""
+msgstr "FEJL: Upload af denne fil vil overskride brugerens upload-grænse."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
-msgstr ""
+msgstr "FEJL: Denne bruger har allerede overskredet sin upload-grænse."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
-msgstr ""
+msgstr "{files_uploaded} ud af {files_attempted} filer blev korrekt uploadet."
 
 #: mediagoblin/meddleware/csrf.py:134
 msgid ""
 "CSRF cookie not present. This is most likely the result of a cookie blocker "
 "or somesuch.<br/>Make sure to permit the settings of cookies for this "
 "domain."
-msgstr "CSRF-cookie er ikke tilstede. Dette skyldes højest sandsynligt en blokering af cookie eller lignende.<br/>Sørg for at tillade, at der angives cookie'er for dette domæne."
+msgstr "CSRF-cookie er ikke til stede. Dette skyldes højst sandsynligt en blokering af cookie eller lignende.<br/>Sørg for at tillade, at der angives cookie'er for dette domæne."
 
 #: mediagoblin/media_types/__init__.py:79
 #: mediagoblin/media_types/__init__.py:101
@@ -380,48 +493,48 @@ msgstr "Beskrivelse"
 msgid "I am sure I want to delete this"
 msgstr "Jeg er sikker på at jeg vil slette dette"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Juhuu! Delt!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
-msgstr ""
+msgstr "Hurra! Den redigerede blogpost er gemt"
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
-msgstr ""
+msgstr "Du slettede bloggen."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Mediet blev ikke slettet, fordi du ikke markerede at du var sikker."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
-msgstr ""
+msgstr "Du er ved at slette en anden brugers blog. Tænk dig om før du fortsætter."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
-msgstr ""
+msgstr "Bloggen blev ikke slettet, da du ikke har rettighederne til det."
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
 msgid "Add Blog Post"
-msgstr ""
+msgstr "Tilføj blogpost"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
 msgid "Edit Blog"
-msgstr ""
+msgstr "Rediger blogpost"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
 msgid "Delete Blog"
-msgstr ""
+msgstr "Slet blogpost"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Redigér"
 
@@ -431,17 +544,17 @@ msgstr "Redigér"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Slet"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
 msgid "<em> Go to list view </em>"
-msgstr ""
+msgstr "<em> Skift til listevisning </em>"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
 msgid " No blog post yet. "
-msgstr ""
+msgstr "Endnu ingen blogposter"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -470,7 +583,7 @@ msgstr "Slet permanent"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
 msgid "Create/Edit a Blog"
-msgstr ""
+msgstr "Opret/rediger blog"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
 #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
@@ -483,28 +596,28 @@ msgstr "Tilføj"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
 msgid "Create/Edit a blog post."
-msgstr ""
+msgstr "Opret/rediger en blogpost"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
 msgid "Create/Edit a Blog Post."
-msgstr ""
+msgstr "Opret rediger en blogpost."
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
 #, python-format
 msgid "%(blog_owner_name)s's Blog"
-msgstr ""
+msgstr "%(blog_owner_name)ss blog"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
 msgid "View"
-msgstr ""
+msgstr "Vis"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
 msgid "Create a Blog"
-msgstr ""
+msgstr "Opret en blog"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
 msgid " Blog Dashboard "
-msgstr ""
+msgstr "Blogkontrolpanel"
 
 #: mediagoblin/media_types/pdf/processing.py:142
 msgid "unoconv failing to run, check log file"
@@ -524,7 +637,7 @@ msgstr "Bandlys denne bruger"
 
 #: mediagoblin/moderation/forms.py:23
 msgid "Send the user a message"
-msgstr ""
+msgstr "Send en besked til brugeren"
 
 #: mediagoblin/moderation/forms.py:24
 msgid "Delete the content"
@@ -548,56 +661,56 @@ msgstr "Hvilke privilegier ønsker du at fjerne?"
 
 #: mediagoblin/moderation/forms.py:122
 msgid "Why user was banned:"
-msgstr ""
+msgstr "Ã…rsag til brugerens bortvisning:"
 
 #: mediagoblin/moderation/forms.py:125
 msgid "Message to user:"
-msgstr ""
+msgstr "Besked til bruger:"
 
 #: mediagoblin/moderation/forms.py:128
 msgid "Resolution content:"
-msgstr ""
+msgstr "Beslutning:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
-msgstr ""
+msgstr "\n{mod} fjernede {user}s {privilege} rettigheder."
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
-msgstr ""
+msgstr "\n{mod} bortviste brugeren {user} {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
-msgstr ""
+msgstr "indtil {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "ubestemt tid"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
-msgstr ""
+msgstr "\n{mod} sendte en advarsels-e-mail til brugeren {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
-msgstr ""
+msgstr "\n{mod} slettede kommentaren."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
-msgstr ""
+msgstr "\n{mod} slettede medieartiklen."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Advarsel fra"
 
@@ -615,56 +728,56 @@ msgstr "Abonnerede på kommentarer på %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Du vil ikke modtage notifikationer for kommentarer på %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Der skal angives en oauth_token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
-msgstr ""
+msgstr "Ingen request token fundet."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Beklager, filstørrelsen er for stor."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Beklager, overførsel af denne fil vil betyde at du bryder grænsen for overførsel."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Beklager, du har nået din grænse for filoverførsel."
 
 #: mediagoblin/plugins/archivalook/forms.py:21
 msgid "Enter the URL for the media to be featured"
-msgstr ""
+msgstr "Angiv URL'en for mediet der skal fremhæves"
 
 #: mediagoblin/plugins/archivalook/tools.py:132
 msgid "Primary"
-msgstr ""
+msgstr "Primær"
 
 #: mediagoblin/plugins/archivalook/tools.py:133
 msgid "Secondary"
-msgstr ""
+msgstr "Sekundær"
 
 #: mediagoblin/plugins/archivalook/tools.py:134
 msgid "Tertiary"
-msgstr ""
+msgstr "Tertiær"
 
 #: mediagoblin/plugins/archivalook/tools.py:135
 msgid "-----------{display_type}-Features---------------------------\n"
-msgstr ""
+msgstr "-----------{display_type}-fremhævninger---------------------------\n"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
 msgid "How does this work?"
-msgstr ""
+msgstr "Hvordan virker det?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
 msgid "How to feature media?"
-msgstr ""
+msgstr "Hvordan fremhæves medier?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
 msgid ""
@@ -677,11 +790,11 @@ msgid ""
 "      inside the text box, click the Submit Query button, and your media should be\n"
 "      displayed on the front page.\n"
 "    "
-msgstr ""
+msgstr "\nGå til siden med den medieartikel du til fremhæve. Kopier dens URL og\nsæt den ind på en ny linje i tekstboksen herover. Der må kun være URL pr. linje.\nURL'en du sætter ind i tekstboksen skal være under overskriften der beskriver hvor\nprominent fremhævningen skal være (enten primær, sekundær eller tertiær).\nTryk på knappen når alle de medieartikler du vil fremhæve er inde i tekstboksen.\nHerefter bør dine medieartikler blive vist på forsiden.v"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
 msgid "Is there another way to manage featured media?"
-msgstr ""
+msgstr "Er der andre måder at styre fremhævede medieartikler på?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
 msgid ""
@@ -750,7 +863,7 @@ msgid ""
 "      Unfeature a media by removing its line from the above textarea and then\n"
 "      pressing the Submit Query button.\n"
 "    "
-msgstr ""
+msgstr "\nFjern fremhævningen af en medieartikel ved at fjerne dens linje fra tekstboksen ovenover og klik herefter på knappen."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
 msgid "CAUTION:"
@@ -763,7 +876,7 @@ msgid ""
 "      you make a typo, once you press Submit Query, your media entry will NOT be\n"
 "      featured. Make sure that all your intended Media Entries are featured.\n"
 "    "
-msgstr ""
+msgstr "\nVær opmærksom på at hvis du laver slåfejl når du kopierer og indsætter en URL i tekstboksen herover, så vil din medieartikel IKKE blive fremhævet efter du har trykket på knappen. Tjek venligst efter at alle de medieartikler du forventer er fremhævet rent faktisk også er det."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
 msgid ""
@@ -979,11 +1092,7 @@ msgstr "Send instruktioner"
 msgid "Forgot your password?"
 msgstr "Glemt dit kodeord?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Placering"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Vis på <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1050,7 +1159,7 @@ msgstr "URI'en til viderestililng for applikationerne. Dette felt\ner <strong>pÃ
 msgid "This field is required for public clients"
 msgstr "Dette felt er nødvendigt for offentlige klienter"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Klienten {0} er blevet registreret!"
 
@@ -1063,8 +1172,8 @@ msgid "Your OAuth clients"
 msgstr "Dine OAuth-klienter"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Beklager, der er allerede tilmeldt en konto med dette OpenID."
 
@@ -1072,39 +1181,39 @@ msgstr "Beklager, der er allerede tilmeldt en konto med dette OpenID."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Beklager, OpenID-serveren blev ikke fundet"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Der blev ikke fundet en OpenID-tjeneste for %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Verifikation af %s mislykkedes: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Verifikation blev annulleret"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Din OpenID-url blev glemt."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Du kan ikke slette din eneste OpenID-url, medmindre du har angivet en adgangskode"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Denne OpenID er ikke registreret for denne konto."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "Fjernelse af OpenID blev gennemført."
 
@@ -1128,7 +1237,7 @@ msgstr "OpenID'er"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1160,26 +1269,26 @@ msgstr "Eller tilmeld dig med OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Beklager, der er allerede en konto med denne Persona-email."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "Fjernelse af Persona-emailadressen blev gennemført."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Du kan ikke slette din eneste Persona-emailadresse, medmindre du har angivet en adgangskode."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Denne Persona-emailadresse er ikke registreret på denne konto."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Din e-postadresse for Persona blev gemt."
 
@@ -1203,15 +1312,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Forkert fil for medietypen."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1230,11 +1339,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Du kan benytte\n                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                        Markdown</a> til tekstformatering."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Du må give mig en fil"
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Samlingen \"%s\" blev tilføjet!"
@@ -1257,26 +1366,26 @@ msgstr "Du er blevet bandlyst"
 msgid "until %(until_when)s"
 msgstr "indtil %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Bekræft din email!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "log ud"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "<a href=\"%(user_url)s\">%(user_name)s</a>'s konto"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Skift kontoindstillinger"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1284,29 +1393,29 @@ msgstr "Skift kontoindstillinger"
 msgid "Media processing panel"
 msgstr "Panel til mediebehandling"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Log ud"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Tilføj medie"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Opret ny samling"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1360,8 +1469,8 @@ msgid "Authorization Complete"
 msgstr "Godkendelse er udført"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Kopiér og indsæt dette i din klient:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1451,13 +1560,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Redigerer vedhæftede filer for %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Vedhæftede filer"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Tilføj en vedhæftet fil"
 
@@ -1475,6 +1584,47 @@ msgstr "Gem ændringer"
 msgid "Changing %(username)s's email"
 msgstr "Ændrer %(username)ss e-mail"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s siden"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1500,7 +1650,7 @@ msgstr "Ændrer %(username)s's kontoindstillinger"
 msgid "Delete my account"
 msgstr "Slet min konto"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "E-mail"
 
@@ -1554,19 +1704,6 @@ msgstr "Hej,\n\nVi vil gerne sikre, at du er %(username)s. Er dette tilfældet,
 msgid "New comments"
 msgstr "Nye kommentarer"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s siden"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Markér alle som læst"
@@ -1579,38 +1716,38 @@ msgstr "Markér alle som læst"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Medie mærket med: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Hent"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Beklager, denne lydfil vil ikke fungere, fordi \n\tdin webbrowser ikke understøtter \n\tHTML5-lyd."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Du kan hente en moderne webbrowser som \n\tkan afspille lyden på <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Original fil"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM-fil (Vorbis-indkodning)"
 
@@ -1618,70 +1755,70 @@ msgstr "WebM-fil (Vorbis-indkodning)"
 msgid "Created"
 msgstr "Oprettet"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Bilelde for %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF-fil"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspektiv"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Forside"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Top"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Side"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Hent model"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Filformat"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Objektets højde"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Beklager, denne video vil ikke fungere, da\ndin webbrowser ikke understøtter HTML5-\nvideoer."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Du kan hente en moderne browser, der\n      kan afspille videoen på <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "WebM-fil (VP8/Vorbis)"
 
@@ -1766,7 +1903,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Rapport"
 
@@ -2072,17 +2209,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Tilføj en kommentar"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Tilføj denne kommentar"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Tilføjet"
 
@@ -2154,12 +2291,12 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>s medie med mærket <a href=\"%
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>s mediefil"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Gennemser medier fra <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Forhåndsvisning af kommentar"
 
@@ -2318,6 +2455,10 @@ msgstr "nyere"
 msgid "older"
 msgstr "ældre"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Placering"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2326,38 +2467,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "Mærket med"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Kunne ikke indlæse billedfilen."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Hovsa!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Der opstod en fejl"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Forkert forespørgsel"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "Forespørgslen som blev sendt til serveren er ugyldig, tjek den venligst ekstra grundigt"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Handlingen er ikke tilladt"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Beklager Søren, jeg kan ikke lade dig gøre det!</p><p>Du har forsøgt at udføre en funktion som du ikke har lov til at foretage. Har du nu forsøgt at slette alle brugerkontiene igen?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2425,69 +2566,69 @@ msgstr "Du kan anvende\n                      <a href=\"http://daringfireball.ne
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Beklager, kommentarer er slået fra."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Uups, din kommentar var uden indhold."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Din kommentar er blevet slået op!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Tjek venligst dine poster og forsøg igen."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Du skal vælge eller tilføje en samling"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" er allerede i samlingen \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" blev tiløføjet til samlingen \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Du slettede mediet."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Der er i gang med at slette en anden brugers mediefil. Fortsæt med varsomhed."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Du slettede elementet fra samlingen."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Elementet blev ikke fjernet, fordi du ikke markerede at du var sikker."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Du er i færd med at slette et element fra en anden brugers samling. Fortsæt med varsomhed."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Du slettede samlingen \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Samlingen blev ikke slettet, fordi du undlod at angive at du var sikker."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Du er i færd med at slette en anden brugers samling. Fortsæt med varsomhed."
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 2d71a2b9..00000000
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/mediagoblin.po
index 5eb4266a..ef3d0633 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/de/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -7,97 +7,205 @@
 # cwebber <cwebber@dustycloud.org>, 2011
 # Elrond <elrond+mediagoblin.org@samba-tng.org>, 2011-2012
 # Elrond <elrond+mediagoblin.org@samba-tng.org>, 2013
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
+# fleischwolf <flow@vaggi.org>, 2014
 # Jakob Kramer <jakob.kramer@gmx.de>, 2011, 2012
 # Jakob Kramer <jakob.kramer@gmx.de>, 2012-2013
 # Jan-Christoph Borchardt <hey@jancborchardt.net>, 2011
 # Jan-Christoph Borchardt <hey@jancborchardt.net>, 2011, 2012
 # janssen <jan-transifex@aurka.com>, 2014
+# Kaligule <Kaligule@googlemail.com>, 2014, 2015.
 # Keyzo <kyoo@kyoo.ch>, 2011
 # Marc Riese <marc@k-fx.de>, 2013
 # Marc Riese <marc@k-fx.de>, 2013
 # Elrond <elrond+mediagoblin.org@samba-tng.org>, 2011
-# davidak <post@davidak.de>, 2014
+# davidak <post@davidak.de>, 2014, 2015.
 # Artopal <artopal@fastmail.fm>, 2011
 # spaetz <sebastian@sspaeth.de>, 2014
 # spaetz <sebastian@sspaeth.de>, 2012
 # Vinzenz Vietzke <vinz@vinzv.de>, 2012
 # Vinzenz Vietzke <vinz@vinzv.de>, 2011
+# onEarth <mame@plattform32.de>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-07-29 11:01-0500\n"
-"PO-Revision-Date: 2014-08-04 17:42+0000\n"
-"Last-Translator: janssen <jan-transifex@aurka.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/mediagoblin/language/de/)\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-02-26 12:17+0000\n"
+"Last-Translator: Kaligule <Kaligule@googlemail.com>\n"
+"Language-Team: German "
+"(http://www.transifex.com/projects/p/mediagoblin/language/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"Generated-By: Babel 1.3\n"
+"X-POOTLE-MTIME: 1424953076.0\n"
 
-#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Benutzerregistrierung ist auf diesem Server leider deaktiviert."
 
-#: mediagoblin/decorators.py:315
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Das Melden ist auf dieser Instanz leider deaktiviert."
 
-#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Authentifizierung ist auf dieser Instanz leider deaktiviert."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Ungültiger Benutzername oder E-Mail-Adresse."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Dieses Feld akzeptiert keine E-Mail-Adressen."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Dieses Feld benötigt eine gültige E-Mail-Adresse."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Leider gibt es bereits einen Benutzer mit dieser E-Mail-Adresse."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "Der Bestätigungsschlüssel oder die Benutzer-ID stimmen nicht."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Dein GNU MediaGoblin Konto wurde hiermit aktiviert. Du kannst dich jetzt anmelden, dein Profil bearbeiten und Medien hochladen."
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Der Aktivierungsschlüssel oder die Nutzerkennung ist falsch."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Du musst angemeldet sein, damit wir wissen, an wen die E-Mail gesendet werden soll."
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Deine E-Mail-Adresse wurde bereits aktiviert."
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Aktivierungsmail wurde erneut versandt."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr "{username} hat {object} hinzugefügt"
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr "{username} hat {object} zu {target} hinzugefügt"
+
+#: mediagoblin/db/mixin.py:407
+#, fuzzy
+msgid "{username} authored {object}"
+msgstr "{username} hat {object} verfasst"
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr "{username} hat {object} erstellt"
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr "{username} hat {object} gelöscht"
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr "{username} mag {object} nicht"
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr "{username} favorisierte {object}"
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr "{username} folgt {object}"
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr "{username} mag {object}"
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr "{username} hat {object} geschrieben"
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr "{username} hat {object} auf {target} geschrieben"
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr "{username} hat {object} freigegeben"
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr "{username} favorisiert nicht mehr {object}"
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr "{username} folgt {object} nicht mehr"
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr "{username} mag {object} nicht mehr"
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr "{username} teilt nicht mehr {object}"
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr "{username} hat {object} aktualisiert"
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr "{username} hat {object} getagt"
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr "ein Bild"
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr "ein Kommentar"
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr "eine Sammlung"
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr "ein Video"
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr "Audio"
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr "eine Person"
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr "ein Objekt"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -113,7 +221,7 @@ msgid "Description of this work"
 msgstr "Beschreibung des Werkes"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -129,11 +237,11 @@ msgstr "Schlagwörter"
 msgid "Separate tags by commas."
 msgstr "Getrennt durch Kommata"
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Kurztitel"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Bitte gib einen Kurztitel ein"
 
@@ -161,125 +269,137 @@ msgstr "Webseite"
 msgid "This address contains errors"
 msgstr "Die URL ist nicht gültig. Bitte überprüf sie nochmal..."
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr "Heimatort"
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Mir eine E-Mail schicken, wenn andere meine Medien kommentieren"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Aktiviere innerhalb Benachrichtigungen über Ereignisse."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Bevorzugte Lizenz"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Dies wird deine Standardlizenz für neue Uploads sein."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Der Titel darf nicht leer sein"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Beschreibung dieser Sammlung"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Der Titelteil dieser Sammlungsadresse. Du musst ihn normalerweise nicht ändern."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Gib dein altes Passwort ein, um zu bestätigen, dass du der Besitzer dieses Kontos bist."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Neue E-Mail-Adresse"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Passwort"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Gib Dein Passwort ein, um zu bestätigen, dass Du dieses Konto besitzt."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
-msgstr ""
+msgstr "Bezeichner"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
-msgstr ""
+msgstr "Wert"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Diesen Kurztitel hast du bereits vergeben."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Du bearbeitest die Medien eines anderen Nutzers. Sei bitte vorsichtig."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Du hast den Anhang %s hinzugefügt!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Du kannst nur dein eigenes Profil bearbeiten."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Du bearbeitest das Profil eines anderen Nutzers. Sei bitte vorsichtig."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Das Profil wurde aktualisiert"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Kontoeinstellungen gespeichert"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr "Unbekannte Anwendung, Berechtigung kann nicht entzogen werden"
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr "Berechtigung für Anwendung wurde entzogen"
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Du musst die Löschung deines Kontos noch bestätigen."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Du hast bereits eine Sammlung mit dem Namen \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Eine Sammlung mit diesem Kurztitel existiert bereits für diesen Benutzer."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Du bearbeitest die Sammlung eines anderen Benutzers. Sei vorsichtig."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Deine E-Mail-Adresse wurde verifiziert."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Falsches Passwort"
 
@@ -310,66 +430,66 @@ msgstr "Ãœberspringe \"%s\"; bereits eingerichtet.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Alte Verknüpfung für \"%s\" gefunden; wird entfernt.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
 "documentation page on command line uploading\n"
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
-msgstr ""
+msgstr "Für mehr Informationen wie man dieses Skript richtig ausführt (und über das Format von der csv Datei) lies die MediaGoblin Dokumentationsseite zumHochladen per Komandozeile\n<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
-msgstr ""
+msgstr "Der Name des Benutzers, dem diese Medien gehören"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
-msgstr ""
+msgstr "Pfad zur csv Datei mit den Metadaten."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
-msgstr ""
+msgstr "Tut uns leid, es gibt keinen Nutzer '{username}' "
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
-msgstr ""
+msgstr "Die Datei wurde unter {Path} nicht gefunden, benutze die -h Flag für Hilfe"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
-msgstr ""
+msgstr "Fehler bei Medium  '{media_id}' Wert '{error_path}': {error_msg}\nMetadaten wurden nicht hochgeladen."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
-msgstr ""
+msgstr "Fehlgeschlagen: Zugriff auf lokale Datei {filename} verweigert.\n{filename} wird nicht hochgeladen. "
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
-msgstr ""
+msgstr "Erfolgreich {filename} übermittelt!\nBitte schaue Dir die Medien-Verarbeitungsübersicht an, um sicherzugehen,\ndass es korrekt hochgeladen wurde."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr "FEHLER: Diese Datei ist größer als das Hochlad-Limit für diese Seite."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr "FEHLER: Die Datei wird das Hochlad-Limit des Benutzers überschreiten."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr "FEHLER: Dieser Benutzer hat das Hochlad-Limit bereits erreicht."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr "{files_uploaded} aus {files_attempted} Dateien wurden erfolgreich hochgeladen"
 
@@ -395,28 +515,28 @@ msgstr "Beschreibung"
 msgid "I am sure I want to delete this"
 msgstr "Ja, wirklich löschen"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "JAAA! Geschafft!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr "Woohoo! Die Änderung am Blogeintrag ist durchgeführt."
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr "Du hast den Blog gelöscht."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
-msgstr "Das Medium wurde nicht gelöscht, da du die Löschung nicht bestätigt hast."
+msgstr "Das Medium wurde nicht gelöscht, da Du die Löschung nicht bestätigt hast."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr "Du bist daran, einen Blog von einem anderen Benutzer zu löschen. Bitte sei vorsichtig."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr "Der Blog wurde nicht gelöscht, weil du keine Rechte für diesen Vorgang hast."
 
@@ -436,7 +556,7 @@ msgstr "Blog löschen"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -446,7 +566,7 @@ msgstr "Bearbeiten"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Löschen"
 
@@ -563,7 +683,7 @@ msgstr "Welche Rechte wirst du entziehen?"
 
 #: mediagoblin/moderation/forms.py:122
 msgid "Why user was banned:"
-msgstr "Der Benutzer wurde verbannt wegen:"
+msgstr "Der Benutzer wurde gesperrt, denn:"
 
 #: mediagoblin/moderation/forms.py:125
 msgid "Message to user:"
@@ -571,48 +691,48 @@ msgstr "Nachricht zum Benutzer:"
 
 #: mediagoblin/moderation/forms.py:128
 msgid "Resolution content:"
-msgstr ""
+msgstr "Auflösungsinhalt:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
-msgstr ""
+msgstr "\n{mod} hat {user} die {privilege} Privilegien entzogen."
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
-msgstr ""
+msgstr "\n{mod} hat Benutzer {user} verbannt {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
-msgstr ""
+msgstr "bis {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "unbefristet"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
-msgstr ""
+msgstr "\n{mod} hat eine Verwarnung an {user} geschickt."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
-msgstr ""
+msgstr "\n{mod} hat den Kommentar gelöscht."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
-msgstr ""
+msgstr "\n{mod} hat diesen Eintrag gelöscht\n\n."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Warnung von"
 
@@ -630,56 +750,56 @@ msgstr "Kommentare zu %s wurden abonniert!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Du wirst keine Benachrichtigungen für Kommentare zu %s mehr erhalten."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Ein OAuth-Token muss bereitgestellt werden."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Kein Anfrage-Token gefunden."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Die Datei ist zu groß."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Das Hochladen dieser Datei würde dein Upload-Limit überschreiten."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Du hast dein Upload-Limit erreicht."
 
 #: mediagoblin/plugins/archivalook/forms.py:21
 msgid "Enter the URL for the media to be featured"
-msgstr ""
+msgstr "Trage den URL für das Medium ein, um es hervorzuheben"
 
 #: mediagoblin/plugins/archivalook/tools.py:132
 msgid "Primary"
-msgstr ""
+msgstr "Primär"
 
 #: mediagoblin/plugins/archivalook/tools.py:133
 msgid "Secondary"
-msgstr ""
+msgstr "Sekundär"
 
 #: mediagoblin/plugins/archivalook/tools.py:134
 msgid "Tertiary"
-msgstr ""
+msgstr "Tertiär"
 
 #: mediagoblin/plugins/archivalook/tools.py:135
 msgid "-----------{display_type}-Features---------------------------\n"
-msgstr ""
+msgstr "-----------{display_type}-Funktionen---------------------------\n"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
 msgid "How does this work?"
-msgstr ""
+msgstr "Wie funktioniert's?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
 msgid "How to feature media?"
-msgstr ""
+msgstr "Wie hebe ich ein Medium hervor?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
 msgid ""
@@ -692,13 +812,14 @@ msgid ""
 "      inside the text box, click the Submit Query button, and your media should be\n"
 "      displayed on the front page.\n"
 "    "
-msgstr ""
+msgstr "\nGehe zur Seite des Mediums, das hervorgehoben werden soll. Kopiere den URL und\nfüge ihn in eine neue Zeile in der obigen Textbox ein. Es sollte nur\neinen URL pro Zeile geben. Der URL, den Du in die Box eingefügt hast, sollte unterhalb\nder Überschrift stehen die beschreibt, wie stark hervorgehoben das Medium sein soll (ob an erster,\nzweiter oder dritter Stelle). Wenn alle Medien die Du hervorheben möchtest in der Textbox eingetragen sind, klicke die Übermitteln-Schaltfläche. Deine Medien sollten nun\nauf der Startseite angezeigt werden.\n "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
 msgid "Is there another way to manage featured media?"
-msgstr ""
+msgstr "Gibt es eine andere Möglichkeit hervorgehobene Medien zu verwalten?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+#, fuzzy
 msgid ""
 "\n"
 "        Yes. If you would prefer, you may go to the media homepage of the piece\n"
@@ -719,10 +840,19 @@ msgid ""
 "        less prominent.\n"
 "    "
 msgstr ""
+"\n"
+"        Ja. Wenn du es vorziehst kannst du auf die Medienseite des Mediums "
+"besuchen, das du hervorheben oder nicht mehr hervorheben möchtest, und auf "
+"dessen Seitenleiste schauen. Wenn das Medium noch nicht hervorgehoben wurde, "
+"solltest du eine \"hervorheben\" Schaltfläche sehen. Klicke auf diese "
+"Schaltfläche und das Medium wird als Primary Feature oben auf der Seite  "
+"angezeigt werden. Alle anderen hervorgehobenen Medien bleiben hervorgehoben, "
+"werden aber nach hinten rücken. <br/><br/>\n"
+"\n"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
 msgid "What is a Primary Feature? What is a Secondary Feature?"
-msgstr ""
+msgstr "Was ist eine Hervorhebung an erster Stelle? Was eine Hervorhebung an zweiter Stelle?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
 msgid ""
@@ -735,13 +865,13 @@ msgid ""
 "      Primary Features also can display longer descriptions than Secondary\n"
 "      Features, and Secondary Features can display longer descriptions than\n"
 "      Tertiary Features."
-msgstr ""
+msgstr "Der Zweite Teil fehlt"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
 msgid ""
 "How to decide what information is displayed when a media entry is\n"
 "    featured?"
-msgstr ""
+msgstr "Wie entscheiden welche Informationen angezeigt werden, wenn ein Medium\nhervorgehoben wird?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
 msgid ""
@@ -757,7 +887,7 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
 msgid "How to unfeature a piece of media?"
-msgstr ""
+msgstr "Wie die Hervorhebung eines Mediums aufheben?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
 msgid ""
@@ -765,11 +895,11 @@ msgid ""
 "      Unfeature a media by removing its line from the above textarea and then\n"
 "      pressing the Submit Query button.\n"
 "    "
-msgstr ""
+msgstr "\nHebe die Hervorhebung eines Mediums auf, indem Du in der obigen Textbox\ndie entsprechende Zeile entfernst, und dann die Übermitteln-Schaltfläche klickst.\n "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
 msgid "CAUTION:"
-msgstr ""
+msgstr "ACHTUNG:"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
 msgid ""
@@ -778,48 +908,47 @@ msgid ""
 "      you make a typo, once you press Submit Query, your media entry will NOT be\n"
 "      featured. Make sure that all your intended Media Entries are featured.\n"
 "    "
-msgstr ""
+msgstr "\nWenn Du URLs in die obige Textbox kopierst und einfügst beachte,\ndass bei einem Tippfehler nach einem Klick auf die Übermitteln-Schaltfläche\nDein Medium nicht hervorgehoben werden wird. "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
 msgid ""
 "\n"
 "Feature Media "
-msgstr ""
+msgstr "\nMedium hervorheben"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:64
 msgid "Feature"
-msgstr ""
+msgstr "featuren"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
 msgid ""
 "\n"
 "Unfeature Media "
-msgstr ""
+msgstr "\nMedium nicht mehr hervorheben"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
 msgid "Unfeature"
-msgstr ""
+msgstr "entfeaturen"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
 msgid ""
 "\n"
 "Promote Feature "
-msgstr ""
+msgstr "\nHervorhebung hochzustufen"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
 msgid "Promote"
-msgstr ""
+msgstr "Erhöhen"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
 msgid ""
 "\n"
 "Demote Feature "
-msgstr ""
+msgstr "\nHervorhebung herabstufen"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
 msgid "Demote"
-msgstr ""
+msgstr "Herabstufen"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
 #: mediagoblin/templates/mediagoblin/root.html:32
@@ -828,49 +957,46 @@ msgstr "Neuste Medien"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
 msgid "Nothing is currently featured."
-msgstr ""
+msgstr "Momentan ist kein Medium hervorgehoben."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
 msgid ""
 "If you would like to feature a\n"
 "        piece of media, go to that media entry's homepage and click the button\n"
-"        that says"
-msgstr ""
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr "Wenn Du ein Medium hervorheben\nmöchtest, gehe zur Hauptseite des Mediums und klicke\nauf die Schaltfläche die sagt <a class=\"button_action\">Hervorheben</a>."
 
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:65
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
 msgid ""
 "You're seeing this page because you are a user capable of\n"
 "        featuring media, a regular user would see a blank page, so be sure to\n"
 "        have media featured as long as your instance has the 'archivalook'\n"
 "        plugin enabled. A more advanced tool to manage features can be found\n"
-"        in the"
-msgstr ""
+"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+msgstr "Du siehst diese Seite, weil Du ein Benutzer bist,\nder Medien hervorheben darf. Ein normaler Benutzer würde eine leere Seite sehen, also stelle sicher,\ndass Du Medien hervorgehoben hast solange auf Deiner Instanz\ndas  'archivalook' Plugin aktiviert ist.\nEin weiter entwickeltes Werkzeug um Hervorhebungen zu verwalten findest\nDu in der  <a href=\"%(featured_media_url)s\">Hervorhebungsverwaltung.</a> "
 
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:72
-msgid "feature management panel."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:77
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
 msgid "View most recent media"
-msgstr ""
+msgstr "Neu hinzugefügte Medien ansehen"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
 msgid "Feature management panel"
-msgstr ""
+msgstr "Hervorhebungsverwaltung"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
 msgid ""
 "Sorry, this audio will not work because\n"
 "\tyour web browser does not support HTML5\n"
 "\taudio."
-msgstr ""
+msgstr "Diese Audiodatei kann nicht abgespielt werden,\nweil Dein Webbrowser kein HTML5-Audio unterstützt."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
 msgid ""
 "You can get a modern web browser that\n"
 "\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
 "\t  http://getfirefox.com</a>!"
-msgstr ""
+msgstr "Du kannst einen modernen Webbrowser, der\ndiese Audiodatei abspielen kann, unter\n<a href=\"http://getfirefox.com\">http://getfirefox.com</a> herunterladen!"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
@@ -878,7 +1004,7 @@ msgid ""
 "Sorry, this video will not work because\n"
 "          your web browser does not support HTML5 \n"
 "          video."
-msgstr ""
+msgstr "Dieses Video kann nicht abgespielt werden,\nweil Dein Webbrowser kein HTML5-Video unterstützt."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
@@ -886,7 +1012,7 @@ msgid ""
 "You can get a modern web browser that \n"
 "          can play this video at <a href=\"http://getfirefox.com\">\n"
 "          http://getfirefox.com</a>!"
-msgstr ""
+msgstr "Du kannst einen modernen Webbrowser, der\ndieses Video abspielen kann, unter \n<a href=\"http://getfirefox.com\">\nhttp://getfirefox.com</a> herunterladen!"
 
 #: mediagoblin/plugins/basic_auth/forms.py:24
 #: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
@@ -998,11 +1124,7 @@ msgstr "Anweisungen senden"
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Aufnahmeort"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "In <a href=\"%(osm_url)s\">OpenStreetMap</a> öffnen"
@@ -1013,11 +1135,11 @@ msgstr "Anmelden um ein Konto zu erstellen!"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
 msgid "Metadata"
-msgstr ""
+msgstr "Metadaten"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
 msgid "Edit Metadata"
-msgstr ""
+msgstr "Metadaten bearbeiten"
 
 #: mediagoblin/plugins/oauth/forms.py:29
 msgid "Allow"
@@ -1069,7 +1191,7 @@ msgstr "Die Weiterleitungs-URI für die Anwendung, dieses Feld\n            ist
 msgid "This field is required for public clients"
 msgstr "Dieses Feld ist Pflicht für öffentliche Clients"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Der Client {0} wurde erfolgreich registriert!"
 
@@ -1082,8 +1204,8 @@ msgid "Your OAuth clients"
 msgstr "Deine OAuth-Clients"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Mit dieser OpenID wurde bereits ein Konto registriert."
 
@@ -1091,39 +1213,39 @@ msgstr "Mit dieser OpenID wurde bereits ein Konto registriert."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Der OpenID-Server konnte leider nicht gefunden werden"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Für %s konnte kein OpenID-Dienst gefunden werden"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Überprüfung von %s fehlgeschlagen: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Überprüfung abgebrochen"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Deine OpenID-URL wurde erfolgreich gespeichert."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Du kannst deine OpenID-URL nicht löschen, solange kein Passwort gesetzt ist."
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Diese OpenID ist für dieses Konto nicht registriert."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID wurde erfolgreich entfernt."
 
@@ -1147,7 +1269,7 @@ msgstr "OpenIDs"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1179,26 +1301,26 @@ msgstr "Oder registriere dich mit OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Mit dieser Persona E-Mail wurde bereits ein Konto registriert."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "Die Persone E-Mail-Adresse wurde erfolgreich entfernt."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Du kannst deine Persona E-Mail-Adresse nicht löschen, solange kein Passwort gesetzt ist."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Diese Persona E-Mail-Adresse ist für dieses Konto nicht registriert."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Mit dieser Persona E-Mail-Adresse wurde bereits ein Konto registriert."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Deine Persona E-Mail-Adresse wurde erfolgreich gespeichert."
 
@@ -1222,15 +1344,15 @@ msgstr "Oder melde dich mit Persona an!"
 msgid "Or register with Persona!"
 msgstr "Oder registriere dich mit Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Kopieren auf öffentlichen Speicher ist fehlgeschlagen."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "Es wurde keine akzeptable Datei zum Verarbeiten gefunden"
 
@@ -1249,11 +1371,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Du kannst\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> zum Formatieren verwenden."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Du musst eine Datei angeben."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Sammlung \"%s\" hinzugefügt!"
@@ -1276,26 +1398,26 @@ msgstr "Du wurdest gesperrt"
 msgid "until %(until_when)s"
 msgstr "bis %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Bitte bestätige Deine E-Mail-Adresse!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "Abmelden"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "<a href=\"%(user_url)s\">%(user_name)s</a>s Konto"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Kontoeinstellungen ändern"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1303,29 +1425,29 @@ msgstr "Kontoeinstellungen ändern"
 msgid "Media processing panel"
 msgstr "Medienverarbeitung"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Abmelden"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Medien hinzufügen"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Neue Sammlung erstellen"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
-msgstr ""
+msgstr "Moderatorenrechte:"
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Benutzerverwaltung"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Meldungsverwaltung"
 
@@ -1379,8 +1501,9 @@ msgid "Authorization Complete"
 msgstr "Autorisierung abgeschlossen"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Kopiere dies und füge es in deinem Client ein:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+"Kopiere diesen <strong>Verfizierungs-Schlüssel</strong> in deinen Client"
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1450,13 +1573,13 @@ msgid ""
 "\n"
 "            >Create an account at this site</a>\n"
 "            or"
-msgstr ""
+msgstr "\n>Erstelle auf dieser Seite ein Benutzerkonto</a>\noder"
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
 msgid ""
 "\n"
 "            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
-msgstr ""
+msgstr "\n<a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Richte MediaGoblin auf Deinem eigenen Server ein</a>"
 
 #: mediagoblin/templates/mediagoblin/bits/logo.html:23
 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -1470,13 +1593,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Bearbeite Anhänge von %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Anhänge"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Anhang hinzufügen"
 
@@ -1494,6 +1617,50 @@ msgstr "Änderungen speichern"
 msgid "Changing %(username)s's email"
 msgstr "Ändere %(username)ss E-Mail"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr "Entziehe den Anwendungen die Berechtigung"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr "Entziehe den Anwendungen die Berechtigung"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+"                  Diese Anwendungen können auf dein GNU MediaGoblin Konto "
+"zugreifen. Entfernen der \n"
+"Anwendung wird sie vom Zugriff auf dein Konto ausschließen.                "
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr "Es sind keine Anwendungen autorisiert."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr "Typ:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr "Autorisiert:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "vor %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1519,7 +1686,7 @@ msgstr "%(username)ss Kontoeinstellungen ändern"
 msgid "Delete my account"
 msgstr "Mein Konto löschen"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "E-Mail"
 
@@ -1537,23 +1704,23 @@ msgstr "%(username)ss Profil bearbeiten"
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:67
 #, python-format
 msgid "Metadata for \"%(media_name)s\""
-msgstr ""
+msgstr "Metadaten für \"%(media_name)s\""
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:72
 msgid "MetaData"
-msgstr ""
+msgstr "Metadaten"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:80
 msgid "Add new Row"
-msgstr ""
+msgstr "Neue Zeile hinzufügen"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:83
 msgid "Update Metadata"
-msgstr ""
+msgstr "Metadaten aktualisieren"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:87
 msgid "Clear empty Rows"
-msgstr ""
+msgstr "Lösche leere Zeilen"
 
 #: mediagoblin/templates/mediagoblin/edit/verification.txt:19
 #, python-format
@@ -1573,19 +1740,6 @@ msgstr "Hi,\n\nwir möchten überprüfen, dass Du %(username)s bist.\nWenn dies
 msgid "New comments"
 msgstr "Neue Kommentare"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "vor %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Alles als gelesen markieren"
@@ -1598,38 +1752,41 @@ msgstr "Alles als gelesen markieren"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Medien mit Schlagwort: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Download"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Die Audiodatei kann nicht abgespielt werden, da dein Webbrowser kein HTML5 unterstützt."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr "Verzeihung, der Ton kann nicht abgespielt werden, denn\n\tihr Browser unterstützt keinen HTML 5 Ton"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Lad dir einen modernen Webbrowser runter, z.B. <a href=\"http://www.mozilla.org/de/firefox/new/\">Firefox</a> oder <a href=\"https://www.google.com/chrome/\">Chrome</a>. Die können die Audiodatei abspielen."
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+"Du kannst dir einen modernen Browser holen, der \n"
+"\t Audio wiedergeben kann <a href=\"http://getfirefox.com\">\n"
+"\t http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Originaldatei"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM-Datei (Vorbis-Codec)"
 
@@ -1637,70 +1794,70 @@ msgstr "WebM-Datei (Vorbis-Codec)"
 msgid "Created"
 msgstr "Originaldatum"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Bild für %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF-Datei"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspektive"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Vorderseite"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Draufsicht"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Seitenansicht"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Modell herunterladen"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Dateiformat"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Objekthöhe"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Entschuldige, dieses Video wird nicht funktionieren, weil dein Webbrowser kein HTML5-Video unterstützt."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Hol dir auf <a href=\"http://getfirefox.com\">http://getfirefox.com</a> einen modernen Webbrowser, der dieses Video abspielen kann!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "WebM-Datei (VP8/Vorbis)"
 
@@ -1725,20 +1882,20 @@ msgstr "ID"
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
 msgid "User"
-msgstr ""
+msgstr "Nutzer"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
 msgid "When submitted"
-msgstr ""
+msgstr "Wann übermittelt"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
 msgid "Transcoding progress"
-msgstr ""
+msgstr "Transkodierungsvorgang"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
 msgid "Unknown"
-msgstr ""
+msgstr "Unbekannt"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
@@ -1752,11 +1909,11 @@ msgstr "Die folgenden Uploads sind fehlgeschlagen:"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
 msgid "Reason for failure"
-msgstr ""
+msgstr "Grund für Fehlschlag"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
 msgid "Failure metadata"
-msgstr ""
+msgstr "Fehlschlag Metadaten"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
@@ -1769,7 +1926,7 @@ msgstr "Die letzten 10 erfolgreichen Uploads"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
 msgid "Submitted"
-msgstr ""
+msgstr "Eingereicht"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
@@ -1785,7 +1942,7 @@ msgid "Return to Reports Panel"
 msgstr "Zurück zur Meldungsverwaltung"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Meldung"
 
@@ -1813,7 +1970,7 @@ msgstr "\n          INHALT VON\n            <a href=\"%(user_url)s\"> %(user_nam
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:102
 msgid "Reason for report:"
-msgstr ""
+msgstr "Grund für den Bericht:"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:133
 #: mediagoblin/templates/mediagoblin/moderation/user.html:136
@@ -1919,15 +2076,15 @@ msgstr "Keine geschlossenen Meldungen gefunden."
 #: mediagoblin/templates/mediagoblin/moderation/user.html:23
 #, python-format
 msgid "User: %(username)s"
-msgstr ""
+msgstr "Nutzer: %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:42
 msgid "Return to Users Panel"
-msgstr ""
+msgstr "Zurück zur Benutzerübersicht"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:49
 msgid "Sorry, no such user found."
-msgstr ""
+msgstr "Entschuldigung, kein solcher Benutzer gefunden."
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:53
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
@@ -1939,7 +2096,7 @@ msgstr "E-Mail Aktivierung benötigt"
 msgid ""
 "Someone has registered an account with this username, but it still has\n"
 "        to be activated."
-msgstr ""
+msgstr "Jemand hat bereits ein Konto mit diesem Benutzernamen registriert, \naber es muss noch aktiviert werden."
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:66
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:34
@@ -1952,11 +2109,11 @@ msgstr "%(username)ss Profil"
 #: mediagoblin/templates/mediagoblin/moderation/user.html:68
 #, python-format
 msgid "BANNED until %(expiration_date)s"
-msgstr ""
+msgstr "GESPERRT bis %(expiration_date)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:72
 msgid "Banned Indefinitely"
-msgstr ""
+msgstr "Für immer gesperrt"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:78
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:62
@@ -1977,76 +2134,76 @@ msgstr "Sammlungen durchstöbern"
 #: mediagoblin/templates/mediagoblin/moderation/user.html:105
 #, python-format
 msgid "Active Reports on %(username)s"
-msgstr ""
+msgstr "Aktive Berichte von %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:112
 msgid "Report ID"
-msgstr ""
+msgstr "Berichtskennung"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:113
 msgid "Reported Content"
-msgstr ""
+msgstr "Gemeldeter Inhalt"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:114
 msgid "Description of Report"
-msgstr ""
+msgstr "Beschreibung des Berichts"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:122
 #, python-format
 msgid "Report #%(report_number)s"
-msgstr ""
+msgstr "Bericht #%(report_number)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:129
 msgid "Reported Comment"
-msgstr ""
+msgstr "Gemeldeter Kommentar"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:131
 msgid "Reported Media Entry"
-msgstr ""
+msgstr "Gemeldetes Medium"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:142
 #, python-format
 msgid "No active reports filed on %(username)s"
-msgstr ""
+msgstr "Keine aktiven Berichte für %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:150
 #, python-format
 msgid "All reports on %(username)s"
-msgstr ""
+msgstr "Alle Berichte von %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:155
 #, python-format
 msgid "All reports that %(username)s has filed"
-msgstr ""
+msgstr "Alle Berichte von %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:164
 #, python-format
 msgid "%(username)s's Privileges"
-msgstr ""
+msgstr "%(username)s's Privilegien"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:172
 msgid "Privilege"
-msgstr ""
+msgstr "Privileg"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:173
 msgid "Granted"
-msgstr ""
+msgstr "gewährt"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:180
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:182
 msgid "No"
-msgstr ""
+msgstr "Nein"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:213
 msgid "Ban User"
-msgstr ""
+msgstr "Sperre Nutzer"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:218
 msgid "UnBan User"
-msgstr ""
+msgstr "Lasse Nutzer wieder zu"
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
@@ -2088,20 +2245,20 @@ msgstr "Deine Medien"
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
 #, python-format
 msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
+msgstr "� Blogpost von <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Einen Kommentar schreiben"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Kommentar hinzufügen"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Hinzugefügt"
 
@@ -2118,17 +2275,17 @@ msgstr "%(collection_title)s von <a href=\"%(user_url)s\">%(username)s</a>"
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
 #, python-format
 msgid "Delete collection %(collection_title)s"
-msgstr ""
+msgstr "Lösche Album %(collection_title)s "
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
 #, python-format
 msgid "Really delete collection: %(title)s?"
-msgstr ""
+msgstr "Album %(title)s wirklich löschen?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
 #, python-format
 msgid "Remove %(media_title)s from %(collection_title)s"
-msgstr ""
+msgstr "Entferne %(media_title)s aus %(collection_title)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
 #, python-format
@@ -2173,12 +2330,12 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>s Medien mit dem Schlagwort <a
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>s Medien"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Medien von <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Kommentarvorschau"
 
@@ -2295,11 +2452,11 @@ msgstr "Zu einer Sammlung hinzufügen"
 
 #: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
 msgid "Subscribe to comments"
-msgstr ""
+msgstr "Komentare abonnieren"
 
 #: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
 msgid "Silence comments"
-msgstr ""
+msgstr "Komentare stumm schalten"
 
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
@@ -2337,6 +2494,10 @@ msgstr "neuer"
 msgid "older"
 msgstr "älter"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Aufnahmeort"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Medien melden"
@@ -2345,38 +2506,38 @@ msgstr "Medien melden"
 msgid "Tagged with"
 msgstr "Schlagwörter"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Das Bild konnte nicht verarbeitet werden."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Hoppla!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Ein Fehler ist aufgetreten"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
-msgstr "Ungültige Anfrage"
+msgstr "Falsche Anfrage"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "Die zum Server gesendete Anfrage ist ungültig, bitte überprüfe sie noch einmal"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Funktion nicht erlaubt"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "So nicht!</p><p>Du wolltest eine Funktion verwenden zu der Du nicht die nötigen Rechte besitzt. Wolltest Du etwa schon wieder alle Nutzerkonten löschen?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2444,69 +2605,69 @@ msgstr "Du kannst\n<a href=\"http://daringfireball.net/projects/markdown/basics\
 msgid "Reason for Reporting"
 msgstr "Grund für die Meldung"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Kommentare sind leider deaktiviert."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Hoppla, der Kommentartext fehlte."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Dein Kommentar wurde angenommen!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Bitte überprüfe deine Eingaben und versuche es erneut."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Du musst eine Sammlung auswählen oder hinzufügen"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" ist bereits in der Sammlung \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" zur Sammlung \"%s\" hinzugefügt"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Du hast das Medium gelöscht."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Du versuchst Medien eines anderen Nutzers zu löschen. Sei bitte vorsichtig."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Du hast das Objekt aus der Sammlung entfernt."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Das Objekt wurde nicht aus der Sammlung entfernt, weil du nicht bestätigt hast, dass du dir sicher bist."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Du bist dabei ein Objekt aus der Sammlung eines anderen Benutzers zu entfernen. Sei vorsichtig."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Du hast die Sammlung \"%s\" gelöscht"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Die Sammlung wurde nicht gelöscht, weil du nicht bestätigt hast, dass du dir sicher bist."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Du bist dabei eine Sammlung eines anderen Benutzers zu entfernen. Sei vorsichtig."
diff --git a/mediagoblin/i18n/fa_IR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/dz/mediagoblin.po
index 79aa6590..d93ea081 100644
--- a/mediagoblin/i18n/fa_IR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/dz/mediagoblin.po
@@ -1,22 +1,22 @@
 # Translations template for PROJECT.
 # Copyright (C) 2014 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# 
-# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU MediaGoblin\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-25 14:44-0500\n"
-"PO-Revision-Date: 2011-08-07 03:51+0000\n"
+"POT-Creation-Date: 2014-09-21 11:08-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/mediagoblin/language/fa_IR/)\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.10.0\n"
 "Generated-By: Babel 1.3\n"
-"Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
 msgid "Sorry, registration is disabled on this instance."
@@ -58,8 +58,8 @@ msgstr ""
 
 #: mediagoblin/auth/views.py:161
 msgid ""
-"Your email address has been verified. You may now login, edit your profile, "
-"and submit images!"
+"Your email address has been verified. You may now login, edit your "
+"profile, and submit images!"
 msgstr ""
 
 #: mediagoblin/auth/views.py:167
@@ -97,7 +97,8 @@ msgstr ""
 #: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
@@ -334,7 +335,8 @@ msgstr ""
 #: mediagoblin/gmg_commands/batchaddmedia.py:157
 msgid ""
 "Successfully submitted {filename}!\n"
-"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"Be sure to look at the Media Processing Panel on your website to be sure "
+"it\n"
 "uploaded successfully."
 msgstr ""
 
@@ -356,9 +358,9 @@ msgstr ""
 
 #: mediagoblin/meddleware/csrf.py:134
 msgid ""
-"CSRF cookie not present. This is most likely the result of a cookie blocker "
-"or somesuch.<br/>Make sure to permit the settings of cookies for this "
-"domain."
+"CSRF cookie not present. This is most likely the result of a cookie "
+"blocker or somesuch.<br/>Make sure to permit the settings of cookies for "
+"this domain."
 msgstr ""
 
 #: mediagoblin/media_types/__init__.py:79
@@ -665,12 +667,18 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
 msgid ""
 "\n"
-"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
-"      then paste it into a new line in the text box above. There should be only\n"
-"      one url per line. The url that you paste into the text box should be under\n"
-"      the header describing how prominent a feature it will be (whether Primary,\n"
-"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
-"      inside the text box, click the Submit Query button, and your media should be\n"
+"      Go to the page of the media entry you want to feature. Copy it's "
+"URL and\n"
+"      then paste it into a new line in the text box above. There should "
+"be only\n"
+"      one url per line. The url that you paste into the text box should "
+"be under\n"
+"      the header describing how prominent a feature it will be (whether "
+"Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to "
+"feature are\n"
+"      inside the text box, click the Submit Query button, and your media "
+"should be\n"
 "      displayed on the front page.\n"
 "    "
 msgstr ""
@@ -682,21 +690,33 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
 msgid ""
 "\n"
-"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
-"        of media you would like to feature or unfeature and look at the bar to\n"
-"        the side of the media entry. If the piece of media has not been featured\n"
-"        yet you should see a button that says \"Feature\". Press that button and\n"
-"        the media will be featured as a Primary Feature at the top of the page.\n"
-"        All other featured media entries will remain as features, but will be\n"
+"        Yes. If you would prefer, you may go to the media homepage of the"
+" piece\n"
+"        of media you would like to feature or unfeature and look at the "
+"bar to\n"
+"        the side of the media entry. If the piece of media has not been "
+"featured\n"
+"        yet you should see a button that says \"Feature\". Press that "
+"button and\n"
+"        the media will be featured as a Primary Feature at the top of the"
+" page.\n"
+"        All other featured media entries will remain as features, but "
+"will be\n"
 "        pushed further down the page.<br /><br />\n"
 "\n"
-"        If you go to the media homepage of a piece of media that is currently\n"
-"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
-"        where previously there was the button which said \"Feature\". Click\n"
-"        Unfeature and that media entry will no longer be displayed on the\n"
-"        front page, although you can feature it again at any point. Promote\n"
+"        If you go to the media homepage of a piece of media that is "
+"currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and"
+" \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". "
+"Click\n"
+"        Unfeature and that media entry will no longer be displayed on the"
+"\n"
+"        front page, although you can feature it again at any point. "
+"Promote\n"
 "        moves the featured media higher up on the page and makes it more\n"
-"        prominent and Demote moves the featured media lower down and makes it\n"
+"        prominent and Demote moves the featured media lower down and "
+"makes it\n"
 "        less prominent.\n"
 "    "
 msgstr ""
@@ -708,13 +728,19 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
 msgid ""
 "\n"
-"      These categories just describe how prominent a feature will be on your\n"
-"      front page. Primary Features are placed at the top of the front page and are\n"
-"      much larger. Next are Secondary Features, which are slightly smaller.\n"
-"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"      These categories just describe how prominent a feature will be on "
+"your\n"
+"      front page. Primary Features are placed at the top of the front "
+"page and are\n"
+"      much larger. Next are Secondary Features, which are slightly "
+"smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br "
+"/><br />\n"
 "\n"
-"      Primary Features also can display longer descriptions than Secondary\n"
-"      Features, and Secondary Features can display longer descriptions than\n"
+"      Primary Features also can display longer descriptions than "
+"Secondary\n"
+"      Features, and Secondary Features can display longer descriptions "
+"than\n"
 "      Tertiary Features."
 msgstr ""
 
@@ -727,12 +753,18 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
 msgid ""
 "\n"
-"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
-"      portion of its description will be displayed on your website's front page.\n"
-"      The number of characters displayed varies on the prominence of the feature.\n"
-"      Primary Features display the first 512 characters of their description,\n"
-"      Secondary Features display the first 256 characters of their description,\n"
-"      and Tertiary Features display the first 128 characters of their description.\n"
+"      When a media entry is featured, the entry's title, it's thumbnail "
+"and a\n"
+"      portion of its description will be displayed on your website's "
+"front page.\n"
+"      The number of characters displayed varies on the prominence of the "
+"feature.\n"
+"      Primary Features display the first 512 characters of their "
+"description,\n"
+"      Secondary Features display the first 256 characters of their "
+"description,\n"
+"      and Tertiary Features display the first 128 characters of their "
+"description.\n"
 "    "
 msgstr ""
 
@@ -743,7 +775,8 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
 msgid ""
 "\n"
-"      Unfeature a media by removing its line from the above textarea and then\n"
+"      Unfeature a media by removing its line from the above textarea and "
+"then\n"
 "      pressing the Submit Query button.\n"
 "    "
 msgstr ""
@@ -755,9 +788,12 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
 msgid ""
 "\n"
-"      When copying and pasting urls into the above text box, be aware that if\n"
-"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
-"      featured. Make sure that all your intended Media Entries are featured.\n"
+"      When copying and pasting urls into the above text box, be aware "
+"that if\n"
+"      you make a typo, once you press Submit Query, your media entry will"
+" NOT be\n"
+"      featured. Make sure that all your intended Media Entries are "
+"featured.\n"
 "    "
 msgstr ""
 
@@ -813,7 +849,8 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
 msgid ""
 "If you would like to feature a\n"
-"        piece of media, go to that media entry's homepage and click the button\n"
+"        piece of media, go to that media entry's homepage and click the "
+"button\n"
 "        that says <a class=\"button_action\">Feature</a>."
 msgstr ""
 
@@ -821,10 +858,14 @@ msgstr ""
 #, python-format
 msgid ""
 "You're seeing this page because you are a user capable of\n"
-"        featuring media, a regular user would see a blank page, so be sure to\n"
-"        have media featured as long as your instance has the 'archivalook'\n"
-"        plugin enabled. A more advanced tool to manage features can be found\n"
-"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+"        featuring media, a regular user would see a blank page, so be "
+"sure to\n"
+"        have media featured as long as your instance has the "
+"'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be "
+"found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management "
+"panel.</a>"
 msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
@@ -893,8 +934,8 @@ msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:54
 msgid ""
-"If that email address (case sensitive!) is registered an email has been sent"
-" with instructions on how to change your password."
+"If that email address (case sensitive!) is registered an email has been "
+"sent with instructions on how to change your password."
 msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:65
@@ -902,14 +943,13 @@ msgid "Couldn't find someone with that username."
 msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:68
-msgid ""
-"An email has been sent with instructions on how to change your password."
+msgid "An email has been sent with instructions on how to change your password."
 msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:75
 msgid ""
-"Could not send password recovery email as your username is inactive or your "
-"account's email address has not been verified."
+"Could not send password recovery email as your username is inactive or "
+"your account's email address has not been verified."
 msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:123
@@ -1025,10 +1065,14 @@ msgstr ""
 #: mediagoblin/plugins/oauth/forms.py:45
 msgid ""
 "<strong>Confidential</strong> - The client can\n"
-"                make requests to the GNU MediaGoblin instance that can not be\n"
-"                intercepted by the user agent (e.g. server-side client).<br />\n"
-"                <strong>Public</strong> - The client can't make confidential\n"
-"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                make requests to the GNU MediaGoblin instance that can "
+"not be\n"
+"                intercepted by the user agent (e.g. server-side "
+"client).<br />\n"
+"                <strong>Public</strong> - The client can't make "
+"confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-"
+"side\n"
 "                JavaScript client)."
 msgstr ""
 
@@ -1162,8 +1206,8 @@ msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:144
 msgid ""
-"You can't delete your only Persona email address unless you have a password "
-"set."
+"You can't delete your only Persona email address unless you have a "
+"password set."
 msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:149
@@ -1171,8 +1215,7 @@ msgid "That Persona email address is not registered to this account."
 msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:176
-msgid ""
-"Sorry, an account is already registered with that Persona email address."
+msgid "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:192
@@ -1222,7 +1265,8 @@ msgstr ""
 #: mediagoblin/submit/forms.py:41
 msgid ""
 "You can use\n"
-"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                        Markdown</a> for formatting."
 msgstr ""
 
@@ -1383,15 +1427,16 @@ msgstr ""
 #, python-format
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org/\" title='Version "
-"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> "
+"project."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
 #, python-format
 msgid ""
 "Released under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
-"href=\"%(source_link)s\">Source code</a> available."
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a"
+" href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
@@ -1408,14 +1453,14 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
 msgid ""
-"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
-"extraordinarily great piece of media hosting software."
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, "
+"an extraordinarily great piece of media hosting software."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
 msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
+"To add your own media, place comments, and more, you can log in with your"
+" MediaGoblin account."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
@@ -1432,7 +1477,9 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
 msgid ""
 "\n"
-"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+"            <a class=\"button_action\" "
+"href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your "
+"own server</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -1537,12 +1584,14 @@ msgstr ""
 msgid ""
 "Hi,\n"
 "\n"
-"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"We wanted to verify that you are %(username)s. If this is the case, then"
+" \n"
 "please follow the link below to verify your new email address.\n"
 "\n"
 "%(verification_url)s\n"
 "\n"
-"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"If you are not %(username)s or didn't request an email change, you can "
+"ignore\n"
 "this email."
 msgstr ""
 
@@ -1682,8 +1731,7 @@ msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
-msgid ""
-"Here you can track the state of media being processed on this instance."
+msgid "Here you can track the state of media being processed on this instance."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
@@ -2033,7 +2081,8 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
 msgid ""
 "\n"
-"    Here you can look up users in order to take punitive actions on them.\n"
+"    Here you can look up users in order to take punitive actions on them."
+"\n"
 "  "
 msgstr ""
 
@@ -2130,7 +2179,8 @@ msgstr ""
 #, python-format
 msgid ""
 "Hi %(username)s,\n"
-"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at "
+"%(instance_name)s\n"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
@@ -2174,8 +2224,7 @@ msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
-msgid ""
-"You can track the state of media being processed for your gallery here."
+msgid "You can track the state of media being processed for your gallery here."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
@@ -2233,8 +2282,7 @@ msgid "Almost done! Your account still needs to be activated."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
-msgid ""
-"An email should arrive in a few moments with instructions on how to do so."
+msgid "An email should arrive in a few moments with instructions on how to do so."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
@@ -2247,15 +2295,15 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
 msgid ""
-"Someone has registered an account with this username, but it still has to be"
-" activated."
+"Someone has registered an account with this username, but it still has to"
+" be activated."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
 #, python-format
 msgid ""
-"If you are that person but you've lost your verification email, you can <a "
-"href=\"%(login_url)s\">log in</a> and resend it."
+"If you are that person but you've lost your verification email, you can "
+"<a href=\"%(login_url)s\">log in</a> and resend it."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
@@ -2326,38 +2374,38 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:39
 msgid "Oops!"
 msgstr ""
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:40
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:54
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:56
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:64
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:65
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:73
 msgid ""
-"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
-" the address is correct, maybe the page you're looking for has been moved or"
-" deleted."
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're "
+"sure the address is correct, maybe the page you're looking for has been "
+"moved or deleted."
 msgstr ""
 
 #: mediagoblin/tools/timesince.py:62
@@ -2390,7 +2438,8 @@ msgstr ""
 
 #: mediagoblin/user_pages/forms.py:25
 msgid ""
-"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
 "target=\"_blank\">Markdown</a> for formatting."
 msgstr ""
 
@@ -2413,7 +2462,9 @@ msgstr ""
 #: mediagoblin/user_pages/forms.py:49
 msgid ""
 "You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
@@ -2469,8 +2520,8 @@ msgstr ""
 
 #: mediagoblin/user_pages/views.py:421
 msgid ""
-"You are about to delete an item from another user's collection. Proceed with"
-" caution."
+"You are about to delete an item from another user's collection. Proceed "
+"with caution."
 msgstr ""
 
 #: mediagoblin/user_pages/views.py:453
@@ -2480,10 +2531,10 @@ msgstr ""
 
 #: mediagoblin/user_pages/views.py:460
 msgid ""
-"The collection was not deleted because you didn't check that you were sure."
+"The collection was not deleted because you didn't check that you were "
+"sure."
 msgstr ""
 
 #: mediagoblin/user_pages/views.py:468
-msgid ""
-"You are about to delete another user's collection. Proceed with caution."
+msgid "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/el/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/el/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index abd90e26..00000000
--- a/mediagoblin/i18n/el/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/el/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/el/mediagoblin.po
index 04aa263e..a0dffcae 100644
--- a/mediagoblin/i18n/el/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/el/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/mediagoblin/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -19,67 +19,167 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Συγγνώμη, η εγγ�αφή έχει απαγο�ευτεί σ' αυτό το instance (ό,τι κι αν σημαίνει αυτό εν π�οκειμένω)"
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Συγγνώμη, υπά�χει ήδη χ�ήστης/χ�ήστ�ια μ' αυτό το όνομα."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Συγγνώμη, ένας χ�ήστης μ' αυτήν τη διε�θυνση υπά�χει ήδη."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Η διε�θυνσή σας έχει επιβεβαιωθεί. Μπο�είτε τώ�α να εισέλθετε, να επεξε�γαστείτε το π�οφίλ σας, και να υποβάλλετε εικόνες!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Το κλειδί επιβεβαίωσης ή η ταυτότητα χ�ήστη είναι εσφαλμένα."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Π�έπει να έχετε εισέλθει ώστε να ξέ�ουμε σε ποιον να στείλουμε την ηλ. επιστολή!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Έχετε ήδη επιβεβαιώσει τη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου σας!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Η ηλεκτ�ονική επιστολή επιβεβαίωσης επανεστάλη."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -95,7 +195,7 @@ msgid "Description of this work"
 msgstr "Πε�ιγ�αφή αυτο� του έ�γου"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -111,11 +211,11 @@ msgstr "Ετικέτες"
 msgid "Separate tags by commas."
 msgstr "Διαχω�ίστε τις ετικέτες με κόμματα."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Α�άδα"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Η α�άδα δεν μπο�εί να είναι κενή"
 
@@ -143,125 +243,137 @@ msgstr "Ιστοσελίδα"
 msgid "This address contains errors"
 msgstr "Αυτή η διε�θυνση πε�ιέχει σφάλματα"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Αποστείλετε ηλ. επιστολή όταν άλλοι σχολιάσουν τα πολυμέσα μου"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Ο τίτλος δεν μπο�εί να είναι κενός."
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Πε�ιγ�αφή αυτής της συλλογής"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Το τμήμα τίτλου της διε�θυνσης αυτής της συλλογής. Αυτό συνήθως δε χ�ειάζεται να το αλλάξετε."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Παλιός κωδικός"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Εισαγάγετε τον παλιό σας κωδικό για ν' αποδείξετε πως σας ανήκει αυτός ο λογα�ιασμός."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "�έος κωδικός"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Κωδικός"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Υπά�χει ήδη λήμμα μ' αυτήν την α�άδα γι' αυτόν το χ�ήστη/αυτήν τη χ�ήστ�ια."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Επεξε�γάζεστε τα πολυμέσα ενός άλλου χ�ήστη. Π�οχω�ήσετε με π�οσοχή."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr ""
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Επεξε�γάζεστε το π�οφίλ ενός χ�ήστη. Π�οχω�ήσετε με π�οσοχή."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Αλλαγές π�οφίλ αποθηκε�τηκαν."
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Αλλαγές λογα�ιασμο� αποθηκε�τηκαν."
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Μια συλλογή μ' αυτήν την α�άδα υπά�χει ήδη γι' αυτόν το χ�ήστη."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Επεξε�γάζεστε τη συλλογή ενός άλλου χ�ήστη. Π�οχω�ήσετε με π�οσοχή."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "�έος κωδικός"
 
@@ -292,7 +404,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -300,58 +412,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -377,28 +489,28 @@ msgstr "Πε�ιγ�αφή"
 msgid "I am sure I want to delete this"
 msgstr "Είμαι σίγου�ος/η ότι θέλω να το διαγ�άψω"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Γιο�πι! Πα�ασχέθηκε!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Τα πολυμέσα δε διεγ�άφησαν διότι δεν επιβεβαιώσατε την ανάλογη επιλογή."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -418,7 +530,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Επεξε�γασία"
 
@@ -428,7 +540,7 @@ msgstr "Επεξε�γασία"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Διαγ�αφή"
 
@@ -555,46 +667,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -612,26 +724,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -976,11 +1088,7 @@ msgstr "Αποστολή οδηγιών"
 msgid "Forgot your password?"
 msgstr "Ξεχάσατε τον κωδικό σας;"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Τοποθεσία"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Δείτε το στο <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1047,7 +1155,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1060,8 +1168,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1069,39 +1177,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1125,7 +1233,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1157,26 +1265,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1200,15 +1308,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Εσφαλμένο α�χείο για το δεδομένο τ�πο πολυμέσων."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1227,11 +1335,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Π�έπει να πα�άσχετε ένα α�χείο."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr ""
@@ -1254,26 +1362,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Επιβεβαιώστε τη διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου σας!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Αλλαγή �υθμίσεων λογα�ιασμο�"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1281,29 +1389,29 @@ msgstr "Αλλαγή �υθμίσεων λογα�ιασμο�"
 msgid "Media processing panel"
 msgstr "Πλαίσιο επεξε�γασίας πολυμέσων"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Π�οσθήκη πολυμέσων"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1357,7 +1465,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1448,13 +1556,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Συνημμένα"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Π�οσθήκη συνημμένου"
 
@@ -1472,6 +1580,47 @@ msgstr "Αποθήκευση αλλαγών"
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1497,7 +1646,7 @@ msgstr "Αλλαγή �υθμίσεων λογα�ιασμο� του χ�ήστ
 msgid "Delete my account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1551,19 +1700,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1576,38 +1712,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Πολυμέσα επιγεγ�αμμένα με: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Καταφό�τωση"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Αυθεντικό"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Συγγνώμη, αυτό το α�χείο ήχου δε θα δουλέψει επειδή\n⇥ο πε�ιηγητής σας δεν υποστη�ίζει HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Μπο�είτε να β�είτε έναν σ�γχ�ονο πε�ιηγητή\n⇥που να μπο�εί να το αναπα�αγάγει\n⇥στο <a href=\"http://getfirefox.com\">http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Αυθεντικό α�χείο"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1615,70 +1751,70 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Εικόνα για %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1763,7 +1899,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2069,17 +2205,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Π�οσθήκη σχολίου"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Π�οσθήκη αυτο� του σχολίου"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr ""
 
@@ -2151,12 +2287,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Τα πολυμέσα του/της <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2315,6 +2451,10 @@ msgstr "νεώτε�α"
 msgid "older"
 msgstr "παλιότε�α"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Τοποθεσία"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2323,38 +2463,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "Επιγεγ�αμμένο με"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Το α�χείο εικόνας δεν μπό�εσε ν' αναγνωστεί."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Ουπς!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2422,69 +2562,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Ουπς, το σχόλιό σας ήταν κενό."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Το σχόλιό σας ανα�τήθηκε!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Έχετε διαγ�άψει αυτά τα πολυμέσα."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Π�όκειται να διαγ�άψετε τα πολυμέσα ενός άλλου χ�ήστη. Π�οχω�ήσετε με π�οσοχή."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 68ce5572..00000000
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/mediagoblin.po
index 72c5b836..7d8fe393 100644
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/eo/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/mediagoblin/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -22,67 +22,167 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Bedaŭrinde, registrado estas malaktivigita en tiu ĉi instalaĵo."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Nevalida ensalutnomo aŭ retpo�tadreso."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Ĉi tiu kampo ne akceptas retpo�tadresojn."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Ĉi tiu kampo postulas retpo�tadreson."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "BedaÅ­rinde, uzanto kun tiu nomo jam ekzistas."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Ni bedaŭras, sed konto kun tiu retpo�tadreso jam ekzistas."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Via retpo�tadreso estas konfirmita. Vi povas nun ensaluti, redakti vian profilon, kaj al�uti bildojn!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "La kontrol-kodo aÅ­ la uzantonomo ne estas korekta"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Vi devas esti ensalutita, por ke ni sciu, al kiu sendi la retleteron!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Vi jam konfirmis vian retpo�tadreson!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Resendi vian kontrol-mesa�on."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -98,7 +198,7 @@ msgid "Description of this work"
 msgstr "Priskribo de ĉi tiu verko"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -114,11 +214,11 @@ msgstr "Etikedoj"
 msgid "Separate tags by commas."
 msgstr "Dividu la etikedojn per komoj."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "La distingiga adresparto"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "La distingiga adresparto ne povas esti malplena"
 
@@ -146,125 +246,137 @@ msgstr "Retejo"
 msgid "This address contains errors"
 msgstr "Ĉi tiu adreso enhavas erarojn"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Retpo�tu min kiam aliaj komentas pri miaj al�utaĵoj."
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Permesila prefero"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Tiu ĉi permesilo estos antaŭelektita en la al�utformularoj."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "La titolo ne povas malpleni."
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Priskribo de la kolekto"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "La distingiga adresparto de ĉi tiu kolekto.  Ordinare ne necesas �in �an�i."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "La malnova pasvorto"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Enigu vian malnovan pasvorton por pruvi, ke ĉi tiu konto estas via."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "La nova pasvorto"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Pasvorto"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Ĉi tiu uzanto jam havas dosieron kun tiu distingiga adresparto."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Vi aldonis la kundosieron %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Vi povas redakti nur vian propran profilon."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Profil�an�oj estis konservitaj"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Kontagordoj estis konservitaj"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Vi bezonas konfirmi la forigon de via konto."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Vi jam havas kolekton kun la nomo «%s»!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Ĉi tiu uzanto jam havas kolekton kun tiu distingiga adresparto."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Vi redaktas kolekton de alia uzanto.  Agu singardeme."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Mal�usta pasvorto"
 
@@ -295,7 +407,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -303,58 +415,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -380,28 +492,28 @@ msgstr "Priskribo"
 msgid "I am sure I want to delete this"
 msgstr "Jes, mi volas forigi ĉi tion."
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Hura! Al�utitas!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "La dosiero ne estis forigita, ĉar vi ne konfirmis vian certecon per la markilo."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -421,7 +533,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Ŝan�i"
 
@@ -431,7 +543,7 @@ msgstr "Ŝan�i"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Forigi"
 
@@ -558,46 +670,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -615,26 +727,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -979,11 +1091,7 @@ msgstr "Sendi instrukcion"
 msgid "Forgot your password?"
 msgstr "Ĉu vi forgesis vian pasvorton?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Loko"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Vidi sur <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1050,7 +1158,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1063,8 +1171,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1072,39 +1180,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1128,7 +1236,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1160,26 +1268,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1203,15 +1311,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "La provizita dosiero ne konformas al la informtipo."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1230,11 +1338,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Vi devas provizi dosieron."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Kolekto «%s» aldonitas!"
@@ -1257,26 +1365,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Konfirmu viecon de la retpo�tadreso!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "elsaluti"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Konto de <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Ŝan�i kontagordojn"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1284,29 +1392,29 @@ msgstr "Ŝan�i kontagordojn"
 msgid "Media processing panel"
 msgstr "Kontrolejo pri dosierpreparado."
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Elsaluti"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Aldoni dosieron"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Krei novan kolekton"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1360,7 +1468,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1451,13 +1559,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Aldoni kundosierojn por %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Kundosieroj"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Aldoni kundosieron"
 
@@ -1475,6 +1583,47 @@ msgstr "Konservi �an�ojn"
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "antaÅ­ %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1500,7 +1649,7 @@ msgstr "Ŝan�ado de kontagordoj de %(username)s"
 msgid "Delete my account"
 msgstr "Forigi mian konton."
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1554,19 +1703,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "antaÅ­ %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1579,38 +1715,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Dosieroj kun etikedo: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "El�uti"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Originalo"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Bedaŭrinde, ĉi tiu sonregistraĵo ne ludi�os, \n\tĉar via TTT-legilo ne povas ludi\n\tsonaĵojn, afi�itajn laŭ HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Vi povas akiri modernan TTT-legilon, kapablan \n\tsonigi la registraĵon ĉe <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "originalan dosieron"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebMan dosieron (kun Vorbisa kodaĵo)"
 
@@ -1618,70 +1754,70 @@ msgstr "WebMan dosieron (kun Vorbisa kodaĵo)"
 msgid "Created"
 msgstr "Kreita"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Bildo de «%(media_title)s»"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF-dosiero"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "DeantaÅ­e"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Desupre"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Deflanke"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "El�uti la modelon"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Informaran�o"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Alto de la objekto"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Bedaŭrinde, ĉi tiu filmo ne montri�os\n  ĉar via TTT-legilo ne subtenas sufiĉe\n  filmojn laŭ HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Vi povas el�uti modernan TTT-legilon, kapablan \n      montri la filmon, de <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1766,7 +1902,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2072,17 +2208,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Aldoni komenton"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Aldoni ĉi tiun komenton"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Aldonita"
 
@@ -2154,12 +2290,12 @@ msgstr "Dosieroj de <a href=\"%(user_url)s\">%(username)s</a> kun la etikedo <a
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Dosieroj de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Про�мотр файлов пользовател� <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2318,6 +2454,10 @@ msgstr "pli nova"
 msgid "older"
 msgstr "malpli nova"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Loko"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2326,38 +2466,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "Markita per"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Malsukcesis lego de la bildodosiero"
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Oj!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Okazis eraro"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2425,69 +2565,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Ve, komentado estas malebligita."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Oj, via komento estis malplena."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Via komento estis afi�ita!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Bonvolu kontroli vian enigitaĵon kaj reprovi."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Necesas elekti aÅ­ aldoni kolekton"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "«%s» jam estas en la kolekto «%s»"
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "«%s» estis aldonita al la kolekto «%s»"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Vi forigis la dosieron."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Vi estas forigonta dosieron de alia uzanto. Estu singardema."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Vi forigis la dosieron el la kolekto."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "La dosiero ne estis forigita, ĉar vi ne konfirmis vian certecon per la markilo."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Vi estas forigonta dosieron el kolekto de alia uzanto.  Agu singardeme."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Vi forigis la kolekton «%s»"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "La kolekto ne estis forigita, ĉar vi ne konfirmis vian certecon per la markilo."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Vi estas forigonta kolekton de alia uzanto.  Agu singardeme."
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 00c8cfee..00000000
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/mediagoblin.po
index b192514a..8fd27b62 100644
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/es/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -10,9 +10,10 @@
 # Jacobo Nájera <jacobo@gnu.org>, 2013
 # Javier Di Mauro <javierdimauro@gmail.com>, 2011
 # case <juangsub@gmail.com>, 2011
-# juanman <juanma@kde.org.ar>, 2011, 2012
-# Laura Arjona Reina <larjona99@gmail.com>, 2012
-# Laura Arjona Reina <larjona99@gmail.com>, 2013-2014
+# juanman <juanma@gnutn.org.ar>, 2011, 2012
+# Laura Arjona Reina <larjona@larjona.net>, 2012, 2015.
+# Laura Arjona Reina <larjona@larjona.net>, 2013-2014, 2015.
+# Laura Arjona Reina <larjona@larjona.net>, 2014, 2015.
 # Mario Rodriguez <msrodriguez00@gmail.com>, 2011
 # Manuel Urbano Santos <mu@member.fsf.org>, 2011
 # shackra <shackra@riseup.net>, 2012
@@ -21,78 +22,181 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-11 08:55+0000\n"
-"Last-Translator: Laura Arjona Reina <larjona99@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-02-27 21:19+0000\n"
+"Last-Translator: larjona <larjona@larjona.net>\n"
+"Language-Team: Spanish "
+"(http://www.transifex.com/projects/p/mediagoblin/language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"Generated-By: Babel 1.3\n"
+"X-POOTLE-MTIME: 1425071985.0\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Lo sentimos, el registro está deshabilitado en este momento."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
-msgstr "Lo siento, el envío de informes está deshabilitado en esta instancia."
+msgstr "Lo sentimos, el envío de informes está deshabilitado en esta instancia."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
-msgstr "Lo siento, la autenticación está deshabilitada en esta instancia."
+msgstr "Lo sentimos, la autenticación está deshabilitada en esta instancia."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
-msgstr "Nombre de usuario o correo electrónico inválido."
+msgstr "Nombre de usuario o correo electrónico no válidos."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Este campo no acepta direcciones de correo."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Este campo requiere una dirección de correo."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Lo sentimos, ya existe un usuario con ese nombre."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Lo sentimos, ya existe un usuario con esa dirección de correo."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "La clave de verificación o el identificador de usuario son incorrectos."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Tu dirección de correo electrónico ha sido verificada. ¡Ahora puedes iniciar sesión, editar tu perfil, y enviar imágenes!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "La clave de verificación o la identificación de usuario son incorrectas"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "¡Debes iniciar sesión para que podamos saber a quién le enviamos el correo electrónico!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "¡Ya has verificado tu dirección de correo!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Se reenvió tu correo electrónico de verificación."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr "{username} agregó {object}"
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr "{username} agregó {object} a {target}"
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr "{username} tomó la autoría de {object}"
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr "{username} creó {object}"
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr "{username} eliminó {object}"
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr "A {username} no le gustó {object}"
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr "{username} marcó como favorito {object}"
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr "{username} siguió {object}"
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr "A {username} le gustó {object}"
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr "{username} publicó {object}"
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr "{username} publicó {object} en {target}"
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr "{username} compartió {object}"
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr "{username} quitó de favoritos {object}"
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr "{username} dejó de seguir a {object}"
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr "A {username} le dejó de gustar {object}"
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr "{username} dejó de compartir {object}"
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr "{username} actualizó {object}"
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr "{username} etiquetó {object}"
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr "una imagen"
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr "un comentario"
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr "una colección"
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr "un vídeo"
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr "sonido"
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr "una persona"
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr "un objeto"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -108,7 +212,7 @@ msgid "Description of this work"
 msgstr "Descripción de esta obra"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -124,11 +228,11 @@ msgstr "Etiquetas"
 msgid "Separate tags by commas."
 msgstr "Separa las etiquetas por comas."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Ficha"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "La ficha no puede estar vacía"
 
@@ -156,125 +260,137 @@ msgstr "Sitio web"
 msgid "This address contains errors"
 msgstr "La dirección contiene errores"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr "Lugar de origen"
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Envíame un correo cuando otros escriban comentarios sobre mi contenido"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Habilitar dentro del sitio notificaciones sobre eventos."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Preferencias de licencia"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Ésta será tu licencia predeterminada en los formularios de subida."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "El título no puede estar vacío"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Descripción de esta colección"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "El título de la dirección de esta colección. Generalmente no necesitas cambiar esto."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Contraseña antigua"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Escribe la contraseña antigua para demostrar que esta cuenta te pertenece."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Nueva dirección de correo electrónico"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Contraseña"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Introduce tu contraseña para probar que posees la cuenta."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr "Identificador"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr "Valor"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Una entrada con esa ficha ya existe para este usuario."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Estás editando el contenido de otro usuario. Procede con precaución."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "¡Has añadido el adjunto %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Sólo puedes editar tu propio perfil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Estás editando un perfil de usuario. Procede con precaución."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
-msgstr "Los cambios de perfil fueron salvados"
+msgstr "Se grabaron los cambios del perfil"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
-msgstr "las configuraciones de cuenta fueron salvadas"
+msgstr "Se grabó la configuración de la cuenta"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr "Aplicación desconocida, no se puede desautorizar"
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr "Se ha desautorizado la aplicación"
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Necesitas confirmar el borrado de tu cuenta."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "¡Ya tienes una colección llamada \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Una colección con esa ficha ya existe para este usuario/a."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Estás editando la colección de otro usuario. Procede con precaución."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Tu dirección de correo electrónico ha sido verificada."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
@@ -284,7 +400,7 @@ msgstr "No se puede enlazar al tema... no hay un tema seleccionado\n"
 
 #: mediagoblin/gmg_commands/assetlink.py:73
 msgid "No asset directory for this theme\n"
-msgstr "No hay directorio activo para este tema\n\n\n"
+msgstr "No hay directorio activo para este tema\n"
 
 #: mediagoblin/gmg_commands/assetlink.py:76
 msgid "However, old link directory symlink found; removed.\n"
@@ -305,7 +421,7 @@ msgstr "Omitiendo \"%s\"; ya está establecido.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Se encontró un enlace antiguo para \"%s\"; se eliminará.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -313,58 +429,62 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr "Para más información sobre cómo ejecutar este\nguión (y como dar formato al fichero csv de metadatos), lea la página\nde documentación de Mediagoblin sobre carga de ficheros desde línea de comandos\n<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr "Nombre del usuario al que pertenecen estos contenidos"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr "Ruta al archivo csv que contiene la información sobre metadatos."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr "No procesar inmediatamente, pasarlo a celery"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
-msgstr "Lo siento, no existe un usuario con nombre '{username}'"
+msgstr "Lo sentimos, no existe un usuario con nombre '{username}'"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr "No se ha encontrado el archivo en {path}, use la opción -h para ayuda"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr "Error con el contenido '{media_id}' valor '{error_path}': {error_msg}\nNo se han cargado los metadatos."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr "ERROR: No se ha podido acceder al fichero local {filename}.\nNo se cargará {filename}."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
-msgstr "¡Enviado con éxito {filename}!\nAsegúrate de mirar en el panel de procesamiento de contenido del sitio web para comprobar que se ha cargado bien."
+msgstr ""
+"¡Enviado con éxito {filename}!\n"
+"Asegúrate de mirar en el panel de procesamiento de contenido del sitio web "
+"para comprobar\n"
+" que se ha cargado bien."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr "ERROR: Este archivo supera los límites de carga de este sitio."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr "ERROR: Este archivo hace que el usuario supere su límite de carga."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr "ERROR: Este usuario ya ha sobrepasado su límite de carga."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr "{files_uploaded} de {files_attempted} archivos enviados correctamente"
 
@@ -373,12 +493,15 @@ msgid ""
 "CSRF cookie not present. This is most likely the result of a cookie blocker "
 "or somesuch.<br/>Make sure to permit the settings of cookies for this "
 "domain."
-msgstr "No se encuentra la cookie CSRF. Esto suele ser debido a un bloqueador de cookies o similar.<br/> Por favor asegúrate de permitir las cookies para este dominio."
+msgstr ""
+"No se encuentra la cookie CSRF. Esto suele ser debido a un bloqueador de "
+"cookies o similar.<br/>Por favor asegúrate de permitir las cookies para este "
+"dominio."
 
 #: mediagoblin/media_types/__init__.py:79
 #: mediagoblin/media_types/__init__.py:101
 msgid "Sorry, I don't support that file type :("
-msgstr "Lo sentidos, No soportamos ese tipo de archivo :("
+msgstr "Lo sentimos, no soportamos ese tipo de archivo :("
 
 #: mediagoblin/media_types/blog/forms.py:26
 #: mediagoblin/media_types/blog/forms.py:35
@@ -390,28 +513,28 @@ msgstr "Descripción"
 msgid "I am sure I want to delete this"
 msgstr "Estoy seguro de que quiero borrar esto"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "¡Yuju! ¡Enviado!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr "¡Yuju! se ha enviado el artículo de blog editado"
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr "Has borrado el Blog."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "El contenido no se eliminó porque no marcaste que estabas seguro."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr "Vas a borrar el Blog de otro usuario. Procede con precaución."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr "El blog no se ha borrado porque no tienes permisos."
 
@@ -431,7 +554,7 @@ msgstr "Borrar blog"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Editar"
 
@@ -441,7 +564,7 @@ msgstr "Editar"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Borrar"
 
@@ -451,7 +574,7 @@ msgstr "<em> Ir a la vista de lista </em>"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
 msgid " No blog post yet. "
-msgstr "No hay artículos de blog."
+msgstr " No hay artículos de blog. "
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -514,7 +637,7 @@ msgstr "Crear un blog"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
 msgid " Blog Dashboard "
-msgstr "Escritorio del blog"
+msgstr " Escritorio del blog "
 
 #: mediagoblin/media_types/pdf/processing.py:142
 msgid "unoconv failing to run, check log file"
@@ -568,46 +691,48 @@ msgstr "Mensaje al usuario:"
 msgid "Resolution content:"
 msgstr "Contenido de la resolución:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
-msgstr "\n{mod} retiró al usuario {user} los permisos de: {privilege}."
+msgstr ""
+"\n"
+"{mod} retiró al usuario {user} los permisos de {privilege}."
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr "\n{mod} inhabilitó al usuario {user} hasta {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr "hasta {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "indefinidamente"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr "\n{mod} envió un correo de advertencia al {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr "\n{mod} eliminó el comentario."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr "\n{mod} borró el contenido."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Advertencia de"
 
@@ -625,28 +750,28 @@ msgstr "¡Suscrito a comentarios sobre %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "No recibirás notificaciones de comentarios sobre %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Se debe proporcionar un código (token) de OAuth."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "No se ha encontrado el código (token) de petición."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
-msgstr "Lo siento, el archivo es demasiado grande."
+msgstr "Lo sentimos, el archivo es demasiado grande."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
-msgstr "Lo siento, subir este archivo sobrepasaría tu límite de subida."
+msgstr "Lo sentimos, subir este archivo sobrepasaría tu límite de subida."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
-msgstr "Lo siento, has alcanzado tu límite de subida."
+msgstr "Lo sentimos, has alcanzado tu límite de subida."
 
 #: mediagoblin/plugins/archivalook/forms.py:21
 msgid "Enter the URL for the media to be featured"
@@ -713,11 +838,57 @@ msgid ""
 "        prominent and Demote moves the featured media lower down and makes it\n"
 "        less prominent.\n"
 "    "
-msgstr "\nSí. Si lo prefieres, puedes ir a la página del contenido que te gustaría destacar\no quitar de destacados, y mirar en la barra lateral junto al contenido. Si el contenido\naún no se ha destacado, debería haber un botón que ponga \"Destacar\". Pulsa ese botón\ny el contenido se destacará como primario, al inicio de la portada.\nTodos los demás contenidos destacados seguirán destacados, pero se mostrarán debajo\nen la página de portada.<br /><br />\n\nSi vas a la página de un contenido que actualmente ya está destacado, verás las opciones\n\"Quitar de destacados\", \"Ascender\" y \"Descender\" donde antes se mostraba \"Destacar\".\nHaz clic en Quitar de destacados y ese contenido ya no se mostrará en la portada,\naunque puedes volver a destacarlo en cualquier momento. Ascender mueve el contenido destacado más arriba en la portada y lo hace más prominente, y Descender mueve el contenido más abajo y lo hace menos prominente."
+msgstr ""
+"\n"
+"      Sí. Si lo prefieres, puedes ir a la página del contenido que te "
+"gustaría destacar\n"
+"      o quitar de destacados, y mirar en la barra lateral junto al "
+"contenido. Si el contenido\n"
+"      aún no se ha destacado, debería haber un botón que ponga \"Destacar\". "
+"Pulsa ese botón\n"
+"      y el contenido se destacará como primario, al inicio de la portada.\n"
+"      Todos los demás contenidos destacados seguirán destacados, pero se "
+"mostrarán debajo\n"
+"en la página de portada.<br /><br />\n"
+"\n"
+"      Si vas a la página de un contenido que actualmente ya está destacado, "
+"verás las opciones\n"
+"      \"Quitar de destacados\", \"Ascender\" y \"Descender\"\n"
+"       donde antes se mostraba \"Destacar\".\n"
+"      Haz clic\n"
+"      en Quitar de destacados y ese contenido ya no se mostrará en la "
+"portada,\n"
+"      aunque puedes volver a destacarlo en cualquier momento. Ascender\n"
+"      mueve el contenido destacado más arriba en la portada y lo hace más\n"
+"    prominente, y Descender mueve el contenido más abajo y lo hace\n"
+"          menos prominente.\n"
+"    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
 msgid "What is a Primary Feature? What is a Secondary Feature?"
-msgstr "¿Qué es un contenido destacado primario? ¿Qué es un contenido destacado secundario?"
+msgstr ""
+"\n"
+"        Sí. Si lo prefieres, puedes ir a la página del contenido\n"
+"        que te gustaría destacar o quitar de destacados, y mirar en la barra "
+"lateral\n"
+"        junto al contenido. Si el contenido aún no se ha destacado,\n"
+"         debería haber un botón que ponga \"Destacar\". Pulsa ese botón\n"
+"        y el contenido se destacará como primario, al inicio de la portada.\n"
+"        Todos los demás contenidos destacados seguirán destacados, pero se "
+"mostrarán debajo\n"
+"        en la página de portada.<br /><br />\n"
+"\n"
+"        Si vas a la página de un contenido que actualmente ya está\n"
+"        destacado, verás las opciones \"Quitar de destacados\", \"Ascender\" y "
+"\"Descender\"\n"
+"        donde antes se mostraba \"Destacar\". Haz clic en\n"
+"        Quitar de destacados y ese contenido ya no se mostrará en la "
+"portada,\n"
+"        aunque puedes volver a destacarlo en cualquier momento. Ascender\n"
+"        mueve el contenido destacado más arriba en la portada y lo hace más\n"
+"        prominente, y Descender mueve el contenido más abajo y lo hace\n"
+"        menos prominente.\n"
+"    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
 msgid ""
@@ -730,13 +901,30 @@ msgid ""
 "      Primary Features also can display longer descriptions than Secondary\n"
 "      Features, and Secondary Features can display longer descriptions than\n"
 "      Tertiary Features."
-msgstr "\nEstas categorías describen lo prominente que un contenido destacado será en la portada. Los contenidos destacados primarios se colocan al inicio de la portada y son más grandes. Después van los contenidos destacados secundarios, que son algo más pequeños. Los contenidos destacados terciarios forman una rejilla al final de la página.<br /><br />\n\nLos contenidos destacados primarios también pueden mostrar descripciones más largas que los contenidos destacados secundarios, y los contenidos destacados secundarios pueden mostrar descripciones más largas que los contenidos destacados terciarios."
+msgstr ""
+"\n"
+"      Estas categorías describen lo prominente que un contenido destacado "
+"será en\n"
+"      la portada. Los contenidos destacados primarios se colocan al inicio "
+"de la portada y son\n"
+"      más grandes. Después van los contenidos destacados secundarios, que "
+"son algo más pequeños.\n"
+"      Los contenidos destacados terciarios forman una rejilla al final de la "
+"página.<br /><br />\n"
+"\n"
+"      Los contenidos destacados primarios también pueden mostrar "
+"descripciones más largas que los contenidos destacados secundarios,\n"
+"      y los contenidos destacados secundarios pueden mostrar descripciones "
+"más largas que los contenidos\n"
+"      destacados terciarios."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
 msgid ""
 "How to decide what information is displayed when a media entry is\n"
 "    featured?"
-msgstr "¿Cómo decidir qué información se muestra cuando se destaca un contenido?"
+msgstr ""
+"¿Cómo decidir qué información se muestra cuando se destaca\n"
+"    un contenido?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
 msgid ""
@@ -748,7 +936,19 @@ msgid ""
 "      Secondary Features display the first 256 characters of their description,\n"
 "      and Tertiary Features display the first 128 characters of their description.\n"
 "    "
-msgstr "\nCuando se destaca un contenido, su título, su miniatura y una porción de su descripción se mostrarán en la portada de tu sitio web. El número de caracteres mostrado varía según la prominencia del destacado.\nLos destacados primarios muestran los primeros 512 caracteres de su descripción, \nlos destacados secundarios muestran los primeros 256 caracteres de su descripción, \ny los destacados terciarios muestran los primeros 128 caracteres de su descripción."
+msgstr ""
+"\n"
+"      Cuando se destaca un contenido, su título, su miniatura y una\n"
+"      porción de su descripción se mostrarán en la portada de tu sitio web.\n"
+"      El número de caracteres mostrado varía según la prominencia del "
+"destacado.\n"
+"      Los destacados primarios muestran los primeros 512 caracteres de su "
+"descripción, \n"
+"      los destacados secundarios muestran los primeros 256 caracteres de su "
+"descripción, \n"
+"      y los destacados terciarios muestran los primeros 128 caracteres de su "
+"descripción.\n"
+"      "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
 msgid "How to unfeature a piece of media?"
@@ -760,7 +960,12 @@ msgid ""
 "      Unfeature a media by removing its line from the above textarea and then\n"
 "      pressing the Submit Query button.\n"
 "    "
-msgstr "\n      Deja de destacar un contenido eliminando su línea del área de texto de arriba\n      y pulsando el botón \"Enviar Consulta\".\n    "
+msgstr ""
+"\n"
+"      Deja de destacar un contenido eliminando su línea del área de texto de "
+"arriba\n"
+"      y pulsando el botón Enviar Consulta.\n"
+"    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
 msgid "CAUTION:"
@@ -773,7 +978,14 @@ msgid ""
 "      you make a typo, once you press Submit Query, your media entry will NOT be\n"
 "      featured. Make sure that all your intended Media Entries are featured.\n"
 "    "
-msgstr "\nCuando se copian y pegan URLs en la caja de texto de arriba, ten en cuenta que si hay alguna errata, aunque pulses \"Enviar consulta\", el contenido NO se destacará. Verifica que todos los contenidos que querías destacar se han destacado."
+msgstr ""
+"\n"
+"      Cuando se copian y pegan URLs en la caja de texto de arriba, ten en "
+"cuenta que\n"
+"      si hay alguna errata, aunque pulses Enviar Consulta, el contenido NO\n"
+"      se destacará. Verifica que todos los contenidos que querías destacar "
+"se han destacado.\n"
+"    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
 msgid ""
@@ -839,7 +1051,16 @@ msgid ""
 "        have media featured as long as your instance has the 'archivalook'\n"
 "        plugin enabled. A more advanced tool to manage features can be found\n"
 "        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
-msgstr "Estás viendo esta página porque eres un usuario con permisos para\ndestacar contenido, un usuario normal vería una página en blanco, así que\nasegúrate de destacar contenido mientras tu sitio tenga el complemento\n'archivalook' activado. Se puede encontrar una herramienta más avanzada\npara gestionar los destacados \nen el <a href?\"%(featured_media_url)s\">panel de gestión de destacados</a>."
+msgstr ""
+"Estás viendo esta página porque eres un usuario con permisos para\n"
+"        destacar contenido, un usuario normal vería una página en blanco, "
+"así que\n"
+"        asegúrate de destacar contenido mientras tu sitio tenga el "
+"complemento\n"
+"        'archivalook' activado. Se puede encontrar una herramienta más "
+"avanzada para gestionar los destacados\n"
+"        en el <a href=\"%(featured_media_url)s\">panel de gestión de "
+"destacados.</a>"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
 msgid "View most recent media"
@@ -854,7 +1075,10 @@ msgid ""
 "Sorry, this audio will not work because\n"
 "\tyour web browser does not support HTML5\n"
 "\taudio."
-msgstr "Lo siento, este audio no funcionará porque \n\ttu navegador web no soporta audio en \n\tHTML5."
+msgstr ""
+"Lo sentimos, este audio no funcionará porque \n"
+"\ttu navegador web no soporta audio en \n"
+"\tHTML5."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
 msgid ""
@@ -869,7 +1093,10 @@ msgid ""
 "Sorry, this video will not work because\n"
 "          your web browser does not support HTML5 \n"
 "          video."
-msgstr "Lo siento, este vídeo no funcionará porque\n          tu navegador web no soporta vídeo en \n          HTML5."
+msgstr ""
+"Lo sentimos, este vídeo no funcionará porque\n"
+"          tu navegador web no soporta vídeo en \n"
+"          HTML5."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
@@ -877,7 +1104,10 @@ msgid ""
 "You can get a modern web browser that \n"
 "          can play this video at <a href=\"http://getfirefox.com\">\n"
 "          http://getfirefox.com</a>!"
-msgstr "¡Puedes conseguir un navegador web moderno, que\n\tpueda reproducir el vídeo, en <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+msgstr ""
+"¡Puedes conseguir un navegador web moderno, que\n"
+"          pueda reproducir el vídeo, en <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
 
 #: mediagoblin/plugins/basic_auth/forms.py:24
 #: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
@@ -918,13 +1148,13 @@ msgstr "No se ha podido encontrar a nadie con ese nombre de usuario."
 #: mediagoblin/plugins/basic_auth/views.py:68
 msgid ""
 "An email has been sent with instructions on how to change your password."
-msgstr "Un correo electrónico ha sido enviado con instrucciones sobre cómo cambiar tu contraseña."
+msgstr "Hemos enviado un correo electrónico con instrucciones sobre cómo cambiar tu contraseña."
 
 #: mediagoblin/plugins/basic_auth/views.py:75
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr "No se pudo enviar un correo electrónico de recuperación de contraseñas porque tu nombre de usuario está inactivo o la dirección de su cuenta de correo electrónico no ha sido verificada."
+msgstr "No pudimos enviar un correo electrónico de recuperación de contraseñas porque tu nombre de usuario está inactivo o la dirección de su cuenta de correo electrónico no ha sido verificada."
 
 #: mediagoblin/plugins/basic_auth/views.py:123
 msgid "The user id is incorrect."
@@ -989,11 +1219,7 @@ msgstr "Enviar instrucciones"
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Locación"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Ver en <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1030,7 +1256,9 @@ msgstr "El nombre del cliente OAuth"
 msgid ""
 "This will be visible to users allowing your\n"
 "                application to authenticate as them."
-msgstr "Esto será visible para los usuarios que permitan tu aplicación\n\npara que puedan autenticarse."
+msgstr ""
+"Esto será visible para los usuarios que permitan tu aplicación\n"
+"                para que puedan autenticarse."
 
 #: mediagoblin/plugins/oauth/forms.py:40
 msgid "Type"
@@ -1044,7 +1272,17 @@ msgid ""
 "                <strong>Public</strong> - The client can't make confidential\n"
 "                requests to the GNU MediaGoblin instance (e.g. client-side\n"
 "                JavaScript client)."
-msgstr "<strong>Confidencial</strong> - El cliente puede hacer peticiones a la instancia GNU MediaGoblin que no pueden ser interceptadas por el agente de usuario (ejemplo: un cliente del lado del servidor).<br /><strong>Público</strong> - El cliente no puede hacer peticiones confidenciales a la instancia GNU MediaGoblin (ejemplo: un cliente JavaScript del lado del servidor)."
+msgstr ""
+"<strong>Confidencial</strong> - El cliente puede\n"
+"                 hacer peticiones a la instancia GNU MediaGoblin que no "
+"puedan\n"
+"                 ser interceptadas por el agente de usuario (ejemplo: un "
+"cliente del lado del servidor).<br />\n"
+"                <strong>Público</strong> - El cliente no puede hacer "
+"peticiones\n"
+"                confidenciales a la instancia GNU MediaGoblin (ejemplo: un "
+"cliente\n"
+"                JavaScript del lado del cliente)."
 
 #: mediagoblin/plugins/oauth/forms.py:52
 msgid "Redirect URI"
@@ -1054,13 +1292,15 @@ msgstr "Redireccionar URI"
 msgid ""
 "The redirect URI for the applications, this field\n"
 "            is <strong>required</strong> for public clients."
-msgstr "La URI para redireccionar las aplicaciones, este campo es <strong>requerido</strong> para los clientes públicos."
+msgstr ""
+"La URI para redireccionar las aplicaciones, este campo\n"
+"             es <strong>requerido</strong> para los clientes públicos."
 
 #: mediagoblin/plugins/oauth/forms.py:66
 msgid "This field is required for public clients"
 msgstr "Este campo es requerido para los clientes públicos"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "¡El cliente {0} ha sido registrado!"
 
@@ -1073,48 +1313,50 @@ msgid "Your OAuth clients"
 msgstr "Tus clientes OAuth"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
-msgstr "Lo siento, ya hay registrada una cuenta con esa OpenID."
+msgstr "Lo sentimos, ya hay registrada una cuenta con esa OpenID."
 
 #: mediagoblin/plugins/openid/forms.py:38
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
-msgstr "Lo siento, no se ha encontrado el servidor OpenID"
+msgstr "Lo sentimos, no se ha encontrado el servidor OpenID"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "No se ha encontrado el servicio OpenID para %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Falló la verificación de %s: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Verificación cancelada"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Tu url de OpenID se ha guardado correctamente."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
-msgstr "No puedes borrar tu única url de OpenID a menos que tengas establecida una contraseña"
+msgstr ""
+"No puedes borrar tu única URL de OpenID a menos que tengas establecida una "
+"contraseña"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Esa OpenID no está registrada para esta cuenta."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "Se ha eliminado correctamente la OpenID."
 
@@ -1133,12 +1375,12 @@ msgstr "Eliminar una OpenID"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
 msgid "OpenID's"
-msgstr "OpenID's"
+msgstr "De OpenID"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1168,28 +1410,32 @@ msgstr "¡O regístrate con OpenID!"
 
 #: mediagoblin/plugins/persona/__init__.py:90
 msgid "Sorry, an account is already registered to that Persona email."
-msgstr "Lo siento, ya hay una cuenta registrada para ese correo electrónico de Persona."
+msgstr ""
+"Lo sentimos, ya hay una cuenta registrada para ese correo electrónico de "
+"Persona."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "La dirección de correo electrónico de Persona se ha eliminado correctamente."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "No puedes borrar tu única dirección de correo electrónico de Persona a menos que tengas establecida una contraseña."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Esa dirección de correo electrónico de Persona no está registrada para esta cuenta."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
-msgstr "Lo siento, ya hay una cuenta registrada con esa dirección de correo electrónico de Persona."
+msgstr ""
+"Lo sentimos, ya hay una cuenta registrada con esa dirección de correo "
+"electrónico de Persona."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Se ha guardado correctamente tu dirección de correo electrónico de Persona."
 
@@ -1213,15 +1459,15 @@ msgstr "¡O inicia sesión con Persona!"
 msgid "Or register with Persona!"
 msgstr "¡O regístrate con Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Archivo inválido para el formato seleccionado."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "La copia al almacenamiento público ha fallado."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "No se ha encontrado un fichero de procesamiento aceptable"
 
@@ -1240,11 +1486,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Puedes usar�\n<a href=\"http://daringfireball.net/projects/markdown/basics\">�\nMarkdown</a> para dar formato."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Debes proporcionar un archivo."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "¡Colección \"%s\" añadida!"
@@ -1267,26 +1513,26 @@ msgstr "Has sido inhabilitado"
 msgid "until %(until_when)s"
 msgstr "hasta el %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "¡Verifica tu correo!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "cerrar sesión"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Cuenta de <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Cambiar la configuración de la cuenta"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1294,29 +1540,29 @@ msgstr "Cambiar la configuración de la cuenta"
 msgid "Media processing panel"
 msgstr "Panel de procesamiento de contenido"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Añadir contenido"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Crear nueva colección"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr "Poderes de moderación:"
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Panel de gestión de usuarios"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Panel de gestión de informes"
 
@@ -1335,7 +1581,7 @@ msgstr "Has iniciado sesión como"
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:33
 msgid "Do you want to authorize "
-msgstr "¿Quieres autorizar a"
+msgstr "¿Quieres autorizar a "
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:37
 msgid "an unknown application"
@@ -1343,7 +1589,7 @@ msgstr "una aplicación desconocida"
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:39
 msgid " to access your account? "
-msgstr "para que acceda a tu cuenta?"
+msgstr " para que acceda a tu cuenta? "
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:41
 msgid "Applications with access to your account can: "
@@ -1370,8 +1616,8 @@ msgid "Authorization Complete"
 msgstr "Autorización completa"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Copia y pega esto en tu cliente:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr "Copia y pega este <strong>código de verificación</strong> en tu cliente:"
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1391,7 +1637,13 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr "Hola %(username)s,\n\npara activar tu cuenta de GNU MediaGoblin, abre la siguiente URL en tu navegador:\n\n%(verification_url)s "
+msgstr ""
+"Hola %(username)s,\n"
+"\n"
+"para activar tu cuenta de GNU MediaGoblin, abre la siguiente URL en\n"
+"tu navegador:\n"
+"\n"
+"%(verification_url)s "
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
 #, python-format
@@ -1461,13 +1713,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Editando archivos adjuntos a %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Adjuntos"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Agregar adjunto"
 
@@ -1485,6 +1737,47 @@ msgstr "Guardar cambios"
 msgid "Changing %(username)s's email"
 msgstr "Cambiando el correo electrónico de %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr "Desautorizar aplicaciones"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr "Desautorizar Aplicaciones"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr "Estas aplicaciones pueden acceder a tu cuenta de GNU MediaGoblin. Desautorizando\nla aplicación, se evitará que la aplicación acceda a tu cuenta."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr "No hay aplicaciones autorizadas."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr "Tipo:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr "Autorizada:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "hace %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1510,7 +1803,7 @@ msgstr "Cambio de %(username)s la configuración de la cuenta "
 msgid "Delete my account"
 msgstr "Borrar mi cuenta"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -1564,19 +1857,6 @@ msgstr "Hola,\n\nQueríamos verificar que eres %(username)s. Si ése es el caso,
 msgid "New comments"
 msgstr "Nuevos comentarios"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "hace %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Marcar todo como leído"
@@ -1589,38 +1869,41 @@ msgstr "Marcar todo como leído"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Contenido etiquetado con: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Descargar"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Lo sentimos, este audio audio no funcionará porque \n\ttu navegador web no soporta audio de \n\tHTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+"Lo sentimos, este sonido no funcionará, porque \n"
+"\t  tu navegador web no soporta sonido\n"
+"\t  HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Tú puedes obtener un navegador más moderno que \n\tpueda reproducir el audio <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr "¡Puedes conseguir un navegador moderno \n\t  que pueda reproducir el sonido en <a href=\"http://getfirefox.com\">\n\t    http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Archivo original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "Archivo WebM (códec Vorbis)"
 
@@ -1628,70 +1911,73 @@ msgstr "Archivo WebM (códec Vorbis)"
 msgid "Created"
 msgstr "Creado"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Imágenes para %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Archivo PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Frente"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Arriba"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Lateral"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Descargar modelo"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Formato de Archivo"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Altura del Objeto"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
-msgstr "Lo siento, este vídeo no funcionará\n      porque tu navegador no soporta \n      vídeo HTML5."
+msgstr ""
+"Lo sentimos, este vídeo no funcionará\n"
+"      porque tu navegador no soporta \n"
+"      vídeo HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "¡Puedes conseguir un navegador moderno \n      que pueda reproducir este vídeo en <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "Archivo WebM (VP8/Vorbis)"
 
@@ -1769,14 +2055,14 @@ msgstr "¡Aún no hay entradas procesadas!"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:27
 msgid "Sorry, no such report found."
-msgstr "Lo siento, no se ha encontrado el informe."
+msgstr "Lo sentimos, no se ha encontrado el informe."
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:33
 msgid "Return to Reports Panel"
 msgstr "Volver al panel de informes"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Informe"
 
@@ -1790,7 +2076,11 @@ msgid ""
 "\n"
 "        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
 "    "
-msgstr "\n� Informe de <a href=\"%(user_url)s\">%(user_name)s</a> sobre contenido"
+msgstr ""
+"\n"
+"        � Informe de <a href=\"%(user_url)s\">%(user_name)s</a> sobre "
+"contenido\n"
+"    "
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:92
 #, python-format
@@ -1800,7 +2090,12 @@ msgid ""
 "            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
 "          HAS BEEN DELETED\n"
 "        "
-msgstr "\nESTE CONTENIDO DE�\n<a href=\"%(user_url)s\"> %(user_name)s</a>�\nHA SIDO BORRADO�"
+msgstr ""
+"\n"
+"          ESTE CONTENIDO DE\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HA SIDO BORRADO\n"
+"        "
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:102
 msgid "Reason for report:"
@@ -1838,7 +2133,10 @@ msgid ""
 "\n"
 "    Here you can look up open reports that have been filed by users.\n"
 "  "
-msgstr "\nAquí puedes mirar informes abiertos que han sido enviados por usuarios.�"
+msgstr ""
+"\n"
+"    Aquí puedes mirar informes abiertos que han sido enviados por usuarios.\n"
+"  "
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
 msgid "Active Reports Filed"
@@ -1869,7 +2167,10 @@ msgid ""
 "\n"
 "                Comment Report #%(report_id)s\n"
 "              "
-msgstr "\nInforme de comentario nº %(report_id)s"
+msgstr ""
+"\n"
+"                Informe de comentario nº %(report_id)s\n"
+"              "
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
 #, python-format
@@ -1877,7 +2178,10 @@ msgid ""
 "\n"
 "                Media Report #%(report_id)s\n"
 "              "
-msgstr "\nInforme de contenido nº %(report_id)s"
+msgstr ""
+"\n"
+"                 Informe de contenido nº %(report_id)s\n"
+"              "
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
 msgid "No open reports found."
@@ -1901,7 +2205,10 @@ msgid ""
 "\n"
 "              Closed Report #%(report_id)s\n"
 "            "
-msgstr "\nInforme cerrado nº %(report_id)s"
+msgstr ""
+"\n"
+"              Informe cerrado nº %(report_id)s\n"
+"            "
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
 msgid "No closed reports found."
@@ -1918,7 +2225,7 @@ msgstr "Volver al panel de usuarios"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:49
 msgid "Sorry, no such user found."
-msgstr "Lo siento, no se ha encontrado ese usuario."
+msgstr "Lo sentimos, no se ha encontrado ese usuario."
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:53
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
@@ -2049,7 +2356,11 @@ msgid ""
 "\n"
 "    Here you can look up users in order to take punitive actions on them.\n"
 "  "
-msgstr "\nAquí puedes buscar usuarios de cara a tomar acciones punitivas sobre ellos."
+msgstr ""
+"\n"
+"    Aquí puedes buscar usuarios de cara a tomar acciones punitivas sobre "
+"ellos.\n"
+"  "
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
 msgid "Active Users"
@@ -2082,24 +2393,24 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Artículo de blog de <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Añadir un comentario"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Añade un comentario "
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Agregado"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
 #, python-format
 msgid "%(collection_title)s (%(username)s's collection)"
-msgstr "%(collection_title)s (%(username)s's collection)"
+msgstr "%(collection_title)s (colección de %(username)s)"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
 #, python-format
@@ -2164,12 +2475,12 @@ msgstr "Contenido de <a href=\"%(user_url)s\">%(username)s</a> con etiqueta <a h
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Contenido de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Explorando contenido de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Previsualización del comentario"
 
@@ -2215,7 +2526,11 @@ msgid ""
 "            � Published by <a href=\"%(user_url)s\"\n"
 "                          class=\"comment_authorlink\">%(username)s</a>\n"
 "      "
-msgstr "\n� Publicado por <a href=\"%(user_url)s\"�\nclass=\"comment_authorlink\">%(username)s</a>�"
+msgstr ""
+"\n"
+"            � Publicado por <a href=\"%(user_url)s\"\n"
+"                              class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
 
 #: mediagoblin/templates/mediagoblin/user_pages/report.html:81
 msgid "File Report "
@@ -2295,7 +2610,7 @@ msgstr "Silenciar comentarios"
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
 msgid "feed icon"
-msgstr "Icono feed"
+msgstr "Icono del feed"
 
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
@@ -2321,12 +2636,16 @@ msgstr "Ir a la página:"
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
-msgstr "Más nuevo"
+msgstr "más nuevo"
 
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
-msgstr "Más antiguo"
+msgstr "más antiguo"
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Locación"
 
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
@@ -2336,43 +2655,49 @@ msgstr "Informar sobre contenido"
 msgid "Tagged with"
 msgstr "Marcado con"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "No se pudo leer el archivo de imagen."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "¡Ups!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Ha ocurrido un error"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Petición errónea"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "La petición enviada al servidor no es válida, por favor compruébala"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Operación no permitida"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
-msgstr "¡Lo siento Dave, no puedo permitir que hagas eso!</p><p>Has intentado realizar una operación no permitida. ¿Has vuelto a intentar borrar todas las cuentas de usuario?"
+msgstr ""
+"¡Lo siento Dave, no puedo permitir que hagas eso!</p><p>Has intentado  "
+"realizar una operación no permitida. ¿Has vuelto a intentar borrar todas las "
+"cuentas de usuario?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
 " deleted."
-msgstr "Parece que no hay ninguna página en esta dirección. ¡Lo siento!</p><p>Si estás seguro de que la dirección es correcta, quizá han borrado o movido la página que estás buscando."
+msgstr ""
+"Parece que no hay ninguna página en esta dirección. ¡Lo sentimos!</p><p>Si "
+"estás seguro de que la dirección es correcta, quizá han borrado o movido la "
+"página que estás buscando."
 
 #: mediagoblin/tools/timesince.py:62
 msgid "year"
@@ -2435,69 +2760,69 @@ msgstr "Puedes usar\n                      <a href=\"http://daringfireball.net/p
 msgid "Reason for Reporting"
 msgstr "Razón del informe"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
-msgstr "Lo siento, los comentarios están desactivados."
+msgstr "Lo sentimos, los comentarios están desactivados."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Ups, tu comentario estaba vacío."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "¡Tu comentario ha sido publicado!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Por favor, revisa tus entradas e inténtalo de nuevo."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Tienes que seleccionar o añadir una colección"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
-msgstr "%s\" ya está en la colección \"%s\""
+msgstr "\"%s\" ya está en la colección \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" añadido a la colección \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
-msgstr "Eliminaste el contenido"
+msgstr "Eliminaste el contenido."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Estás a punto de eliminar un contenido de otro usuario. Procede con precaución."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Borraste el ítem de la colección."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "El ítem no fue removido porque no confirmaste que estuvieras seguro/a."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Estás a punto de borrar un ítem de la colección de otro usuario. Procede con cuidado."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Borraste la colección \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "La colección no fue borrada porque no confirmaste que estuvieras seguro/a."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Estás a punto de borrar la colección de otro usuario. Procede con cuidado."
diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index a649737a..00000000
--- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fa/mediagoblin.po
index 3f5c32b2..d768b00e 100644
--- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fa/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/mediagoblin/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -20,67 +20,167 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "متاس�انه،ثبتنام به طور موقت غیر �عال است."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "شرمنده، قابلیت گزارش دادن در این نمونه غیر �عال است."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "شرمنده، تایید اعتبار در این نمونه غیر�عال گردیده است."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "نام کاربری یا آدرس ایمیل وارد شده اشتباه می‌باشد."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "این گزینه بایستی توسط یک ایمیل آدرس تکمیل گردد."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "متاس�انه کاربری با این نام کاربری وجود دارد."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "متاس�یم، یک کاربر با آدرس ایمیل مورد نظر شما در سیستم ما وجود دارد."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "کلید تایید هویت یا نام کاربری اشتباه است."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "ایمیل شما تایید شد.شما می توانید حالا وارد شوید،نمایه خود را ویرایش کنید و تصاویر خود را ثبت کنید!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "این کد تاییدیه یا شناسه کاربری صحیح نیست."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "شما بایستی وارد سیستم شوید تا ما بدانیم ایمیل را به چه شخصی ارسال نماییم!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "شما در حال حاضر آدرس ایمیل خود را تایید نموده‌اید!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "ایمیل تاییدیه باز ارسال شد."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -96,7 +196,7 @@ msgid "Description of this work"
 msgstr "توصی� این عمل"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -112,11 +212,11 @@ msgstr "برچسب"
 msgid "Separate tags by commas."
 msgstr "تگ‌ها را توسط کاما (,) از یک‌دیگر جدا نمایید."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -144,125 +244,137 @@ msgstr "وبسایت"
 msgid "This address contains errors"
 msgstr "این آدرس شامل موارد غیرمجاز است"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "وقتی دیگران بر روی موارد قرار داده شده توسط من نظر گذاشتند به من ایمیل بزن"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "تنظیمات مجوز است�اده"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "این مورد مجوز است�اده‌ی پیش‌�رض شما در ص�حه‌ی آپلود خواهد بود."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "عنوان نمی‌تواند خالی باشد"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "معر�ی این مجموعه"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "بخش عنوان این آدرس مجموعه، شما معمولا نیازی به تغییر این مورد ندارید."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "رمز عبور �علی"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "رمز عبور قدیمی خود را وارد نمایید تا تایید نمایید شما صاحب این حساب کاربری هستید."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "رمز عبور جدید"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "آدرس ایمیل جدید"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "گذرواٰژه"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "رمز عبور خود را وارد نمایید تا تایید گردد شما صاحب این حساب کاربری هستید."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "شما در حال ویرایش رسانه کاربر دیگری هستید.با احتیاط عمل کنید"
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "شما �قط قادر به ویرایش پرو�ایل خود می‌باشید."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "شما در حال ویرایش نمایه کاربر دیگری هستید.با احتیاط عمل کنید."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "تغییرات در پرو�ایل شما ذخیره گردید"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "تنظیمات حساب کاربری شما ذخیره گردید"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "شما نیاز دارید تا حذ� شدن حساب کاربری خود را تایید نمایید."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "شما در حال حاضر یک مجموعه با نام \"%s\" دارید!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "شما در حال ویرایش مجموعه‌ی شخص دیگری هستید، لط�ا با احتیاط عمل نمایید."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "آدرس ایمیل شما تایید گردید."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "رمز عبور اشتباه است"
 
@@ -293,7 +405,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -301,58 +413,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -378,28 +490,28 @@ msgstr "توضیح"
 msgid "I am sure I want to delete this"
 msgstr "من از پاک کردن این مورد کاملا مطمئن هستم"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "هورا!ثبت شد!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "این چندرسانه‌ای حذ� نگردیده است به دلیل آن‌که شما اطمینان خود را تایید ننمودید."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -419,7 +531,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "ویرایش"
 
@@ -429,7 +541,7 @@ msgstr "ویرایش"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "حذ� نمودن"
 
@@ -556,46 +668,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -613,26 +725,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr "شما اعلانات مربوط به نظرات جدید در %s را دریا�ت نخواهید کرد."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "رشته‌ی تایید هویت درخواستی یا�ت نگردید."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -977,11 +1089,7 @@ msgstr "ارسال دستورالعمل"
 msgid "Forgot your password?"
 msgstr "رمز عبور خود را �راموش نموده‌اید؟"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "محل"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "بر روی <a href=\"%(osm_url)s\">OpenStreetMap</a> ببنید"
@@ -1048,7 +1156,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1061,8 +1169,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "شرمنده، یک حساب کاربری در حال حاضر با OpenID مد نظر شما ثبت گردیده است."
 
@@ -1070,39 +1178,39 @@ msgstr "شرمنده، یک حساب کاربری در حال حاضر با Open
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "شرمنده، سرور OpenID نمی‌تواند یا�ت شود"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "خدمات OpenID برای %s یا�ت نگردید."
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "تایید %s با شکست روبرو گردید: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "درخواست تایید لغو گردید"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "آدرس OpenID شما با مو�قیت ذخیره گردید."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "شما نمی‌توانید تنها آدرس OpenID خود را تا زمانی که رمز عبوری برای آن تنظیم نموده‌اید، حذ� نمایید"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "OpenID مد نظر شما برای این حساب کاربری ثبت نگردیده است."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID با مو�قیت حذ� گردید."
 
@@ -1126,7 +1234,7 @@ msgstr "OpenIDها"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1158,26 +1266,26 @@ msgstr "یا توسط OpenID ثبت‌نام نمایید!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "شرمنده، یک حساب کاربری در حال حاضر توسط آدرس ایمیل مد نظر شما ثبت گردیده است."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1201,15 +1309,15 @@ msgstr "یا توسط Persona وارد شوید!"
 msgid "Or register with Persona!"
 msgstr "یا به وسیله‌ی سیستم Persona ثبت‌نام نمایید!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "�ایلی نا معتبر برای نوع رسانه داده شده."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "کپی به �ضای ذخیره‌سازی عمومی با شکست مواجه شد."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "یک �ایل قابل قبول جهت پردازش یا�ت نشد"
 
@@ -1228,11 +1336,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "شما باید �ایلی ارايه بدهید."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "مجموعه‌ی \"%s\" اضا�ه گردید!"
@@ -1255,26 +1363,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "آدرس ایمیل خود را تایید نمایید!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "خروج"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "تغییر تنظیمات حساب کاربری"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1282,29 +1390,29 @@ msgstr "تغییر تنظیمات حساب کاربری"
 msgid "Media processing panel"
 msgstr "پنل رسیدگی به رسانه ها"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "خارج شدن"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "اضا�ه کردن �ایل"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "یک مجموعه‌ی جدید اضا�ه نمایید"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1358,8 +1466,8 @@ msgid "Authorization Complete"
 msgstr "مراحل دسترسی دادن کامل گردید"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "یک نسخه از این بر روی دستگاه خود ایجاد کنید:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1449,13 +1557,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "پیوست‌ها"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "پیوستی اضا�ه نمایید"
 
@@ -1473,6 +1581,47 @@ msgstr "ذخیره تغییرات"
 msgid "Changing %(username)s's email"
 msgstr "تغییر آدرس ایمیل کاربر %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1498,7 +1647,7 @@ msgstr ""
 msgid "Delete my account"
 msgstr "اکانت من را حذ� کن"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "آدرس ایمیل"
 
@@ -1552,19 +1701,6 @@ msgstr ""
 msgid "New comments"
 msgstr "نظرات جدید"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "همه را به عنوان خوانده شده نشانه‌گذاری کن"
@@ -1577,38 +1713,38 @@ msgstr "همه را به عنوان خوانده شده نشانه‌گذاری
 msgid "Media tagged with: %(tag_name)s"
 msgstr "نشانه‌گذاری شده با عبارات: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "دانلود"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "اصلی"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "شرمنده، این �ایل صوتی کار نخواهد کرد به دلیل آن که مرورگر وب شما از استاندارد HTML5 جهت پخش �ایل‌های صوتی پشتیبانی نمی‌نماید."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "شما می‌توانید یک مرورگر وب بسیار عالی که قادر به پخش �ایل‌های صوتی است را از <a href=\"http://getfirefox.com\">\n این‌جا</a> دریا�ت نمایید!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "�ایل اصلی"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "�ایل WebM (کدک (رمزگشای) Vorbis)"
 
@@ -1616,70 +1752,70 @@ msgstr "�ایل WebM (کدک (رمزگشای) Vorbis)"
 msgid "Created"
 msgstr "ایجاد گردید"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "�ایل PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "جلو"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "بالا"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "کنار"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "حالت دانلود!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "نوع �ایل"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "ارتقاع مورد"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "�ایل با �رمت WebM (کدک VP8/Vorbis)"
 
@@ -1764,7 +1900,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2070,17 +2206,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "یک نظر بنویسید"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "به این مورد نظری بدهید"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "اضا�ه گردید"
 
@@ -2152,12 +2288,12 @@ msgstr "�ایل‌های چند رسانه‌ای کاربر <a href=\"%(user_u
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s رسانه های"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "پیش‌نمایش نظر"
 
@@ -2316,6 +2452,10 @@ msgstr "جدیدتر"
 msgid "older"
 msgstr "قدیمی‌تر"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "محل"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2324,38 +2464,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "تگ شده با"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "قادر به خواندن تصویر نمی‌باشد."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "اوه"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "یک خطا رخ داد"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "درخواست نامعتبر"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "درخواست ارائه شده به سرور نادرست است، لط�ا مجددا چک نمایید"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "شما اجازه‌ی انجام این عملیات را ندارید"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2423,69 +2563,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr "دلیل شما برای گزارش؟"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "شرمنده، امکان نظردهی غیر�عال گردیده است."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "اووه، متن نظر شما خالی بود."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "نظر شما با مو�قیت ارسال گردید!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "لط�ا مقادیر ورودی خود را بررسی نموده و مجددا تلاش نمایید."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "شما مجبور هستید که یک مجموعه را انتخاب یا اضا�ه نمایید"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" در حال حاضر در مجموعه‌ی \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" به مجموعه‌ی \"%s\" اضا�ه گردیده است"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "شما چندرسانه‌ای مورد نظر را پاک نمودید."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "شما در حال حذ� نمودن �ایل‌های کاربر دیگری است. با احتیاط عمل نمایید."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "شما �ایل مورد نظر را از مجموعه حذ� نموده‌اید."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "�ایل مورد نظر به دلیل عدم تایید اطمینان شما حذ� نگردید."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "شما در حال حذ� نمودن موردی از مجموعه‌ی شخص دیگری هستید، لط�ا با احتیاط عمل نمایید."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "شما مجموعه‌ی \"%s\" را حذ� نمودید"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/fa_IR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa_IR/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 2a55a957..00000000
--- a/mediagoblin/i18n/fa_IR/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/fa_IR/mediagoblin.po b/mediagoblin/i18n/fa_IR/mediagoblin.po
new file mode 100644
index 00000000..896499c3
--- /dev/null
+++ b/mediagoblin/i18n/fa_IR/mediagoblin.po
@@ -0,0 +1,2629 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/mediagoblin/language/fa_IR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Language: fa_IR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie blocker "
+"or somesuch.<br/>Make sure to permit the settings of cookies for this "
+"domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
+"      then paste it into a new line in the text box above. There should be only\n"
+"      one url per line. The url that you paste into the text box should be under\n"
+"      the header describing how prominent a feature it will be (whether Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
+"      inside the text box, click the Submit Query button, and your media should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
+"        of media you would like to feature or unfeature and look at the bar to\n"
+"        the side of the media entry. If the piece of media has not been featured\n"
+"        yet you should see a button that says \"Feature\". Press that button and\n"
+"        the media will be featured as a Primary Feature at the top of the page.\n"
+"        All other featured media entries will remain as features, but will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". Click\n"
+"        Unfeature and that media entry will no longer be displayed on the\n"
+"        front page, although you can feature it again at any point. Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on your\n"
+"      front page. Primary Features are placed at the top of the front page and are\n"
+"      much larger. Next are Secondary Features, which are slightly smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than Secondary\n"
+"      Features, and Secondary Features can display longer descriptions than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
+"      portion of its description will be displayed on your website's front page.\n"
+"      The number of characters displayed varies on the prominence of the feature.\n"
+"      Primary Features display the first 512 characters of their description,\n"
+"      Secondary Features display the first 256 characters of their description,\n"
+"      and Tertiary Features display the first 128 characters of their description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware that if\n"
+"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
+"      featured. Make sure that all your intended Media Entries are featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be sure to\n"
+"        have media featured as long as your instance has the 'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been sent"
+" with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your "
+"MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid ""
+"Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid ""
+"You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can <a "
+"href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""
diff --git a/mediagoblin/i18n/fi/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fi/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 90168857..00000000
--- a/mediagoblin/i18n/fi/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/fi/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fi/LC_MESSAGES/mediagoblin.po
deleted file mode 100644
index 99f3b6fb..00000000
--- a/mediagoblin/i18n/fi/LC_MESSAGES/mediagoblin.po
+++ /dev/null
@@ -1,2493 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU MediaGoblin\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-07-29 11:01-0500\n"
-"PO-Revision-Date: 2011-08-07 03:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/mediagoblin/language/fi/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202
-msgid "Sorry, registration is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/decorators.py:315
-msgid "Sorry, reporting is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
-msgid "Sorry, authentication is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:43
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:44
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:45
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:116
-msgid "Sorry, a user with that name already exists."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
-msgid "Sorry, a user with that email address already exists."
-msgstr ""
-
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
-msgid "The verification key or user id is incorrect."
-msgstr ""
-
-#: mediagoblin/auth/views.py:161
-msgid ""
-"Your email address has been verified. You may now login, edit your profile, "
-"and submit images!"
-msgstr ""
-
-#: mediagoblin/auth/views.py:167
-msgid "The verification key or user id is incorrect"
-msgstr ""
-
-#: mediagoblin/auth/views.py:185
-msgid "You must be logged in so we know who to send the email to!"
-msgstr ""
-
-#: mediagoblin/auth/views.py:193
-msgid "You've already verified your email address!"
-msgstr ""
-
-#: mediagoblin/auth/views.py:203
-msgid "Resent your verification email."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
-#: mediagoblin/media_types/blog/forms.py:24
-#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
-#: mediagoblin/submit/forms.py:61
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
-#: mediagoblin/user_pages/forms.py:45
-msgid "Title"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
-msgid "Description of this work"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
-msgid ""
-"You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"                      Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
-#: mediagoblin/submit/forms.py:45
-msgid "Tags"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
-msgid "Separate tags by commas."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
-msgid "Slug"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
-msgid "The slug can't be empty"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:44
-msgid ""
-"The title part of this media's address. You usually don't need to change "
-"this."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
-#: mediagoblin/submit/forms.py:50
-#: mediagoblin/templates/mediagoblin/utils/license.html:20
-msgid "License"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:54
-msgid "Bio"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:60
-msgid "Website"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:62
-msgid "This address contains errors"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "Email me when others comment on my media"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:69
-msgid "Enable insite notifications about events."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:71
-msgid "License preference"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:77
-msgid "This will be your default license on upload forms."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:90
-msgid "The title can't be empty"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
-#: mediagoblin/user_pages/forms.py:48
-msgid "Description of this collection"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:99
-msgid ""
-"The title part of this collection's address. You usually don't need to "
-"change this."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:119
-msgid "New email address"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
-#: mediagoblin/plugins/basic_auth/forms.py:43
-#: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
-msgid "Password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:125
-msgid "Enter your password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:155
-msgid "Identifier"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:156
-msgid "Value"
-msgstr ""
-
-#: mediagoblin/edit/views.py:78
-msgid "An entry with that slug already exists for this user."
-msgstr ""
-
-#: mediagoblin/edit/views.py:96
-msgid "You are editing another user's media. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/edit/views.py:166
-#, python-format
-msgid "You added the attachment %s!"
-msgstr ""
-
-#: mediagoblin/edit/views.py:193
-msgid "You can only edit your own profile."
-msgstr ""
-
-#: mediagoblin/edit/views.py:199
-msgid "You are editing a user's profile. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/edit/views.py:215
-msgid "Profile changes saved"
-msgstr ""
-
-#: mediagoblin/edit/views.py:248
-msgid "Account settings saved"
-msgstr ""
-
-#: mediagoblin/edit/views.py:282
-msgid "You need to confirm the deletion of your account."
-msgstr ""
-
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
-#, python-format
-msgid "You already have a collection called \"%s\"!"
-msgstr ""
-
-#: mediagoblin/edit/views.py:322
-msgid "A collection with that slug already exists for this user."
-msgstr ""
-
-#: mediagoblin/edit/views.py:337
-msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/edit/views.py:378
-msgid "Your email address has been verified."
-msgstr ""
-
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:60
-msgid "Cannot link theme... no theme set\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:73
-msgid "No asset directory for this theme\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:76
-msgid "However, old link directory symlink found; removed.\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:112
-#, python-format
-msgid "Could not link \"%s\": %s exists and is not a symlink\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:119
-#, python-format
-msgid "Skipping \"%s\"; already set up.\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:124
-#, python-format
-msgid "Old link found for \"%s\"; removing.\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
-msgid ""
-"For more information about how to properly run this\n"
-"script (and how to format the metadata csv file), read the MediaGoblin\n"
-"documentation page on command line uploading\n"
-"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
-msgid "Name of user these media entries belong to"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
-msgid "Path to the csv file containing metadata information."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
-msgid "Don't process eagerly, pass off to celery"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
-msgid "Sorry, no user by username '{username}' exists"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
-msgid "File at {path} not found, use -h flag for help"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
-msgid ""
-"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
-"Metadata was not uploaded."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
-msgid ""
-"FAIL: Local file {filename} could not be accessed.\n"
-"{filename} will not be uploaded."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
-msgid ""
-"Successfully submitted {filename}!\n"
-"Be sure to look at the Media Processing Panel on your website to be sure it\n"
-"uploaded successfully."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
-msgid "FAIL: This file is larger than the upload limits for this site."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
-msgid "FAIL: This file will put this user past their upload limits."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
-msgid "FAIL: This user is already past their upload limits."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
-msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
-msgstr ""
-
-#: mediagoblin/meddleware/csrf.py:134
-msgid ""
-"CSRF cookie not present. This is most likely the result of a cookie blocker "
-"or somesuch.<br/>Make sure to permit the settings of cookies for this "
-"domain."
-msgstr ""
-
-#: mediagoblin/media_types/__init__.py:79
-#: mediagoblin/media_types/__init__.py:101
-msgid "Sorry, I don't support that file type :("
-msgstr ""
-
-#: mediagoblin/media_types/blog/forms.py:26
-#: mediagoblin/media_types/blog/forms.py:35
-#: mediagoblin/plugins/oauth/forms.py:36
-msgid "Description"
-msgstr ""
-
-#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
-msgid "I am sure I want to delete this"
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
-msgid "Woohoo! Submitted!"
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:198
-msgid "Woohoo! edited blogpost is submitted"
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:320
-msgid "You deleted the Blog."
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
-msgid "The media was not deleted because you didn't check that you were sure."
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:333
-msgid "You are about to delete another user's Blog. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:344
-msgid "The blog was not deleted because you have no rights."
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
-msgid "Add Blog Post"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
-msgid "Edit Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
-msgid "Delete Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
-msgid "Delete"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
-msgid "<em> Go to list view </em>"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
-msgid " No blog post yet. "
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
-#, python-format
-msgid "Really delete %(title)s?"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit.html:41
-#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
-msgid "Cancel"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
-msgid "Delete permanently"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
-msgid "Create/Edit a Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
-#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
-#: mediagoblin/templates/mediagoblin/submit/collection.html:30
-#: mediagoblin/templates/mediagoblin/submit/start.html:39
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
-msgid "Add"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
-msgid "Create/Edit a blog post."
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
-msgid "Create/Edit a Blog Post."
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
-#, python-format
-msgid "%(blog_owner_name)s's Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
-msgid "View"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
-msgid "Create a Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
-msgid " Blog Dashboard "
-msgstr ""
-
-#: mediagoblin/media_types/pdf/processing.py:142
-msgid "unoconv failing to run, check log file"
-msgstr ""
-
-#: mediagoblin/media_types/video/processing.py:44
-msgid "Video transcoding failed"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:21
-msgid "Take away privilege"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:22
-msgid "Ban the user"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:23
-msgid "Send the user a message"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:24
-msgid "Delete the content"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
-msgid "User will be banned until:"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:57
-msgid "Why are you banning this User?"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:109
-msgid "What action will you take to resolve the report?"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:115
-msgid "What privileges will you take away?"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:122
-msgid "Why user was banned:"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:125
-msgid "Message to user:"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:128
-msgid "Resolution content:"
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:34
-msgid ""
-"\n"
-"{mod} took away {user}'s {privilege} privileges."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:47
-msgid ""
-"\n"
-"{mod} banned user {user} {expiration_date}."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:51
-msgid "until {date}"
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:53
-#: mediagoblin/templates/mediagoblin/banned.html:30
-msgid "indefinitely"
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:62
-msgid ""
-"\n"
-"{mod} sent a warning email to the {user}."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:71
-msgid ""
-"\n"
-"{mod} deleted the comment."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:78
-msgid ""
-"\n"
-"{mod} deleted the media entry."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:91
-msgid "Warning from"
-msgstr ""
-
-#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
-msgid "commented on your post"
-msgstr ""
-
-#: mediagoblin/notifications/views.py:35
-#, python-format
-msgid "Subscribed to comments on %s!"
-msgstr ""
-
-#: mediagoblin/notifications/views.py:48
-#, python-format
-msgid "You will not receive notifications for comments on %s."
-msgstr ""
-
-#: mediagoblin/oauth/views.py:242
-msgid "Must provide an oauth_token."
-msgstr ""
-
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
-msgid "No request token found."
-msgstr ""
-
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
-msgid "Sorry, the file size is too big."
-msgstr ""
-
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
-msgid "Sorry, uploading this file will put you over your upload limit."
-msgstr ""
-
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
-msgid "Sorry, you have reached your upload limit."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/forms.py:21
-msgid "Enter the URL for the media to be featured"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:132
-msgid "Primary"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:133
-msgid "Secondary"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:134
-msgid "Tertiary"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:135
-msgid "-----------{display_type}-Features---------------------------\n"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
-msgid "How does this work?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
-msgid "How to feature media?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
-msgid ""
-"\n"
-"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
-"      then paste it into a new line in the text box above. There should be only\n"
-"      one url per line. The url that you paste into the text box should be under\n"
-"      the header describing how prominent a feature it will be (whether Primary,\n"
-"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
-"      inside the text box, click the Submit Query button, and your media should be\n"
-"      displayed on the front page.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
-msgid "Is there another way to manage featured media?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
-msgid ""
-"\n"
-"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
-"        of media you would like to feature or unfeature and look at the bar to\n"
-"        the side of the media entry. If the piece of media has not been featured\n"
-"        yet you should see a button that says \"Feature\". Press that button and\n"
-"        the media will be featured as a Primary Feature at the top of the page.\n"
-"        All other featured media entries will remain as features, but will be\n"
-"        pushed further down the page.<br /><br />\n"
-"\n"
-"        If you go to the media homepage of a piece of media that is currently\n"
-"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
-"        where previously there was the button which said \"Feature\". Click\n"
-"        Unfeature and that media entry will no longer be displayed on the\n"
-"        front page, although you can feature it again at any point. Promote\n"
-"        moves the featured media higher up on the page and makes it more\n"
-"        prominent and Demote moves the featured media lower down and makes it\n"
-"        less prominent.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
-msgid "What is a Primary Feature? What is a Secondary Feature?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
-msgid ""
-"\n"
-"      These categories just describe how prominent a feature will be on your\n"
-"      front page. Primary Features are placed at the top of the front page and are\n"
-"      much larger. Next are Secondary Features, which are slightly smaller.\n"
-"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
-"\n"
-"      Primary Features also can display longer descriptions than Secondary\n"
-"      Features, and Secondary Features can display longer descriptions than\n"
-"      Tertiary Features."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
-msgid ""
-"How to decide what information is displayed when a media entry is\n"
-"    featured?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
-msgid ""
-"\n"
-"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
-"      portion of its description will be displayed on your website's front page.\n"
-"      The number of characters displayed varies on the prominence of the feature.\n"
-"      Primary Features display the first 512 characters of their description,\n"
-"      Secondary Features display the first 256 characters of their description,\n"
-"      and Tertiary Features display the first 128 characters of their description.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
-msgid "How to unfeature a piece of media?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
-msgid ""
-"\n"
-"      Unfeature a media by removing its line from the above textarea and then\n"
-"      pressing the Submit Query button.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
-msgid "CAUTION:"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
-msgid ""
-"\n"
-"      When copying and pasting urls into the above text box, be aware that if\n"
-"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
-"      featured. Make sure that all your intended Media Entries are featured.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
-msgid ""
-"\n"
-"Feature Media "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:64
-msgid "Feature"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
-msgid ""
-"\n"
-"Unfeature Media "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
-msgid "Unfeature"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
-msgid ""
-"\n"
-"Promote Feature "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
-msgid "Promote"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
-msgid ""
-"\n"
-"Demote Feature "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
-msgid "Demote"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
-#: mediagoblin/templates/mediagoblin/root.html:32
-msgid "Most recent media"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
-msgid "Nothing is currently featured."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
-msgid ""
-"If you would like to feature a\n"
-"        piece of media, go to that media entry's homepage and click the button\n"
-"        that says"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:65
-msgid ""
-"You're seeing this page because you are a user capable of\n"
-"        featuring media, a regular user would see a blank page, so be sure to\n"
-"        have media featured as long as your instance has the 'archivalook'\n"
-"        plugin enabled. A more advanced tool to manage features can be found\n"
-"        in the"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:72
-msgid "feature management panel."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:77
-msgid "View most recent media"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
-msgid "Feature management panel"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
-msgid ""
-"Sorry, this audio will not work because\n"
-"\tyour web browser does not support HTML5\n"
-"\taudio."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
-msgid ""
-"You can get a modern web browser that\n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
-msgid ""
-"Sorry, this video will not work because\n"
-"          your web browser does not support HTML5 \n"
-"          video."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
-msgid ""
-"You can get a modern web browser that \n"
-"          can play this video at <a href=\"http://getfirefox.com\">\n"
-"          http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:24
-#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
-#: mediagoblin/plugins/persona/forms.py:24
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
-msgid "Username"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:32
-#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
-#: mediagoblin/plugins/persona/forms.py:28
-#: mediagoblin/plugins/persona/forms.py:39
-msgid "Email address"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:39
-msgid "Username or Email"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:46
-msgid "Stay logged in"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:51
-msgid "Username or email"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:54
-msgid ""
-"If that email address (case sensitive!) is registered an email has been sent"
-" with instructions on how to change your password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:65
-msgid "Couldn't find someone with that username."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:68
-msgid ""
-"An email has been sent with instructions on how to change your password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:75
-msgid ""
-"Could not send password recovery email as your username is inactive or your "
-"account's email address has not been verified."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:123
-msgid "The user id is incorrect."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:139
-msgid "You can now log in using your new password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:163
-msgid ""
-"You are no longer an active user. Please contact the system admin to "
-"reactivate your account."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:215
-msgid "Your password was changed successfully"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
-msgid "Set your new password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
-msgid "Set password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
-#, python-format
-msgid "Changing %(username)s's password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
-msgid "Save"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
-msgid "Don't have an account yet?"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
-msgid "Create one here!"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
-msgid "Change your password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
-msgid "Recover password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
-msgid "Send instructions"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
-msgid "Forgot your password?"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
-#, python-format
-msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
-msgstr ""
-
-#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
-msgid "Sign in to create an account!"
-msgstr ""
-
-#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
-msgid "Metadata"
-msgstr ""
-
-#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
-msgid "Edit Metadata"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:29
-msgid "Allow"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:30
-msgid "Deny"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:34
-msgid "Name"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:35
-msgid "The name of the OAuth client"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:38
-msgid ""
-"This will be visible to users allowing your\n"
-"                application to authenticate as them."
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:40
-msgid "Type"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:45
-msgid ""
-"<strong>Confidential</strong> - The client can\n"
-"                make requests to the GNU MediaGoblin instance that can not be\n"
-"                intercepted by the user agent (e.g. server-side client).<br />\n"
-"                <strong>Public</strong> - The client can't make confidential\n"
-"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
-"                JavaScript client)."
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:52
-msgid "Redirect URI"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:54
-msgid ""
-"The redirect URI for the applications, this field\n"
-"            is <strong>required</strong> for public clients."
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:66
-msgid "This field is required for public clients"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/views.py:55
-msgid "The client {0} has been registered!"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
-msgid "OAuth client connections"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
-msgid "Your OAuth clients"
-msgstr ""
-
-#: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
-msgid "Sorry, an account is already registered to that OpenID."
-msgstr ""
-
-#: mediagoblin/plugins/openid/forms.py:38
-msgid "OpenID"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:48
-msgid "Sorry, the OpenID server could not be found"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:61
-#, python-format
-msgid "No OpenID service was found for %s"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:106
-#, python-format
-msgid "Verification of %s failed: %s"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:117
-msgid "Verification cancelled"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:314
-msgid "Your OpenID url was saved successfully."
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
-msgid "You can't delete your only OpenID URL unless you have a password set"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
-msgid "That OpenID is not registered to this account."
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:385
-msgid "OpenID was successfully removed."
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
-msgid "Add an OpenID"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
-msgid "Delete an OpenID"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
-msgid "OpenID's"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:47
-msgid "Log in"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
-msgid "Log in to create an account!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
-msgid "Or login with a password!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
-msgid "Or login with OpenID!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
-msgid "Or register with OpenID!"
-msgstr ""
-
-#: mediagoblin/plugins/persona/__init__.py:90
-msgid "Sorry, an account is already registered to that Persona email."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:138
-msgid "The Persona email address was successfully removed."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:144
-msgid ""
-"You can't delete your only Persona email address unless you have a password "
-"set."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:149
-msgid "That Persona email address is not registered to this account."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:176
-msgid ""
-"Sorry, an account is already registered with that Persona email address."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:192
-msgid "Your Persona email address was saved successfully."
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
-msgid "Delete a Persona email address"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
-msgid "Add a Persona email address"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
-msgid "Persona's"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
-msgid "Or login with Persona!"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
-msgid "Or register with Persona!"
-msgstr ""
-
-#: mediagoblin/processing/__init__.py:420
-msgid "Invalid file given for media type."
-msgstr ""
-
-#: mediagoblin/processing/__init__.py:427
-msgid "Copying to public storage failed."
-msgstr ""
-
-#: mediagoblin/processing/__init__.py:435
-msgid "An acceptable processing file was not found"
-msgstr ""
-
-#: mediagoblin/submit/forms.py:30
-msgid "Max file size: {0} mb"
-msgstr ""
-
-#: mediagoblin/submit/forms.py:34
-msgid "File"
-msgstr ""
-
-#: mediagoblin/submit/forms.py:41
-msgid ""
-"You can use\n"
-"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"                        Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/submit/views.py:55
-msgid "You must provide a file."
-msgstr ""
-
-#: mediagoblin/submit/views.py:138
-#, python-format
-msgid "Collection \"%s\" added!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:20
-msgid "You are Banned."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:24
-#: mediagoblin/templates/mediagoblin/error.html:24
-msgid "Image of goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:26
-msgid "You have been banned"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:28
-#, python-format
-msgid "until %(until_when)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:97
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
-msgid "log out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:131
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:138
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
-msgid "Media processing panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:152
-msgid "Log out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:155
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
-msgid "Add media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:158
-#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
-msgid "Create new collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:163
-msgid "Moderation powers:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:169
-msgid "User management panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:173
-msgid "Report management panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:21
-msgid "Authorization"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:26
-#: mediagoblin/templates/mediagoblin/api/authorize.html:53
-msgid "Authorize"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:29
-msgid "You are logged in as"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:33
-msgid "Do you want to authorize "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:37
-msgid "an unknown application"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:39
-msgid " to access your account? "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:41
-msgid "Applications with access to your account can: "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:43
-msgid "Post new media as you"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:44
-msgid "See your information (e.g profile, media, etc...)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:45
-msgid "Change your information"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/oob.html:21
-msgid "Authorization Finished"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/oob.html:26
-msgid "Authorization Complete"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/auth/register.html:28
-#: mediagoblin/templates/mediagoblin/auth/register.html:36
-msgid "Create an account!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/auth/register.html:41
-msgid "Create"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
-#, python-format
-msgid ""
-"Hi %(username)s,\n"
-"\n"
-"to activate your GNU MediaGoblin account, open the following URL in\n"
-"your web browser:\n"
-"\n"
-"%(verification_url)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
-#, python-format
-msgid ""
-"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
-"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
-#, python-format
-msgid ""
-"Released under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
-"href=\"%(source_link)s\">Source code</a> available."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
-msgid "Terms of Service"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
-msgid ""
-"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
-msgid ""
-"\n"
-"            >Create an account at this site</a>\n"
-"            or"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
-msgid ""
-"\n"
-"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/logo.html:23
-#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
-msgid "MediaGoblin logo"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
-#, python-format
-msgid "Editing attachments for %(media_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
-msgid "Attachments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
-msgid "Add attachment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
-#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
-msgid "Save changes"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
-#, python-format
-msgid "Changing %(username)s's email"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
-#, python-format
-msgid "Really delete user '%(user_name)s' and all related media/comments?"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
-msgid "Yes, really delete my account"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit.html:23
-#: mediagoblin/templates/mediagoblin/edit/edit.html:35
-#, python-format
-msgid "Editing %(media_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
-#, python-format
-msgid "Changing %(username)s's account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
-msgid "Delete my account"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
-msgid "Email"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
-#, python-format
-msgid "Editing %(collection_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
-#, python-format
-msgid "Editing %(username)s's profile"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
-#, python-format
-msgid "Metadata for \"%(media_name)s\""
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
-msgid "MetaData"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
-msgid "Add new Row"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
-msgid "Update Metadata"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
-msgid "Clear empty Rows"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
-#, python-format
-msgid ""
-"Hi,\n"
-"\n"
-"We wanted to verify that you are %(username)s. If this is the case, then \n"
-"please follow the link below to verify your new email address.\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"If you are not %(username)s or didn't request an email change, you can ignore\n"
-"this email."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
-msgid "New comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
-msgid "Mark all read"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/listings/collection.html:30
-#: mediagoblin/templates/mediagoblin/listings/collection.html:35
-#: mediagoblin/templates/mediagoblin/listings/tag.html:30
-#: mediagoblin/templates/mediagoblin/listings/tag.html:35
-#, python-format
-msgid "Media tagged with: %(tag_name)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
-msgid "Download"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-msgid "Original"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
-msgid ""
-"Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
-msgid ""
-"You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
-msgid "Original file"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
-msgid "WebM file (Vorbis codec)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
-msgid "Created"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
-#, python-format
-msgid "Image for %(media_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
-msgid "PDF file"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-msgid "Perspective"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
-msgid "Front"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
-msgid "Top"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
-msgid "Side"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-msgid "WebGL"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
-msgid "Download model"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
-msgid "File Format"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
-msgid "Object Height"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
-msgid ""
-"Sorry, this video will not work because\n"
-"      your web browser does not support HTML5 \n"
-"      video."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
-msgid ""
-"You can get a modern web browser that \n"
-"      can play this video at <a href=\"http://getfirefox.com\">\n"
-"      http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
-msgid "WebM file (VP8/Vorbis)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
-msgid ""
-"Here you can track the state of media being processed on this instance."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
-msgid "Media in-processing"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
-msgid "ID"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
-msgid "User"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
-msgid "When submitted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
-msgid "Transcoding progress"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
-msgid "Unknown"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
-msgid "No media in-processing"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
-msgid "These uploads failed to process:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
-msgid "Reason for failure"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
-msgid "Failure metadata"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
-msgid "No failed entries!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
-msgid "Last 10 successful uploads"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
-msgid "Submitted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
-msgid "No processed entries, yet!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:27
-msgid "Sorry, no such report found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:33
-msgid "Return to Reports Panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
-msgid "Report"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:38
-msgid "Reported comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:83
-#, python-format
-msgid ""
-"\n"
-"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
-"    "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:92
-#, python-format
-msgid ""
-"\n"
-"          CONTENT BY\n"
-"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
-"          HAS BEEN DELETED\n"
-"        "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:102
-msgid "Reason for report:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:133
-#: mediagoblin/templates/mediagoblin/moderation/user.html:136
-msgid "Resolve"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:137
-#: mediagoblin/templates/mediagoblin/moderation/report.html:157
-msgid "Resolve This Report"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:149
-msgid "Status"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:151
-msgid "RESOLVED"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:159
-msgid "You cannot take action against an administrator"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
-msgid "Report panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
-msgid ""
-"\n"
-"    Here you can look up open reports that have been filed by users.\n"
-"  "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
-msgid "Active Reports Filed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
-msgid "Offender"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
-msgid "When Reported"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
-msgid "Reported By"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
-msgid "Reason"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
-#, python-format
-msgid ""
-"\n"
-"                Comment Report #%(report_id)s\n"
-"              "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
-#, python-format
-msgid ""
-"\n"
-"                Media Report #%(report_id)s\n"
-"              "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
-msgid "No open reports found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
-msgid "Closed Reports"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
-msgid "Resolved"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
-msgid "Action Taken"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
-#, python-format
-msgid ""
-"\n"
-"              Closed Report #%(report_id)s\n"
-"            "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
-msgid "No closed reports found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:23
-#, python-format
-msgid "User: %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:42
-msgid "Return to Users Panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:49
-msgid "Sorry, no such user found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:53
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
-msgid "Email verification needed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:55
-msgid ""
-"Someone has registered an account with this username, but it still has\n"
-"        to be activated."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:66
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
-#, python-format
-msgid "%(username)s's profile"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:68
-#, python-format
-msgid "BANNED until %(expiration_date)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:72
-msgid "Banned Indefinitely"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:78
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
-msgid "This user hasn't filled in their profile (yet)."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:89
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
-msgid "Edit profile"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:96
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
-msgid "Browse collections"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:105
-#, python-format
-msgid "Active Reports on %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:112
-msgid "Report ID"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:113
-msgid "Reported Content"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:114
-msgid "Description of Report"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:122
-#, python-format
-msgid "Report #%(report_number)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:129
-msgid "Reported Comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:131
-msgid "Reported Media Entry"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:142
-#, python-format
-msgid "No active reports filed on %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:150
-#, python-format
-msgid "All reports on %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:155
-#, python-format
-msgid "All reports that %(username)s has filed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:164
-#, python-format
-msgid "%(username)s's Privileges"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:172
-msgid "Privilege"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:173
-msgid "Granted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:180
-msgid "Yes"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:182
-msgid "No"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:213
-msgid "Ban User"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:218
-msgid "UnBan User"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
-msgid "User panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
-msgid ""
-"\n"
-"    Here you can look up users in order to take punitive actions on them.\n"
-"  "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
-msgid "Active Users"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
-msgid "When Joined"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
-msgid "# of Comments Posted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
-msgid "No users found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/submit/collection.html:26
-msgid "Add a collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/submit/start.html:28
-#: mediagoblin/templates/mediagoblin/submit/start.html:35
-msgid "Add your media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
-#, python-format
-msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
-msgid "Add a comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
-msgid "Add this comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
-msgid "Added"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
-#, python-format
-msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
-#, python-format
-msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
-#, python-format
-msgid "Delete collection %(collection_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
-#, python-format
-msgid "Really delete collection: %(title)s?"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
-#, python-format
-msgid "Remove %(media_title)s from %(collection_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
-#, python-format
-msgid "Really remove %(media_title)s from %(collection_title)s?"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
-msgid "Remove"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
-#, python-format
-msgid "%(username)s's collections"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
-#, python-format
-msgid ""
-"Hi %(username)s,\n"
-"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
-#, python-format
-msgid "%(username)s's media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
-#, python-format
-msgid ""
-"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
-"href=\"%(tag_url)s\">%(tag)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
-#, python-format
-msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
-msgid "Comment Preview"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
-#, python-format
-msgid "Add “%(media_title)s� to a collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
-msgid "+"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
-msgid "Add a new collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
-msgid ""
-"You can track the state of media being processed for your gallery here."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
-msgid "Your last 10 successful uploads"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
-msgid "<h2>File a Report</h2>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
-msgid "Reporting this Comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
-msgid "Reporting this Media Entry"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
-#, python-format
-msgid ""
-"\n"
-"            � Published by <a href=\"%(user_url)s\"\n"
-"                          class=\"comment_authorlink\">%(username)s</a>\n"
-"      "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
-msgid "File Report "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
-msgid "Here's a spot to tell others about yourself."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
-#, python-format
-msgid "View all of %(username)s's media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
-msgid ""
-"This is where your media will appear, but you don't seem to have added "
-"anything yet."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
-#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
-msgid "There doesn't seem to be any media here yet..."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
-msgid "Almost done! Your account still needs to be activated."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
-msgid ""
-"An email should arrive in a few moments with instructions on how to do so."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
-msgid "In case it doesn't:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
-msgid "Resend verification email"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
-msgid ""
-"Someone has registered an account with this username, but it still has to be"
-" activated."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
-#, python-format
-msgid ""
-"If you are that person but you've lost your verification email, you can <a "
-"href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
-msgid "(remove)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collections.html:21
-msgid "Collected in"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collections.html:40
-msgid "Add to a collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
-msgid "Subscribe to comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
-msgid "Silence comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
-#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
-msgid "feed icon"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
-#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
-msgid "Atom feed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/license.html:25
-msgid "All rights reserved"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
-msgid "� Newer"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
-msgid "Older →"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
-msgid "Go to page:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
-msgid "newer"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
-msgid "older"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/report.html:25
-msgid "Report media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "Tagged with"
-msgstr ""
-
-#: mediagoblin/tools/exif.py:81
-msgid "Could not read the image file."
-msgstr ""
-
-#: mediagoblin/tools/response.py:38
-msgid "Oops!"
-msgstr ""
-
-#: mediagoblin/tools/response.py:39
-msgid "An error occured"
-msgstr ""
-
-#: mediagoblin/tools/response.py:53
-msgid "Bad Request"
-msgstr ""
-
-#: mediagoblin/tools/response.py:55
-msgid "The request sent to the server is invalid, please double check it"
-msgstr ""
-
-#: mediagoblin/tools/response.py:63
-msgid "Operation not allowed"
-msgstr ""
-
-#: mediagoblin/tools/response.py:64
-msgid ""
-"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
-"function that you are not allowed to. Have you been trying to delete all "
-"user accounts again?"
-msgstr ""
-
-#: mediagoblin/tools/response.py:72
-msgid ""
-"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
-" the address is correct, maybe the page you're looking for has been moved or"
-" deleted."
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:62
-msgid "year"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:63
-msgid "month"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:64
-msgid "week"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:65
-msgid "day"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:66
-msgid "hour"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:67
-msgid "minute"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:23
-msgid "Comment"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:25
-msgid ""
-"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
-"target=\"_blank\">Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:35
-msgid "I am sure I want to remove this item from the collection"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:39
-msgid "Collection"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:40
-msgid "-- Select --"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:42
-msgid "Include a note"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:49
-msgid ""
-"You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
-"                      Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
-msgid "Reason for Reporting"
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:188
-msgid "Sorry, comments are disabled."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:193
-msgid "Oops, your comment was empty."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:199
-msgid "Your comment has been posted!"
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:235
-msgid "Please check your entries and try again."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:275
-msgid "You have to select or add a collection"
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:286
-#, python-format
-msgid "\"%s\" already in collection \"%s\""
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:292
-#, python-format
-msgid "\"%s\" added to collection \"%s\""
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:317
-msgid "You deleted the media."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:336
-msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:409
-msgid "You deleted the item from the collection."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:413
-msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:421
-msgid ""
-"You are about to delete an item from another user's collection. Proceed with"
-" caution."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:453
-#, python-format
-msgid "You deleted the collection \"%s\""
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:460
-msgid ""
-"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:468
-msgid ""
-"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
diff --git a/mediagoblin/i18n/fi/mediagoblin.po b/mediagoblin/i18n/fi/mediagoblin.po
new file mode 100644
index 00000000..12e02675
--- /dev/null
+++ b/mediagoblin/i18n/fi/mediagoblin.po
@@ -0,0 +1,2629 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/mediagoblin/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie blocker "
+"or somesuch.<br/>Make sure to permit the settings of cookies for this "
+"domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
+"      then paste it into a new line in the text box above. There should be only\n"
+"      one url per line. The url that you paste into the text box should be under\n"
+"      the header describing how prominent a feature it will be (whether Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
+"      inside the text box, click the Submit Query button, and your media should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
+"        of media you would like to feature or unfeature and look at the bar to\n"
+"        the side of the media entry. If the piece of media has not been featured\n"
+"        yet you should see a button that says \"Feature\". Press that button and\n"
+"        the media will be featured as a Primary Feature at the top of the page.\n"
+"        All other featured media entries will remain as features, but will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". Click\n"
+"        Unfeature and that media entry will no longer be displayed on the\n"
+"        front page, although you can feature it again at any point. Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on your\n"
+"      front page. Primary Features are placed at the top of the front page and are\n"
+"      much larger. Next are Secondary Features, which are slightly smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than Secondary\n"
+"      Features, and Secondary Features can display longer descriptions than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
+"      portion of its description will be displayed on your website's front page.\n"
+"      The number of characters displayed varies on the prominence of the feature.\n"
+"      Primary Features display the first 512 characters of their description,\n"
+"      Secondary Features display the first 256 characters of their description,\n"
+"      and Tertiary Features display the first 128 characters of their description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware that if\n"
+"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
+"      featured. Make sure that all your intended Media Entries are featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be sure to\n"
+"        have media featured as long as your instance has the 'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been sent"
+" with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your "
+"MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid ""
+"Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid ""
+"You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can <a "
+"href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 5f8770cb..00000000
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/mediagoblin.po
index 829bfc26..b80259cf 100644
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fr/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -8,20 +8,24 @@
 # chesuidayeur <chesuidayeur@yahoo.fr>, 2011
 # Bibit <crash_bibit@hotmail.com>, 2013
 # Fubik, 2013
+# gnujeremie <jeremie@gnujeremie.net>, 2014
 # joehillen <joehillen@gmail.com>, 2011
 # Laurent Pointecouteau <hell_pe@no-log.org>, 2013
 # loic_le.ninan, 2014
 # MarkTraceur <marktraceur@gmail.com>, 2011
+# Mathieu Gauthier-Pilote <mathieu.g.p@republiquelibre.org>, 2015
 # maxineb <maxineb@members.fsf.org>, 2011
+# Nathan Follens, 2015
 # spechard <sd@s13d.fr>, 2014
+# syl_, 2014
 # joar <transifex@wandborg.se>, 2011
 # Valentin Villenave <valentin@villenave.net>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -31,67 +35,167 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Désolé, l'inscription n'est pas activée sur ce serveur."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Désolé, le signalement est désactivé sur ce serveur. "
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Désolé, l'authentification est désactivée sur ce serveur."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Nom d'utilisateur ou adresse e-mail invalide."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Ce champ n'accepte pas les adresses e-mail."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Ce champ nécessite une adresse e-mail."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Désolé, un autre utilisateur utilise déjà ce nom."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Désolé, un autre utilisateur se sert déjà de cette adresse e-mail."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "La clé de vérification ou l'identifiant de l'utilisateur est incorrect."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Votre adresse e-mail a été vérifiée. Vous pouvez maintenant vous identifier, renseigner votre profil, et ajouter des images !"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "La clé de vérification ou le nom d'utilisateur est incorrect."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Vous devez être identifié afin que nous sachions à qui envoyer l'e-mail !"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Votre adresse e-mail a déjà été vérifiée !"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "E-mail de vérification renvoyé."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr "{username} a ajouté {object}"
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr "{username} a ajouté {object} a {target}"
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr "{username} est l'auteur de {object}"
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr "{username} a créé {object}"
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr "{username} a supprimé {object}"
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr "{username} a détesté {object}"
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr "{username} a favorisé {object}"
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr "{username} a suivit {object}"
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr "{username} a aimé {object}"
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr "{username} a affiché {object}"
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr "{username} a affiché {object} a {target}"
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr "{username} a partagé {object}"
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr "{username} a defavorisé {object}"
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr "{username} a arrêté de suivre {object}"
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr "{username} n'aime plus {object}"
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr "{username} ne partage plus {object}"
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr "{username} a mis à jour {object}"
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr "{username} a marqué {object}"
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -107,7 +211,7 @@ msgid "Description of this work"
 msgstr "Description de ce média"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -123,11 +227,11 @@ msgstr "Mots-clés"
 msgid "Separate tags by commas."
 msgstr "Séparez les mots-clés avec des virgules."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Référence"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "La référence doit être renseignée."
 
@@ -155,125 +259,137 @@ msgstr "Site web"
 msgid "This address contains errors"
 msgstr "Cette adresse contient des erreurs"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr "Lieu de naissance"
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Me prévenir par e-mail lorsqu'on commente mes médias"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Activer les notifications d'évènements sur le site."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Préférence de licence"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Cette licence sera sélectionnée par défaut lors de vos ajouts de médias."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Le titre doit être renseigné"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Description de cette collection"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Le texte utilisé dans l'URL de cette collection. Vous n'avez généralement pas besoin de le modifier."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Entrez votre ancien mot de passe pour prouver que vous êtes bien le propriétaire de ce compte."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Nouvelle adresse e-mail"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Mot de passe"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Entrez votre mot de passe pour prouver que vous êtes bien le propriétaire de ce compte."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr "Identifiant"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr "Valeur"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Un média portant la même référence existe déjà pour cet utilisateur."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Vous vous apprêtez à modifier le média d'un autre utilisateur. Veuillez prendre garde."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Vous avez ajouté la pièce jointe “%s� !"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Vous ne pouvez modifier que votre propre profil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez prendre garde."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Les modifications du profil ont été enregistrées"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Les préférences du compte ont été enregistrées"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr "Application inconnue, incapable d'annuler l'autorisation"
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr "L'application n'est plus autorisée"
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Vous devez confirmer la suppression de votre compte."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Vous possédez déjà une collection intitulée “%s� !"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Une collection portant la même référence existe déjà pour cet utilisateur."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Vous vous apprêtez à modifier la collection d'un autre utilisateur. Veuillez prendre garde."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Votre adresse e-mail a été vérifiée."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
@@ -304,7 +420,7 @@ msgstr "Saute \"%s\"; déjà défini.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Ancien lien trouvé pour \"%s\"; suppression.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -312,60 +428,60 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr "Pour plus d'informations sur la manière de lancer ce script\n(et comment formater le fichier csv), lisez la documentation\nde Mediagoblin sur l'upload en ligne de commande.\n <http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr "Utilisateur à qui appartiennent ces médias"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
-msgstr "Chemin vers le fichier CSV contenant les métadata."
+msgstr "Chemin vers le fichier CSV contenant les métadonnées."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr "Désolé, il n'existe pas d'utilisateur '{username}'"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr "Impossible trouver le fichier {path}, utiliser l'option -h pour de l'aide"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
-msgstr ""
+msgstr "ÉCHEC : Le fichier {filename} n'a pas pu être trouvé.\n{filename} ne sera pas uploadé."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
-msgstr ""
+msgstr "ÉCHEC : Ce fichier est plus grand que la taille autorisée pour ce site."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
-msgstr ""
+msgstr "ÉCHEC : Ce fichier ferait excéder la limite d'upload de l'utilisateur."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
-msgstr ""
+msgstr "ÉCHEC : Cet utilisateur a déjà dépassé sa limite d'upload."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
-msgstr ""
+msgstr "{files_uploaded} fichiers sur {files_attempted} ont été soumis correctement"
 
 #: mediagoblin/meddleware/csrf.py:134
 msgid ""
@@ -389,30 +505,30 @@ msgstr "Description"
 msgid "I am sure I want to delete this"
 msgstr "Je suis sûr de vouloir supprimer ce média"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Youhou, c'est envoyé !"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr "Vous avez effacé le blog."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Ce média n'a pas été supprimé car vous n'avez pas coché la case de confirmation. "
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
-msgstr ""
+msgstr "Vous êtes sur le point de supprimer le blogue d'un autre utilisateur. Soyez prudent."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
-msgstr ""
+msgstr "Le blogue n'a pas été supprimé car vous ne disposez pas du privilège de le faire."
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
 msgid "Add Blog Post"
@@ -430,7 +546,7 @@ msgstr "Effacer le blog"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Modifier"
 
@@ -440,13 +556,13 @@ msgstr "Modifier"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Supprimer"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
 msgid "<em> Go to list view </em>"
-msgstr ""
+msgstr "<em> Passer au mode liste </em>"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
 msgid " No blog post yet. "
@@ -557,56 +673,56 @@ msgstr "Quels privilèges souhaitez-vous révoquer ? "
 
 #: mediagoblin/moderation/forms.py:122
 msgid "Why user was banned:"
-msgstr ""
+msgstr "Raison du bannissement de l'utilisateur:"
 
 #: mediagoblin/moderation/forms.py:125
 msgid "Message to user:"
-msgstr ""
+msgstr "Message à l'utilisateur:"
 
 #: mediagoblin/moderation/forms.py:128
 msgid "Resolution content:"
-msgstr ""
+msgstr "Contenu de la résolution:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
-msgstr ""
+msgstr "\n{mod} a retiré les privilèges {privilege} de {user}."
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
-msgstr ""
+msgstr "\n{mod} a banni l'utilisateur {user} {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
-msgstr ""
+msgstr "jusqu'au {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "à perpétuité"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
-msgstr ""
+msgstr "\n{mod} a envoyé un email d'avertissement à {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
-msgstr ""
+msgstr "\n{mod} a supprimé le commentaire."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
-msgstr ""
+msgstr "\n{mod} a supprimé le media."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Avertissement de"
 
@@ -624,32 +740,32 @@ msgstr "Vous serez notifié pour les commentaires sur “%s� !"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Vous ne serez pas notifié pour les commentaires sur “%s�."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Doit fournir un oauth_token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Aucun jeton d'authentification n'a été trouvé dans la requête. "
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Désolé, la taille du fichier est trop importante. "
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Désolé, publier ce fichier vous fera dépasser votre limite d'ajout de médias. "
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Désolé, vous avez atteint votre limite d'ajout de médias. "
 
 #: mediagoblin/plugins/archivalook/forms.py:21
 msgid "Enter the URL for the media to be featured"
-msgstr ""
+msgstr "Saisissez l'adresse (URL) du média à mettre en avant-plan"
 
 #: mediagoblin/plugins/archivalook/tools.py:132
 msgid "Primary"
@@ -673,7 +789,7 @@ msgstr "Comment cela fonctionne-t-il ?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
 msgid "How to feature media?"
-msgstr ""
+msgstr "Comment mettre un média à l'avant-plan?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
 msgid ""
@@ -988,11 +1104,7 @@ msgstr "Envoyer les instructions"
 msgid "Forgot your password?"
 msgstr "Vous avez oublié votre mot de passe ?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Emplacement"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Localiser avec <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1003,11 +1115,11 @@ msgstr "Identifiez-vous pour créer un compte ! "
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
 msgid "Metadata"
-msgstr ""
+msgstr "Métadonnées"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
 msgid "Edit Metadata"
-msgstr ""
+msgstr "Modifier les métadonnées"
 
 #: mediagoblin/plugins/oauth/forms.py:29
 msgid "Allow"
@@ -1059,7 +1171,7 @@ msgstr "L'URI de redirection pour l'application, ce champ est <strong>obligatoir
 msgid "This field is required for public clients"
 msgstr "Ce champ est obligatoire pour les clients publics"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Le client {0} a été enregistré !"
 
@@ -1072,8 +1184,8 @@ msgid "Your OAuth clients"
 msgstr "Vos clients OAuth"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Désolé, un compte est déjà enregistré avec cet OpenID."
 
@@ -1081,39 +1193,39 @@ msgstr "Désolé, un compte est déjà enregistré avec cet OpenID."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Désolé, le serveur OpenID n'a pas pu être trouvé."
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Aucun service OpenID n'a été trouvé pour %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "La vérification de %s a échoué : %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Vérification annulée"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Votre url OpenID a été correctement enregistrée."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Vous ne pouvez pas supprimer votre seul URL OpenID sauf si vous avez défini un mot de passe"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Cet OpenID n'est pas lié à ce compte."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID a été retiré avec succès."
 
@@ -1137,7 +1249,7 @@ msgstr "OpenID"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1169,26 +1281,26 @@ msgstr "Ou s'enregistrer avec OpenID !"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Désolé, un compte est déjà enregistré avec cet e-mail Persona."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "L'adresse e-mail Persona a été retirée avec succès."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Vous ne pouvez pas supprimer votre seul e-mail Persona sauf si vous avez défini un mot de passe."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Cette adresse e-mail Persona n'est pas liée à ce compte."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Désolé, un compte est déjà enregistré avec cette adresse e-mail Persona."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Votre adresse e-mail Persona a été enregistrée avec succès."
 
@@ -1212,15 +1324,15 @@ msgstr "Ou s'identifier avec Persona !"
 msgid "Or register with Persona!"
 msgstr "Ou s'enregistrer avec Persona !"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Le fichier envoyé  ne correspond pas au type de média."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "La copie vers le stockage public a échoué."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "Aucun fichier pouvant être traité n'a été trouvé"
 
@@ -1239,11 +1351,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Vous pouvez utiliser \n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> pour la mise en page."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Vous devez fournir un fichier."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Collection “%s� ajoutée !"
@@ -1266,26 +1378,26 @@ msgstr "Vous avez été banni"
 msgid "until %(until_when)s"
 msgstr "jusqu'au %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Vérifiez votre adresse e-mail !"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "se déconnecter"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Compte de <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Modifier les préférences du compte"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1293,29 +1405,29 @@ msgstr "Modifier les préférences du compte"
 msgid "Media processing panel"
 msgstr "Panneau de traitement des médias"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Ajouter des médias"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Créer une nouvelle collection"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Panneau de gestion des utilisateurs"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Panneau de gestion des signalements"
 
@@ -1369,8 +1481,8 @@ msgid "Authorization Complete"
 msgstr "Autorisation terminée"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Copiez-collez ceci dans votre client :"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1460,13 +1572,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Modification des pièces jointes de “%(media_title)s�"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Pièces jointes"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Ajouter une pièce jointe"
 
@@ -1484,6 +1596,47 @@ msgstr "Enregistrer les modifications"
 msgid "Changing %(username)s's email"
 msgstr "Changement de l'adresse e-mail de %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "Il y a %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1509,7 +1662,7 @@ msgstr "Modification des préférences du compte de %(username)s"
 msgid "Delete my account"
 msgstr "Supprimer mon compte"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "E-mail"
 
@@ -1527,11 +1680,11 @@ msgstr "Modification du profil de %(username)s"
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:67
 #, python-format
 msgid "Metadata for \"%(media_name)s\""
-msgstr ""
+msgstr "Métadonnées pour \"%(media_name)s\""
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:72
 msgid "MetaData"
-msgstr ""
+msgstr "Métadonnées"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:80
 msgid "Add new Row"
@@ -1539,7 +1692,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:83
 msgid "Update Metadata"
-msgstr ""
+msgstr "Mettre à jour les métadonnées"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:87
 msgid "Clear empty Rows"
@@ -1563,19 +1716,6 @@ msgstr "Bonjour,\n\nNous voulons vérifier que vous êtes %(username)s. Si cela
 msgid "New comments"
 msgstr "Nouveaux commentaires"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "Il y a %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Tout marquer comme lu"
@@ -1588,38 +1728,38 @@ msgstr "Tout marquer comme lu"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Médias étiquetés avec : %(tag_name)s "
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Télécharger"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Désolé, ce fichier sonore ne sera pas joué car \n\tvotre navigateur web ne prend pas en charge \n\tle son au standard HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Vous pouvez obtenir un navigateur web à jour \n\tcapable de jouer les sons sur <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a> !"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Fichier original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "Fichier WebM (codec Vorbis)"
 
@@ -1627,70 +1767,70 @@ msgstr "Fichier WebM (codec Vorbis)"
 msgid "Created"
 msgstr "Créé"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Image de “%(media_title)s�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Fichier PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspective"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "De face"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Haut"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Côté"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Télécharger le modèle"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Format de fichier"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Hauteur de l'objet"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Désolé, ce fichier vidéo ne sera pas lu car\n      votre navigateur web ne prend pas en charge \n      la vidéo au standard HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Vous pouvez obtenir un navigateur web à jour \n      capable de lire les vidéos sur <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a> !"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "Fichier WebM (VP8/Vorbis)"
 
@@ -1775,7 +1915,7 @@ msgid "Return to Reports Panel"
 msgstr "Retourner au Panneau des signalements"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Signalement"
 
@@ -2081,17 +2221,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Ajouter un commentaire"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Ajouter ce commentaire"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Ajouté"
 
@@ -2163,12 +2303,12 @@ msgstr "Médias de <a href=\"%(user_url)s\">%(username)s</a> avec le mot-clé â€
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Médias de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Parcourir les médias de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Prévisualisation du commentaire"
 
@@ -2327,6 +2467,10 @@ msgstr "plus récent"
 msgid "older"
 msgstr "plus ancien"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Emplacement"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Signaler le média"
@@ -2335,38 +2479,38 @@ msgstr "Signaler le média"
 msgid "Tagged with"
 msgstr "Etiqueté avec"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Impossible de lire l'image."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Oups !"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Une erreur est survenue"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Mauvaise requête"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "La requête envoyée au serveur est non valide, veuillez la vérifier"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Opération non autorisée"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Je regrette Dave, cela m'est malheureusement impossible !</p><p>Vous avez essayé d'effectuer une action pour laquelle vous n'avez pas de permission. Avez-vous tenté de supprimer tous les comptes utilisateur à nouveau ?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2434,69 +2578,69 @@ msgstr "Vous pouvez utiliser\n<a href=\"http://daringfireball.net/projects/markd
 msgid "Reason for Reporting"
 msgstr "Raison du signalement"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Désolé, les commentaires sont désactivés."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Oups, votre commentaire était vide."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Votre commentaire a été ajouté !"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Veuillez vérifier vos entrées et réessayer."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Vous devez sélectionner ou ajouter une collection"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "“%s� est déjà dans la collection “%s�"
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "“%s� a été ajouté à la collection “%s�"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Vous avez supprimé le média."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Vous vous apprêtez à supprimer le média d'un autre utilisateur. Veuillez prendre garde."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Vous avez retiré cet élément de la collection."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "L'élément n'a pas été retiré car vous n'avez pas coché la case de confirmation."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Vous vous apprêtez à supprimer un élément de la collection d'un autre utilisateur. Veuillez prendre garde. "
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Vous avez supprimé la collection “%s�"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "La collection n'a pas été supprimée car vous n'avez pas coché la case de confirmation. "
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Vous vous apprêtez à supprimer la collection d'un autre utilisateur. Veuillez prendre garde."
diff --git a/mediagoblin/i18n/gl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/gl/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 63391773..00000000
--- a/mediagoblin/i18n/gl/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/gl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/gl/mediagoblin.po
index 16dc7bed..59073acd 100644
--- a/mediagoblin/i18n/gl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/gl/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/mediagoblin/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,67 +19,167 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Neste sitio non se permite rexistrar novas contas."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Neste sitio non se permite denunciar."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Neste sitio non se permite autenticarse."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "O nome de usuario ou enderezo de correo fornecidos son incorrectos."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Non pode introducir enderezos de correo neste campo."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Ten que introducir un enderezo de correo neste campo."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Xa existe un usuario con ese nome."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Xa existe un usuario con ese enderezo de correo."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "A chave de verificación ou o identificador do usuario son incorrectos."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Verificouse o seu enderezo de correo. Pode acceder ao sitio, editar o seu perfil, e enviar imaxes!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "A chave de verificación ou o identificador do usuario son incorrectos."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Primeiro debe acceder ao sitio para que saibamos a quen enviarlle o correo!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Xa verificamos o seu enderezo de correo!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Volver enviar o correo de verificación."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -95,7 +195,7 @@ msgid "Description of this work"
 msgstr "Descrición da obra"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -111,11 +211,11 @@ msgstr "Etiquetas"
 msgid "Separate tags by commas."
 msgstr "Separe as etiquetas mediante comas («,»)."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Código"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "O código non pode quedar baleiro."
 
@@ -143,125 +243,137 @@ msgstr "Sitio web"
 msgid "This address contains errors"
 msgstr "O enderezo contén erros."
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Recibir unha notificación por correo cando alguén comente a miña obra."
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Activar as notificacións no sitio web sobre acontecementos."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Preferencias de licenza"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Esta será a súa licenza predeterminada nos formularios de envío de obras."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "O título non pode quedar baleiro."
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Descrición da colección"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "A parte do título no enderezo a esta colección. Normalmente non necesita modificalo."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Contrasinal vello"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Introduza o contrasinal vello para demostrar que é o dono desta conta."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Novo enderezo de correo"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Contrasinal"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Introduza o contrasinal para demostrar que é o dono desta conta."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr "Identificador"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr "Valor"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "O seu usuario xa ten unha obra con ese código."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Está a editar unha obra doutro usuario. Teña coidado."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Anexou %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Só pode editar o seu propio perfil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Está a editar o perfil doutro usuario Teña coidado."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Gardáronse os cambios no perfil."
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Gardouse a configuración da conta."
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Debe confirmar a eliminación da súa conta."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Xa ten unha colección chamada «%s»!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "O seu usuario xa ten unha colección con ese código."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Está a editar unha colección doutro usuario Teña coidado."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Verificouse o seu enderezo de correo."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "O contrasinal é incorrecto."
 
@@ -292,7 +404,7 @@ msgstr "Saltándose «%s», xa está configurada.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Atopouse unha ligazón vella para «%s», e eliminouse.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -300,58 +412,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr "Para máis información sobre como executar correctamente\neste script e que formato usar para o ficheiro CSV de metadatos,\nlea a páxina de documentación de MediaGoblin sobre o envío de\ndatos desde a liña de ordes:\n<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr "Nome do usuario ao que pertencen estes contidos:"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr "Ruta do ficheiro CSV que contén os metadatos."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr "Procesar de maneira eficiente."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr "Non existe ningún usuario «{username}»."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr "Non se atopou ningún ficheiro en «{path}». Use a opción «-h» para acceder á axuda."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr "Produciuse un erro co valor «{error_path}» do contido «{media_id}»: {error_msg}\nNon foi posíbel subir os metadatos."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr "Erro: Non foi posíbel acceder ao ficheiro local «{filename}».\nNon se enviou o ficheiro."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr "Enviouse o ficheiro «{filename}».\nPode comprobar que se enviou correctamente desde o panel de procesamento de contidos do sitio web."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr "Erro: O tamaño do ficheiro supera o límite do sitio."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr "Erro: Non foi posíbel enviar o ficheiro porque o usuario superaría o límite de contido que se lle permite enviar."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr "Erro: O usuario xa superou o límite de contido que pode enviar."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr "Ficheiros enviados correctamente: {files_uploaded}/{files_attempted}."
 
@@ -377,28 +489,28 @@ msgstr "Descrición"
 msgid "I am sure I want to delete this"
 msgstr "Quero eliminalo, estou seguro"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Si! Enviado!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr "Enviáronse as modificacións da publicación."
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr "Eliminouse a bitácora."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Non se eliminou o contido porque non confirmou que estaba seguro."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr "Está a piques de eliminar a bitácora doutro usuario."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr "Non ten permisos para eliminar a bitácora."
 
@@ -418,7 +530,7 @@ msgstr "Eliminar a bitácora"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Editar"
 
@@ -428,7 +540,7 @@ msgstr "Editar"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -545,56 +657,56 @@ msgstr "Que privilexios vai retirarlle?"
 
 #: mediagoblin/moderation/forms.py:122
 msgid "Why user was banned:"
-msgstr ""
+msgstr "Motivo da prohibición de acceso:"
 
 #: mediagoblin/moderation/forms.py:125
 msgid "Message to user:"
-msgstr ""
+msgstr "Mensaxe ao usuario:"
 
 #: mediagoblin/moderation/forms.py:128
 msgid "Resolution content:"
-msgstr ""
+msgstr "Contido da resolución:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
-msgstr ""
+msgstr "\n{mod} retiroulle a {user} os privilexios de {privilege}."
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
-msgstr ""
+msgstr "\n{mod} prohibiulle o acceso a {user} {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
-msgstr ""
+msgstr "ata o {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "de maneira indefinida"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
-msgstr ""
+msgstr "\n{mod} enviou unha mensaxe de advertencia a {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
-msgstr ""
+msgstr "\n{mod} eliminou o comentario."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
-msgstr ""
+msgstr "\n{mod} eliminou a entrada multimedia."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Aviso de"
 
@@ -612,26 +724,26 @@ msgstr "Subscrito aos comentarios de %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Non recibirá notificacións sobre comentarios de %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Debe fornecer un «auth_token»."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Non se atopou o código da solicitude."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "O ficheiro é grande de máis."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "O tamaño do ficheiro é superior ao que resta do seu límite de envío."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Chegou ao seu límite de envío."
 
@@ -674,7 +786,7 @@ msgid ""
 "      inside the text box, click the Submit Query button, and your media should be\n"
 "      displayed on the front page.\n"
 "    "
-msgstr "\nAcceda á páxina do contido que quere descatar. Copie o seu enderezo URL e pégueo nunha liña nova da caixa de texto anterior. Non debería haber máis dun URL por liña. O URL que pegue debería estar baixo a cabeceira que mellor describa a prominencia coa que se debería destacar (principal, secundario, terciario). Unha vez teña todos os contidos que queira destacar na caixa de texto, prema «Enviar a consulta», e os seus contidos aparecerán na súa páxina principal."
+msgstr "\nAcceda á páxina do contido que quere destacar. Copie o seu enderezo URL e pégueo nunha liña nova da caixa de texto anterior. Non debería haber máis dun URL por liña. O URL que pegue debería estar baixo a cabeceira que mellor describa a prominencia coa que se debería destacar (principal, secundario, terciario). Unha vez teña todos os contidos que queira destacar na caixa de texto, prema «Enviar a consulta», e os seus contidos aparecerán na súa páxina principal."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
 msgid "Is there another way to manage featured media?"
@@ -700,7 +812,7 @@ msgid ""
 "        prominent and Demote moves the featured media lower down and makes it\n"
 "        less prominent.\n"
 "    "
-msgstr ""
+msgstr "\n        Así é. Se o prefire, pode ir á páxina principal do contido multimedia que\n        quere destacar ou deixar de destacar, e observar a barra lateral da \n        páxina. Se o contido non está destacado debería aparecer o botón\n        «Destacar». Prémao para destacar o contido como contido destacado\n        principal, na parte superior da páxina. O resto de contidos destacados\n        seguirán a estar destacados, pero aparecerán máis abaixo na páxina.\n        <br /><br />\n\n        Se accede á páxina dun contido que está actualmente destacado,\n        disporá das opcións «Deixar de destacar», «Promover» e «Degradar»\n        onde antes aparecía «Destacar». Prema «Deixar de destacar» para\n        deixar de mostrar o contido na páxina principal. Sempre poderá\n        destacalo de novo máis tarde. «Promover» aumenta a prominencia do\n        contido, mentres que «Degradar» a diminúe.\n    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
 msgid "What is a Primary Feature? What is a Secondary Feature?"
@@ -816,7 +928,7 @@ msgid ""
 "If you would like to feature a\n"
 "        piece of media, go to that media entry's homepage and click the button\n"
 "        that says <a class=\"button_action\">Feature</a>."
-msgstr ""
+msgstr "Se quere destacar un contido,\n        abra a páxina do contido e prema o botón\n        <a class=\"button_action\">Destacar</a>."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
 #, python-format
@@ -826,7 +938,7 @@ msgid ""
 "        have media featured as long as your instance has the 'archivalook'\n"
 "        plugin enabled. A more advanced tool to manage features can be found\n"
 "        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
-msgstr ""
+msgstr "Está a ver esta páxina porque a súa conta de usuario\n        dispón dos permisos necesarios para destacar contidos, a maior parte\n        dos usuarios non verán máis que unha páxina baleira, así que asegúrese\n        de destacar contidos sempre que a súa instalación teña activado o\n        complemento «archivalook». Atopará unha ferramenta máis avanzada\n        para a xestión de contidos destacados no\n        <a href=\"%(featured_media_url)s\">panel de xestión de contidos\n        destacados</a>."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
 msgid "View most recent media"
@@ -976,11 +1088,7 @@ msgstr "Enviar instrucións"
 msgid "Forgot your password?"
 msgstr "Esqueceu o contrasinal?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Lugar"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Ver en <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1047,7 +1155,7 @@ msgstr "O URI de redirección para os programas, este campo é <strong>obrigator
 msgid "This field is required for public clients"
 msgstr "O campo é obrigatorio para os clientes públicos."
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Rexistrouse o cliente {0}!"
 
@@ -1060,8 +1168,8 @@ msgid "Your OAuth clients"
 msgstr "Clientes de OAuth seus"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Xa hai unha conta rexistrada con ese OpenID."
 
@@ -1069,39 +1177,39 @@ msgstr "Xa hai unha conta rexistrada con ese OpenID."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Non se atopou o servidor de OpenID."
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Non se atopou ningún servizo de OpenID para %s."
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Non foi posíbel verificar %s: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Cancelouse a verificación."
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "O seu URL de OpenID gardouse correctamente."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Non pode eliminar o seu único URL de OpenID salvo que estableza previamente un contrasinal."
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Ese OpenID non está rexistrado con esta conta."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "O OpenID eliminouse correctamente."
 
@@ -1125,7 +1233,7 @@ msgstr "OpenIDs"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1157,26 +1265,26 @@ msgstr "Ou rexístrese con OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Xa hai unha conta rexistrada con ese enderezo de correo de Persona."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "O enderezo de correo da Persona eliminouse correctamente."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Non pode eliminar o seu único enderezo de correo de Persona salvo que estableza previamente un contrasinal."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "O enderezo de correo de Persona non está rexistrado para esta conta."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Xa hai unha conta rexistrada con ese enderezo de correo de Persona."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "O enderezo de correo da Persona gardouse correctamente."
 
@@ -1200,15 +1308,15 @@ msgstr "Ou acceda con Persona!"
 msgid "Or register with Persona!"
 msgstr "Ou rexístrese con Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "O ficheiro non se corresponde co tipo de contido."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Non foi posíbel copiar no almacenamento público."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "Non se atopou un ficheiro de procesamento aceptábel."
 
@@ -1227,11 +1335,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Pode usar\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                      Markdown</a> para dar formato."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Debe fornecer un ficheiro."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Engadiuse a colección «%s»!"
@@ -1254,26 +1362,26 @@ msgstr "Ten prohibido o acceso"
 msgid "until %(until_when)s"
 msgstr "ata %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Verifique o seu enderezo de correo!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "Saír"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Conta de <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Cambiar a configuración da conta"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1281,29 +1389,29 @@ msgstr "Cambiar a configuración da conta"
 msgid "Media processing panel"
 msgstr "Panel de procesamento de contidos"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Saír"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Engadir contidos"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Crear unha colección nova"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
-msgstr ""
+msgstr "Poderes de moderación:"
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Panel de xestión de usuarios"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Panel de xestión de denuncias"
 
@@ -1357,8 +1465,8 @@ msgid "Authorization Complete"
 msgstr "Completouse a autorización"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Copie isto e pégueo no seu cliente:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1448,13 +1556,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Editando os anexos de %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Anexos"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Engadir un anexo"
 
@@ -1472,6 +1580,47 @@ msgstr "Gardar os cambios"
 msgid "Changing %(username)s's email"
 msgstr "Cambiando o enderezo de correo de %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "Hai %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1497,7 +1646,7 @@ msgstr "Cambiando a configuración da conta de %(username)s"
 msgid "Delete my account"
 msgstr "Eliminar a miña conta"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -1551,19 +1700,6 @@ msgstr "Ola.\n\nQueremos verificar que vostede é efectivamente %(username)s. De
 msgid "New comments"
 msgstr "Comentarios novos"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "Hai %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Marcalo todo como lido"
@@ -1576,38 +1712,38 @@ msgstr "Marcalo todo como lido"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Contido etiquetado con: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Descargar"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Orixinal"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Este son non vai funcionar porque o seu navegador web non é compatíbel coa funcionalidade de son de HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Pode obter un navegador web moderno capaz de reproducir o son en <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Ficheiro orixinal"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "Ficheiro WebM (códec Vorbis)"
 
@@ -1615,70 +1751,70 @@ msgstr "Ficheiro WebM (códec Vorbis)"
 msgid "Created"
 msgstr "Creado"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Imaxe de %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Ficheiro PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Frontal"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Superior"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Lateral"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Descargar o modelo"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Formato do ficheiro"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Altura do obxecto"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Este vídeo non vai funcionar porque o seu navegador web non é compatíbel coa funcionalidade de vídeo de HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Pode obter un navegador web moderno capaz de reproducir o vídeo en <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "Ficheiro WebM (códec VP8/Vorbis)"
 
@@ -1703,20 +1839,20 @@ msgstr "Identificador"
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
 msgid "When submitted"
-msgstr ""
+msgstr "Ao enviarse"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
 msgid "Transcoding progress"
-msgstr ""
+msgstr "Progreso do cambio de codificación"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
 msgid "Unknown"
-msgstr ""
+msgstr "Descoñecido"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
@@ -1730,11 +1866,11 @@ msgstr "Non foi posíbel procesar os seguintes envíos:"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
 msgid "Reason for failure"
-msgstr ""
+msgstr "Motivo do erro"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
 msgid "Failure metadata"
-msgstr ""
+msgstr "Datos do erro"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
@@ -1747,7 +1883,7 @@ msgstr "Últimos 10 envíos sen erros"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
 msgid "Submitted"
-msgstr ""
+msgstr "Enviado"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
@@ -1763,7 +1899,7 @@ msgid "Return to Reports Panel"
 msgstr "Volver ao panel de denuncias"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Denuncia"
 
@@ -1791,7 +1927,7 @@ msgstr "\n          ELIMINOUSE\n          O CONTIDO DE\n            <a href=\"%(
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:102
 msgid "Reason for report:"
-msgstr ""
+msgstr "Motivo do informe:"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:133
 #: mediagoblin/templates/mediagoblin/moderation/user.html:136
@@ -2069,17 +2205,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Publicación de <a href=\"%(user_url)s\">%(username)s</a>."
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Engadir un comentario"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Engadir o comentario"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Engadido"
 
@@ -2151,12 +2287,12 @@ msgstr "Contidos de <a href=\"%(user_url)s\">%(username)s</a> etiquetado con <a
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Contidos de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Explorando os contidos de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Vista previa"
 
@@ -2273,11 +2409,11 @@ msgstr "Engadir a unha colección"
 
 #: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
 msgid "Subscribe to comments"
-msgstr ""
+msgstr "Subscribirse aos comentarios"
 
 #: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
 msgid "Silence comments"
-msgstr ""
+msgstr "Silenciar os comentarios"
 
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
@@ -2315,6 +2451,10 @@ msgstr "máis novo"
 msgid "older"
 msgstr "máis vello"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Lugar"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Denunciar o contido"
@@ -2323,38 +2463,38 @@ msgstr "Denunciar o contido"
 msgid "Tagged with"
 msgstr "Etiquetado con"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Non foi posíbel ler o ficheiro da imaxe."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Ups!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Produciuse un erro."
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Petición incorrecta"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "A petición enviada ao servidor é incorrecta, compróbea."
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Operación non permitida"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Intentou utilizar unha función para a que non ten permisos. Que foi, volveu intentar eliminar todas as contas de usuario outra vez?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2422,69 +2562,69 @@ msgstr "Pode usar\n                      <a href=\"http://daringfireball.net/pro
 msgid "Reason for Reporting"
 msgstr "Motivo da denuncia"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Os comentarios están desactivados."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "O comentario estaba baleiro."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Publicouse o comentario!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Comprobe as entradas e vólvao intentar."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Ten que seleccionar ou engadir unha colección."
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "«%s» xa está na colección «%s»"
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "«%s» engadiuse á colección «%s»"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Eliminou o contido."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Está a piques de eliminar un contido doutro usuario. Teña coidado."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Eliminou o elemento da colección."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Non se retirou o elemento porque non confirmou que estaba seguro."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Está a piques de retirar un elemento da colección doutro usuario Teña coidado."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Eliminou a colección «%s»"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Non se eliminou a colección porque non confirmou que estaba seguro."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Está a piques de eliminar unha colección doutro usuario Teña coidado."
diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 3746f9fe..00000000
--- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/mediagoblin.po
index e48cdabe..7df3d153 100644
--- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/he/mediagoblin.po
@@ -1,87 +1,191 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
 # GenghisKhan <genghiskhan@gmx.ca>, 2013-2014
 # GenghisKhan <genghiskhan@gmx.ca>, 2012
 # GenghisKhan <genghiskhan@gmx.ca>, 2012
+# efraim <efraim@flashner.co.il>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-23 12:23+0000\n"
-"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/mediagoblin/language/he/)\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-02-16 10:19+0000\n"
+"Last-Translator: efraim <efraim@flashner.co.il>\n"
+"Language-Team: Hebrew "
+"(http://www.transifex.com/projects/p/mediagoblin/language/he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"Generated-By: Babel 1.3\n"
+"X-POOTLE-MTIME: 1424081952.0\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "לצערנו, רישו� הינו מנוטרל על שרת זה."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "לצערנו, דיווח הינו מנוטרלי� על שרת זה."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "לצערנו, �ימות הינו מנוטרל על שרת זה."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "ש� משתמש �ו דו�״ל שגויי�."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
-msgstr "שדה זה ל� לוקח כתובות דו�״ל."
+msgstr "שדה זה ל� מקבל כתובות דו�״ל."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "שדה זה מצריך כתובת דו�״ל."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "לצערנו, משתמש ע� ש� זה כבר קיי�."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "לצערנו, משתמש ע� כתובת דו�״ל זו כבר קיי�."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "מפתח ה�ימות �ו מזהה המשתמש �ינו מדויק."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "כתובת הדו�״ל שלך �ומתה. כעת ב�פשרותך להתחבר, לערוך �ת דיוקנך, ולשלוח תמונות!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "מפתח ה�ימות �ו זהות משתמש הינ� שגויי�"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "עליך להתחבר על מנת שנדע �ל מי לשלוח �ת הדו�״ל!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "כבר �ימתת �ת כתובת הדו�״ל שלך!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "שלח שוב �ת דו�״ל ה�ימות שלך."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr "{username} חיבר {object}"
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr "{username} יצר {object}"
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr "{username} מחק {object}"
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr "{username} פירס� {object}"
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr "{username} עדכן {object}"
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -97,7 +201,7 @@ msgid "Description of this work"
 msgstr "תי�ור של מל�כה זו"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -113,11 +217,11 @@ msgstr "תגיות"
 msgid "Separate tags by commas."
 msgstr "הפרד תגיות בעזרת פסיקי�."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "חשופית"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "החשופית ל� יכולה להיות ריקה"
 
@@ -145,125 +249,137 @@ msgstr "�תר רשת"
 msgid "This address contains errors"
 msgstr "כתובת זו מכילה שגי�ות"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "שלח לי דו�״ל כ�שר �חרי� מגיבי� על המדיה שלי"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "עדיפות רשיון"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "זה יהיה הרשיוןן המשתמט (ברירת מחדל) שלך בטופסי העל�ה."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "הכותרת ל� יכולה להיות ריקה"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "תי�ור �וסף זה"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "�זור הכותרת של כתובת �וסף זה. לרוב �ין הכרח לשנות �ת חלק זה."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "סיסמה ישנה"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "הזן �ת סיסמתך הישנה כדי להוכיח ש�תה הבעלי� של חשבון זה."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "סיסמה חדשה"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "כתובת דו�״ל חדשה"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "סיסמה"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "הזן �ת הסיסמה שלך כדי להוכיח כי �תה הבעלי� של חשבון זה."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr "מזהה"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr "ערך"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "רשומה ע� חשופית זו כבר קיימת עבור משתמש זה."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "�תה עורך מדיה של משתמש �חר. המשך בזהירות."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "הוספת �ת התצריף %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "ב�פשרותך לערוך רק �ת הדיוקן שלך."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "�תה עורך דיוקן של משתמש. המשך בזהירות."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "שינויי דיוקן נשמרו"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "הגדרות חשבון נשמרו"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "עליך ל�מת �ת המחיקה של חשבונך."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "כבר יש לך �וסף שקרוי בש� \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "�וסף ע� חשופית זו כבר קיי� עבור משתמש זה."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "�תה עורך �וסף של משתמש �חר. המשך בזהירות."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "כתובת הדו�״ל שלך �ומתה."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "סיסמה שגויה"
 
@@ -294,7 +410,7 @@ msgstr "מדלג על \"%s\"; כבר מוגדר.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "קישור ישן נמצ� עבור \"%s\"; מסיר כעת.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -302,58 +418,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr "ש� משתמש לו שייכי� ערכי מדיה �לו"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr "נתיב �ל קובץ csv �שר מכיל מידע-מוצמד."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr "לצערנו, ל� קיי� משתמש העונה על ש� משתמש '{username}'"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr "{files_uploaded} מתוך {files_attempted} קבצי� נשלחו בהצלחה"
 
@@ -362,7 +478,7 @@ msgid ""
 "CSRF cookie not present. This is most likely the result of a cookie blocker "
 "or somesuch.<br/>Make sure to permit the settings of cookies for this "
 "domain."
-msgstr "עוגיית CSRF ל� נוכחת. זה קרוב לווד�י נובע משו� חוס� עוגייה �ו משהו בסגנון.<br/>הבטח קביעה של עוגיות עבור תחו� זה."
+msgstr "עוגיית CSRF ל� נמצ�ת. זה נובע כנר�ה משו� חוס� עוגייה.<br/>וד� להבטיח התרה של עוגיות עבור תחו� זה."
 
 #: mediagoblin/media_types/__init__.py:79
 #: mediagoblin/media_types/__init__.py:101
@@ -379,28 +495,28 @@ msgstr "תי�ור"
 msgid "I am sure I want to delete this"
 msgstr "�ני בטוח שברצוני למחוק ז�ת"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "הידד! נשלח!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr "מחקת �ת הבלוג."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "המדיה ל� נמחקה מכיוון של� סימנת ש�תה בטוח."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr "בחרת למחוק בלוג של משתמש �חר. המשך בזהירות."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr "הבלוג ל� נמחק מהסיבה כי �ין לך זכויות."
 
@@ -420,7 +536,7 @@ msgstr "מחק בלוג"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "ערוך"
 
@@ -430,17 +546,17 @@ msgstr "ערוך"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "מחק"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
 msgid "<em> Go to list view </em>"
-msgstr ""
+msgstr "<em> עבור �ל תצוגת רשימה </em>"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
 msgid " No blog post yet. "
-msgstr "�ין עוד פרסו� בלוג."
+msgstr " �ין עוד פרסו� בלוג. "
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -503,7 +619,7 @@ msgstr "צור בלוג"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
 msgid " Blog Dashboard "
-msgstr "מסד נתוני� בלוג"
+msgstr " מסד נתוני� בלוג "
 
 #: mediagoblin/media_types/pdf/processing.py:142
 msgid "unoconv failing to run, check log file"
@@ -557,46 +673,48 @@ msgstr "הודעה �ל משתמש:"
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
-msgstr "\n {mod} נטל פריבילגיות {privilege} של {user}."
+msgstr ""
+"\n"
+"{mod} נטל פריבילגיות {privilege} של {user}."
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr "\n {mod} �סר משתמש {user} {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr "עד {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "לצמיתה"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr "\n{mod} שלח דו�״ל �זהרה �ל {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr "\n {mod} מחק �ת התגובה."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr "\n {mod} מחק �ת רשומת המדיה."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "�זהרה מ�ת"
 
@@ -614,26 +732,26 @@ msgstr "הירש� �ל תגובות בתוך %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "�תה ל� תקבל התר�ות עבור הודעות על %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "יש לספק oauth_token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "ל� נמצ�ה �ות בקשה."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "לצערנו, גודל הקובץ גדול מדי."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "לצערנו, העל�ת קובץ זה תשי� �ותך למעלה מן גבול ההעל�ה שלך."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "לצערנו, חצית �ת מגבלת ההעל�ה."
 
@@ -898,7 +1016,7 @@ msgstr "ש� משתמש �ו דו�״ל"
 msgid ""
 "If that email address (case sensitive!) is registered an email has been sent"
 " with instructions on how to change your password."
-msgstr "במידה וכתובת הדו�״ל הזו (תלוי רישיות!) רשומה דו�״ל נשלח ע� הור�ות בנוגע לכיצד לשנות �ת סיסמתך."
+msgstr "�� כתובת דו�״ל זו (תלוית רישיות!) רשומה, דו�״ל נשלח בצירוף הור�ות לגבי שינוי הסיסמה שלך."
 
 #: mediagoblin/plugins/basic_auth/views.py:65
 msgid "Couldn't find someone with that username."
@@ -913,7 +1031,7 @@ msgstr "דו�״ל נשלח בצירוף הור�ות בנוגע לכיצד ני
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr "ל� היה ניתן לשלוח דו�״ל לשחזור סיסמה מ�חר וש� המשתמש שלך �ינו פעיל �ו שכתובת הדו�״ל של חשבונך ל� �ומתה."
+msgstr "ל� היה ניתן לשלוח דו�״ל לש� שחזור סיסמה מ�חר וש� המשתמש שלך �ינו פעיל �ו שכתובת הדו�״ל של חשבונך ל� �ומתה."
 
 #: mediagoblin/plugins/basic_auth/views.py:123
 msgid "The user id is incorrect."
@@ -978,11 +1096,7 @@ msgstr "שלח הור�ות"
 msgid "Forgot your password?"
 msgstr "שכחת �ת סיסמתך?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "מיקו�"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "הצג בתוך <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1049,7 +1163,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr "שדה זה הינו דרוש עבור לקוחות פומביי�"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "הלקוח {0} נרש�!"
 
@@ -1062,8 +1176,8 @@ msgid "Your OAuth clients"
 msgstr "לקוחות OAuth שלך"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "לצערנו, קיי� כבר חשבון �שר רשו� ע� OpenID."
 
@@ -1071,39 +1185,39 @@ msgstr "לצערנו, קיי� כבר חשבון �שר רשו� ע� OpenID."
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "לצערנו, שרת OpenID ל� היה יכול להימצ�"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "ל� נמצ� שירות OpenID עבור %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "�ימות של %s נכשל: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "�ימות בוטל"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "כתובת OpenID נשמרה בהצלחה."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "�ין ב�פשרותך למחוק כתובת  כ�שר זו היחידה שלך �ל� �� כן הגדרת סיסמה."
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "כתובת  זו ל� רשומה לחשבון זה."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID הוסר בהצלחה."
 
@@ -1127,7 +1241,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1159,26 +1273,26 @@ msgstr "�פשר להירש� ג� בעזרת OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "לצערנו, קיי� כבר חשבון �שר רשו� ל�ישיות דו�״ל זו."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "כתובת דו�״ל �ישיות הוסרה בהצלחה."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "�ין ב�פשרותך למחוק כתובת דו�״ל �ישיות כ�שר זו היחידה שלך �ל� �� כן הגדרת סיסמה."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "כתובת דו�״ל �ישיות זו ל� רשומה לחשבון זה."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "לצערנו, קיי� כבר חשבון �שר רשו� ע� �ישיות כתובת דו�״ל זו."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "כתובת דו�״ל �ישיות נשמרה בהצלחה."
 
@@ -1202,15 +1316,15 @@ msgstr "�ו תתחבר ע� �ישיות!"
 msgid "Or register with Persona!"
 msgstr "�ו רשו� �ישיות חדשה!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "ניתן קובץ שגוי עבור טיפוס מדיה."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "העתקה �ל �חסון פומבי נכשלה."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "קובץ עיבוד קביל ל� נמצ�"
 
@@ -1229,11 +1343,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "ב�פשרותך להשתמש בתחביר\n                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                        Markdown</a> עבור עיצוב."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "עליך לספק קובץ."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "�וסף \"%s\" התווסף!"
@@ -1256,26 +1370,26 @@ msgstr "נ�סרת"
 msgid "until %(until_when)s"
 msgstr "עד %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "�מת �ת הדו�״ל שלך!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
-msgstr "התנתקות"
+msgstr "התנתק"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "החשבון של <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "שנה הגדרות חשבון"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1283,29 +1397,29 @@ msgstr "שנה הגדרות חשבון"
 msgid "Media processing panel"
 msgstr "לוח עיבוד מדיה"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
-msgstr "התנתקות"
+msgstr "התנתק"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "הוספת מדיה"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "צור �וסף חדש"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "לוח ניהול משתמש"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "לוח �רגון דיווחי�"
 
@@ -1359,8 +1473,8 @@ msgid "Authorization Complete"
 msgstr "הרש�ה הושלמה"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "העתק והדבק �ת מידע זה �ל תוך הלקוח שלך:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1450,13 +1564,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "עריכת תצריפי� עבור %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "תצריפי�"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "הוספת תצריף"
 
@@ -1474,6 +1588,47 @@ msgstr "שמור שינויי�"
 msgid "Changing %(username)s's email"
 msgstr "שינוי דו�״ל של %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr "טיפוס:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "לפני %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1499,7 +1654,7 @@ msgstr "שינוי הגדרות חשבון עבור %(username)s"
 msgid "Delete my account"
 msgstr "מחק �ת החשבון שלי"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "דו�״ל"
 
@@ -1553,19 +1708,6 @@ msgstr "שלו�,\n\nברצוננו ל�מת כי הינך %(username)s. �� כ
 msgid "New comments"
 msgstr "תגובות חדשות"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "לפני %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "סמן הכל כנקר�"
@@ -1578,38 +1720,38 @@ msgstr "סמן הכל כנקר�"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "מדיה מתויגת ע�: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "הורד"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "מקורית"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "לצערנו, �ודיו זה ל� יעבוד מכיוון \n\tשדפדפן הרשת שלך ל� תומך \n\t�ודיו של HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "ב�פשרותך להשיג דפדפן רשת מודרני \n\tשכן מסוגל לנגן �ת �ודיו זה ב�תר <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "קובץ מקורי"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "קובץ WebM (קודק Vorbis)"
 
@@ -1617,70 +1759,70 @@ msgstr "קובץ WebM (קודק Vorbis)"
 msgid "Created"
 msgstr "נוצר"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "תמונה עבור %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "קובץ PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "נקודת מבט"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "לפני�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "ר�ש"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "צד"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "הורד מודל"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "פורמט קובץ"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "גובה �ובייקט"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "לצערנו, ויד�ו זה ל� יעבוד מכיוון \n      שדפדפן הרשת שלך ל� תומך \n      ויד�ו של HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "ב�פשרותך להשיג דפדפן רשת מודרני \n      שכן מסוגל לנגן �ת ויד�ו זה ב�תר <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "קובץ WebM &rlm;(VP8/Vorbis)"
 
@@ -1765,7 +1907,7 @@ msgid "Return to Reports Panel"
 msgstr "חזור �ל לוח דיווחי�"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "דווח"
 
@@ -2071,17 +2213,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� פרסו� בלוג מ�ת <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "הוסף תגובה"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "הוסף �ת תגובה זו"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "התווספה"
 
@@ -2153,12 +2295,12 @@ msgstr "מדיה משתמש <a href=\"%(user_url)s\">%(username)s</a> ×¢×� תג×
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "המדיה של <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� דפדוף במדיה של <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "תצוגת תגובה"
 
@@ -2208,7 +2350,7 @@ msgstr "\n            � פורסמה על ידי <a href=\"%(user_url)s\"\n
 
 #: mediagoblin/templates/mediagoblin/user_pages/report.html:81
 msgid "File Report "
-msgstr "מל� דיווח"
+msgstr "מל� דיווח "
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:53
 msgid "Here's a spot to tell others about yourself."
@@ -2317,6 +2459,10 @@ msgstr "חדש יותר"
 msgid "older"
 msgstr "ישן יותר"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "מיקו�"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "דווח על מדיה"
@@ -2325,38 +2471,38 @@ msgstr "דווח על מדיה"
 msgid "Tagged with"
 msgstr "מתויגת ע�"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "ל� היה ניתן לקרו� �ת קובץ התמונה."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "�ופס!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "�ירעה שגי�ה"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "בקשה רעה"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "הבקשה �שר נשלחה �ל השרת הינה שגויה, �נ� בחן �ותה היטב"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "פעולה ל� מורשית"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "צר לי דייב, �ני ל� יכול להתיר לך לעשות ז�ת!</p><p>ניסית לבצע פעולה �שר �ינך מורשה לעשות. ה�� שוב ניסית למחוק �ת כל חשבונות המשתמש?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2424,69 +2570,69 @@ msgstr "ב�פשרותך להשתמש בתחביר\n                      <a hre
 msgid "Reason for Reporting"
 msgstr "סיבת דיווח"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "לצערנו, תגובות מנוטרלות."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "�ופס, תגובתך היתה ריקה."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "תגובתך פורסמה!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "�נ� בדוק �ת רשומותיך ונסה שוב."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "עליך לבחור �ו להוסיף �וסף"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" כבר קיי� ב�וסף \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" התווספה �ל ה�וסף \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "מחקת �ת מדיה זו."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "בחרת למחוק מדיה של משתמש �חר. המשך בזהירות."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "מחקת �ת הפריט מן �וסף זה."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "הפריט ל� הוסר מכיוון של� סימנת ש�תה בטוח."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "בחרת למחוק פריט מן �וסף של משתמש �חר. המשך בזהירות."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "מחקת �ת ה�וסף \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "ה�וסף ל� הוסר מכיוון של� סימנת ש�תה בטוח."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "בחרת למחוק �וסף של משתמש �חר. המשך בזהירות."
diff --git a/mediagoblin/i18n/hi/mediagoblin.po b/mediagoblin/i18n/hi/mediagoblin.po
new file mode 100644
index 00000000..432d8365
--- /dev/null
+++ b/mediagoblin/i18n/hi/mediagoblin.po
@@ -0,0 +1,2681 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-18 16:03-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: hi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.10.0\n"
+"Generated-By: Babel 1.3\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your "
+"profile, and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure "
+"it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie "
+"blocker or somesuch.<br/>Make sure to permit the settings of cookies for "
+"this domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's "
+"URL and\n"
+"      then paste it into a new line in the text box above. There should "
+"be only\n"
+"      one url per line. The url that you paste into the text box should "
+"be under\n"
+"      the header describing how prominent a feature it will be (whether "
+"Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to "
+"feature are\n"
+"      inside the text box, click the Submit Query button, and your media "
+"should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the"
+" piece\n"
+"        of media you would like to feature or unfeature and look at the "
+"bar to\n"
+"        the side of the media entry. If the piece of media has not been "
+"featured\n"
+"        yet you should see a button that says \"Feature\". Press that "
+"button and\n"
+"        the media will be featured as a Primary Feature at the top of the"
+" page.\n"
+"        All other featured media entries will remain as features, but "
+"will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is "
+"currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and"
+" \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". "
+"Click\n"
+"        Unfeature and that media entry will no longer be displayed on the"
+"\n"
+"        front page, although you can feature it again at any point. "
+"Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and "
+"makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on "
+"your\n"
+"      front page. Primary Features are placed at the top of the front "
+"page and are\n"
+"      much larger. Next are Secondary Features, which are slightly "
+"smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br "
+"/><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than "
+"Secondary\n"
+"      Features, and Secondary Features can display longer descriptions "
+"than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail "
+"and a\n"
+"      portion of its description will be displayed on your website's "
+"front page.\n"
+"      The number of characters displayed varies on the prominence of the "
+"feature.\n"
+"      Primary Features display the first 512 characters of their "
+"description,\n"
+"      Secondary Features display the first 256 characters of their "
+"description,\n"
+"      and Tertiary Features display the first 128 characters of their "
+"description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and "
+"then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware "
+"that if\n"
+"      you make a typo, once you press Submit Query, your media entry will"
+" NOT be\n"
+"      featured. Make sure that all your intended Media Entries are "
+"featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the "
+"button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be "
+"sure to\n"
+"        have media featured as long as your instance has the "
+"'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be "
+"found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management "
+"panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been "
+"sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid "An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or "
+"your account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can "
+"not be\n"
+"                intercepted by the user agent (e.g. server-side "
+"client).<br />\n"
+"                <strong>Public</strong> - The client can't make "
+"confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-"
+"side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a "
+"password set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid "Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> "
+"project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a"
+" href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, "
+"an extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your"
+" MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" "
+"href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your "
+"own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing"
+" the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then"
+" \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can "
+"ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid "Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them."
+"\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at "
+"%(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid "You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid "An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to"
+" be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can "
+"<a href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're "
+"sure the address is correct, maybe the page you're looking for has been "
+"moved or deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed "
+"with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were "
+"sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid "You are about to delete another user's collection. Proceed with caution."
+msgstr ""
diff --git a/mediagoblin/i18n/hu/mediagoblin.po b/mediagoblin/i18n/hu/mediagoblin.po
new file mode 100644
index 00000000..42984b53
--- /dev/null
+++ b/mediagoblin/i18n/hu/mediagoblin.po
@@ -0,0 +1,2629 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/mediagoblin/language/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie blocker "
+"or somesuch.<br/>Make sure to permit the settings of cookies for this "
+"domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
+"      then paste it into a new line in the text box above. There should be only\n"
+"      one url per line. The url that you paste into the text box should be under\n"
+"      the header describing how prominent a feature it will be (whether Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
+"      inside the text box, click the Submit Query button, and your media should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
+"        of media you would like to feature or unfeature and look at the bar to\n"
+"        the side of the media entry. If the piece of media has not been featured\n"
+"        yet you should see a button that says \"Feature\". Press that button and\n"
+"        the media will be featured as a Primary Feature at the top of the page.\n"
+"        All other featured media entries will remain as features, but will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". Click\n"
+"        Unfeature and that media entry will no longer be displayed on the\n"
+"        front page, although you can feature it again at any point. Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on your\n"
+"      front page. Primary Features are placed at the top of the front page and are\n"
+"      much larger. Next are Secondary Features, which are slightly smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than Secondary\n"
+"      Features, and Secondary Features can display longer descriptions than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
+"      portion of its description will be displayed on your website's front page.\n"
+"      The number of characters displayed varies on the prominence of the feature.\n"
+"      Primary Features display the first 512 characters of their description,\n"
+"      Secondary Features display the first 256 characters of their description,\n"
+"      and Tertiary Features display the first 128 characters of their description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware that if\n"
+"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
+"      featured. Make sure that all your intended Media Entries are featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be sure to\n"
+"        have media featured as long as your instance has the 'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been sent"
+" with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your "
+"MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid ""
+"Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid ""
+"You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can <a "
+"href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""
diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 8219c9bd..00000000
--- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/mediagoblin.po
index 6ab61e71..2a774d1d 100644
--- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ia/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/mediagoblin/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -20,67 +20,167 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr ""
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -96,7 +196,7 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -112,11 +212,11 @@ msgstr "Etiquettas"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -144,125 +244,137 @@ msgstr "Sito web"
 msgid "This address contains errors"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Contrasigno"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr ""
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr ""
 
@@ -293,7 +405,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -301,58 +413,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -378,28 +490,28 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -419,7 +531,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
@@ -429,7 +541,7 @@ msgstr ""
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
@@ -556,46 +668,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -613,26 +725,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -977,11 +1089,7 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr ""
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
@@ -1048,7 +1156,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1061,8 +1169,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1070,39 +1178,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1126,7 +1234,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1158,26 +1266,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1201,15 +1309,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1228,11 +1336,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr ""
@@ -1255,26 +1363,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1282,29 +1390,29 @@ msgstr ""
 msgid "Media processing panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1358,7 +1466,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1449,13 +1557,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr ""
 
@@ -1473,6 +1581,47 @@ msgstr ""
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1498,7 +1647,7 @@ msgstr ""
 msgid "Delete my account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1552,19 +1701,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1577,38 +1713,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1616,70 +1752,70 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1764,7 +1900,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2070,17 +2206,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr ""
 
@@ -2152,12 +2288,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2316,6 +2452,10 @@ msgstr ""
 msgid "older"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2324,38 +2464,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr ""
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr ""
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2423,69 +2563,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 582c12b7..00000000
--- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/is_IS/mediagoblin.po
index 62091875..8a897aab 100644
--- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/is_IS/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Icelandic (Iceland) (http://www.transifex.com/projects/p/mediagoblin/language/is_IS/)\n"
 "MIME-Version: 1.0\n"
@@ -22,67 +22,167 @@ msgstr ""
 "Language: is_IS\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Því miður er nýskráning ekki leyfð á þessu svæði."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Því miður eru tilkynningar óvirkar á þessum vef."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Því miður er auðkenning ekki möguleg á þessu vefsvæði."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Ógilt notandanafn eða netfang"
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Þessi reitur tekur ekki við netföngum."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "í þennan reit verður að slá inn tölvupóstfang."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Því miður er nú þegar til notandi með þetta nafn."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Því miður þá er annar notandi í kerfinu með þetta netfang skráð."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "Staðfestingarlykillinn eða notendaauðkennið er rangt."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Netfangið þitt hefur verið staðfest. Þú getur núna innskráð þig, breytt kenniskránni þinni og sent inn efni!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Staðfestingarlykillinn eða notendaauðkennið er rangt"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Þú verður að hafa innskráð þig svo við vitum hvert á að senda tölvupóstinn!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Þú hefur staðfest netfangið þitt!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Endursendi staðfestingartölvupóst"
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -98,7 +198,7 @@ msgid "Description of this work"
 msgstr "Lýsing á þessu efni"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -114,11 +214,11 @@ msgstr "Efnisorð"
 msgid "Separate tags by commas."
 msgstr "Aðskildu efnisorðin með kommum."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Vefslóðarormur"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Vefslóðarormurinn getur ekki verið tómur"
 
@@ -146,125 +246,137 @@ msgstr "Vefsíða"
 msgid "This address contains errors"
 msgstr "Þetta netfang inniheldur villur"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Senda mér tölvupóst þegar einhver bætir athugasemd við efnið mitt"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Virkja innri tilkynningar um viðburði."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Stilling á notkunarleyfi"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Þetta verður sjálfgefna leyfið þegar þú vilt hlaða upp efni."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Þessi titill getur verið innihaldslaus"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Lýsing á þessu albúmi"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Titilhlutinn í vefslóð þessa albúms. Þú þarft vanalega ekki að breyta þessu."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Gamla lykilorðið"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Skráðu gamla lykilorðið þitt til að sanna að þú átt þennan aðgang."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Nýtt netfang"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Lykilorð"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Sláðu inn lykilorðið þitt til að sanna að þú eigir þennan aðgang."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Efni merkt með þessum vefslóðarormi er nú þegar til fyrir þennan notanda."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Þú ert að breyta efni annars notanda. Farðu mjög varlega."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Þú bættir við viðhenginu %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Þú getur bara breytt þinni eigin kenniskrá."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Þú ert að breyta kenniskrá notanda. Farðu mjög varlega."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Breytingar á kenniskrá vistaðar"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Aðgangsstillingar vistaðar"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Þú verður að samþykkja eyðingu á notandaaðganginum þínum."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Þú hefur nú þegar albúm sem kallast \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Albúm með þessu vefslóðarormi er nú þegar til fyrir þennan notanda."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Þú ert að breyta albúmi annars notanda. Farðu mjög varlega."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Netfangið þitt hefur verið staðfest."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Rangt lykilorð"
 
@@ -295,7 +407,7 @@ msgstr "Hoppa yfir \"%s\"; hefur nú þegar verið sett upp.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Gamall tengill fannst fyrir \"%s\"; fjarlægi.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -303,58 +415,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -380,28 +492,28 @@ msgstr "Lýsing"
 msgid "I am sure I want to delete this"
 msgstr "Ég er viss um að ég vilji eyða þessu"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Jibbí jei! Það tókst að senda inn!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Efninu var ekki eytt þar sem þú merktir ekki við að þú værir viss."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -421,7 +533,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Breyta"
 
@@ -431,7 +543,7 @@ msgstr "Breyta"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Eyða"
 
@@ -558,46 +670,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "ótilgreint"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Viðvörun frá"
 
@@ -615,26 +727,26 @@ msgstr "Þú ert nú áskrifandi að athugasemdum „%s“!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Þú færð tilkynningar þegar einhver skrifar athugasemd við „%s“."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Þú verður að gefa upp OAuth tóka (oauth_token)."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Engin beiðni fannst."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Því miður er skráin of stór."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Því miður mun upphal á þessari skrá sprengja upphalshámarkið þitt."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Því miður hefur þú náð upphalshámarki"
 
@@ -979,11 +1091,7 @@ msgstr "Senda leiðbeiningar"
 msgid "Forgot your password?"
 msgstr "Gleymdirðu lykilorðinu þínu?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Staðsetning"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Skoða á <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1050,7 +1158,7 @@ msgstr "�framsendingarvefslóðin fyrir forritin, þessi reitur\n            er
 msgid "This field is required for public clients"
 msgstr "Þessi reitur er nauðsynlegur fyrir opinbera biðlara"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Biðlarinn {0} hefur verið skráður!"
 
@@ -1063,8 +1171,8 @@ msgid "Your OAuth clients"
 msgstr "OAuth-biðlararnir þínir"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Því miður er annar aðgangur nú þegar skráður fyrir þetta OpenID auðkenni."
 
@@ -1072,39 +1180,39 @@ msgstr "Því miður er annar aðgangur nú þegar skráður fyrir þetta OpenID
 msgid "OpenID"
 msgstr "OpenID auðkenni"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Því miður fannst OpenID netþjónninn ekki"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Engin OpenID þjónusta fannst fyrir „%s“"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Staðfesting á „%s“ mistóksts: „%s“"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Hætt við staðfestingu"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Það tókst að vista OpenID vefslóðina þína."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Þú getur ekki eytt einu OpenID vefslóðinni nema þú hafir skráð lykilorð"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Þetta OpenID auðkenni er ekki skráð á þennan aðgang."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "Það tókst að fjarlægja OpenID auðkennið."
 
@@ -1128,7 +1236,7 @@ msgstr "OpenID auðkenni"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1160,26 +1268,26 @@ msgstr "...eða nýskráðu þig með OpenID auðkenni!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Því miður er annar aðgangur nú þegar skráður fyrir þetta „Persona“ netfang."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "Það tókst að fjarlægja „Persona“ netfangið."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Þú getur ekki eytt eina „Persona“ netfanginu þínu nema þú hafir skráð lykilorð."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Þetta „Persona“ netfang er ekki skráð fyrir þennan aðgang."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Því miður er annar aðgangur nú þegar skráður fyrir þetta „Persona“ netfang."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Það tókst að vista „Persona“ netfangið þitt."
 
@@ -1203,15 +1311,15 @@ msgstr "...eða skráðu þig inn með „Persona“!"
 msgid "Or register with Persona!"
 msgstr "...eða nýskráðu þig með „Persona“!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Ógild skrá gefin fyrir þessa margmiðlunartegund."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Það tókst ekki að afrita yfir í almennu geymsluna."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "Nothæf keyrsluskrá fannst ekki"
 
@@ -1230,11 +1338,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Þú getur notað\n                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                        Markdown</a> fyrir stílsnið."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Þú verður að gefa upp skrá."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Albúmið \"%s\" var búið til!"
@@ -1257,26 +1365,26 @@ msgstr "Stjórnandi hefur bannað þig"
 msgid "until %(until_when)s"
 msgstr "þangað til %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Staðfestu netfangið þitt!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "útskrá"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Notandaaðgangur: <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Breyta stillingum notandaaðgangs"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1284,29 +1392,29 @@ msgstr "Breyta stillingum notandaaðgangs"
 msgid "Media processing panel"
 msgstr "Margmiðlunarvinnsluskiki"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Skrá út"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Senda inn efni"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Búa til nýtt albúm"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Notendastýring"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Tilkynningastýring"
 
@@ -1360,8 +1468,8 @@ msgid "Authorization Complete"
 msgstr "Heimild klár"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Afritaðu og límdu þetta í forritið þitt:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1451,13 +1559,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Breyti viðhengjum við: %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Viðhengi"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Bæta við viðhengi"
 
@@ -1475,6 +1583,47 @@ msgstr "Vista breytingar"
 msgid "Changing %(username)s's email"
 msgstr "Breyti netfangi fyrir notandann: %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "Fyrir %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1500,7 +1649,7 @@ msgstr "Breyti notandaaðgangsstillingum fyrir: %(username)s"
 msgid "Delete my account"
 msgstr "Eyða aðganginum mínum"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Netfang"
 
@@ -1554,19 +1703,6 @@ msgstr "Hi,\n\nVið vildum staðfesta að þú værir notandinn „%(username)sâ
 msgid "New comments"
 msgstr "Nýjar athugasemdir"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "Fyrir %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Merkja allt lesið"
@@ -1579,38 +1715,38 @@ msgstr "Merkja allt lesið"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Efni merkt með: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Sækja"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Upphafleg skrá"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Því miður mun þessi hljóðskrá ekki virka því \n\tvafrinn þinn styður ekki HTML5 \n\thljóðskrár."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Þú getur náð í nýlegan vafra sem \n\tgetur spilað hljóðskrár á <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Upphaflega skráin"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM skrá (Vorbis víxlþjöppun)"
 
@@ -1618,70 +1754,70 @@ msgstr "WebM skrá (Vorbis víxlþjöppun)"
 msgid "Created"
 msgstr "Búið til"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Mynd fyrir %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF skrá"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Fjarvídd"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Framhlið"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Toppur"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Hlið"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Hala niður líkani"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Skráarsnið"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Hæð hlutar"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Því miður mun þetta myndskeið ekki virka því\n      vafrinn þinn styður ekki HTML5 \n      myndbönd."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Þú getur náð í nýlegan vafra sem \n      sem getur spilað myndskeiðið á <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "WebM skrá (VP8/Vorbis)"
 
@@ -1766,7 +1902,7 @@ msgid "Return to Reports Panel"
 msgstr "Fara aftur í tilkynningastýringu"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Tilkynning"
 
@@ -2072,17 +2208,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Bæta við athugasemd"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Senda inn þessa athugasemd"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Bætt við"
 
@@ -2154,12 +2290,12 @@ msgstr "Efni sem <a href=\"%(user_url)s\">%(username)s</a> á og er merkt með <
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Efni sem <a href=\"%(user_url)s\">%(username)s</a> á"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Skoða efnið sem <a href=\"%(user_url)s\">%(username)s</a> setti inn"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Útlit athugasemdar"
 
@@ -2318,6 +2454,10 @@ msgstr "nýrri"
 msgid "older"
 msgstr "eldri"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Staðsetning"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Tilkynna efni"
@@ -2326,38 +2466,38 @@ msgstr "Tilkynna efni"
 msgid "Tagged with"
 msgstr "Merkt með"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Gat ekki lesið myndskrána."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Obbosí!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Villa kom upp"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Ekki nógu góð beiðni"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "Beiðnin sem var send til netþjónsins er ógild, vinsamlegast athugaðu hana aftur"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Aðgerð ekki leyfileg"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Fyrirgefðu Davíð. Ég get ekki leyft þér að gera þetta!</p></p>Þú reyndir að framkvæma aðgerð sem þú hefur ekki leyfi til að gera. Varstu að reyna að eyða öllum notendareikningum aftur?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2425,69 +2565,69 @@ msgstr "Þú getur notað\n                      <a href=\"http://daringfireball
 msgid "Reason for Reporting"
 msgstr "�stæður fyrir tilkynningu"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Því miður, athugasemdir eru óvirkar."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Obbosí! Athugasemdin þín var innihaldslaus."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Athugasemdin þín var skráð!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Vinsamlegast kíktu á færslurnar þínar og reyndu aftur."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Þú verður að velja eða búa til albúm"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" er nú þegar í albúminu \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" sett í albúmið \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Þú eyddir þessu efni."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Þú ert í þann mund að fara að eyða efni frá öðrum notanda. Farðu mjög varlega."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Þú tókst þetta efni úr albúminu."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Þetta efni var ekki fjarlægt af því að þú merktir ekki við að þú værir viss."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Þú ert í þann mund að fara að eyða efni úr albúmi annars notanda. Farðu mjög varlega."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Þú eyddir albúminu \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Þessu albúmi var ekki eytt vegna þess að þu merktir ekki við að þú værir viss."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Þú ert í þann mund að fara að eyða albúmi annars notanda. Farðu mjög varlega."
diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 431a2950..00000000
--- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/mediagoblin.po
index 1f78f15d..afc889b2 100644
--- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/it/mediagoblin.po
@@ -1,21 +1,21 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
-# Damiano, 2013
+# Damtux, 2013
 # Francesco Apruzzese <cescoap@gmail.com>, 2012
 # Gaetano <gaedeb01@gmail.com>, 2013
 # pikappa469 <pikappa469@alice.it>, 2011
 # nunni <robi@nunnisoft.ch>, 2011
-# Damiano, 2013
-# Damiano, 2012
+# Damtux, 2013-2014
+# Damtux, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mediagoblin/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -25,67 +25,167 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Spiacente, la registrazione è disabilitata su questa istanza."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Spiacente, le segnalazioni sono disabilitate in questa istanza."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Mi dispiace, l'autenticazione è disabilitata in questa istanza."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Nome utente o indirizzo email non valido."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Questo campo non accetta indirizzi email."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Questo campo richiede un indirizzo email."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Spiacente, esiste già un utente con quel nome."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Siamo spiacenti, un utente con quell'indirizzo email esiste già."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "La chiave di verifica o l'id utente è sbagliato."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Il tuo indirizzo email è stato verificato. Ora puoi accedere, modificare il tuo profilo e caricare immagini!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "La chiave di verifica o l'id utente è sbagliato"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Devi effettuare l'accesso così possiamo sapere a chi inviare l'email!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Hai già verificato il tuo indirizzo email!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Email di verifica rispedita."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -101,7 +201,7 @@ msgid "Description of this work"
 msgstr "Descrizione di questo lavoro"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -117,11 +217,11 @@ msgstr "Tags"
 msgid "Separate tags by commas."
 msgstr "Separa i tag con la virgola."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Titolo"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Il titolo non può essere vuoto"
 
@@ -149,125 +249,137 @@ msgstr "Sito web"
 msgid "This address contains errors"
 msgstr "Questo indirizzo contiene errori"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Inviami messaggi email quando altre persone commentano i miei file multimediali"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Abilita le notifiche degli eventi nel sito."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Licenza preferita"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Questa sarà la tua licenza predefinita nei moduli di caricamento dei file."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Il titolo non può essere vuoto"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Descrizione di questa raccolta"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Il titolo fa parte dell'indirizzo di questa raccolta. Nella maggior parte dei casi non c'è bisogno di cambiarlo."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Password vecchia"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Inserisci la vecchia password per dimostrare di essere il proprietario dell'account."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nuova password"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Nuovo indirizzo email"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Password"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Inserisci la tua password per dimostrare di essere il proprietario di questo account."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Questo utente ha già un elemento con quel titolo."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Stai modificando file multimediali di un altro utente. Procedi con attenzione."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Hai aggiunto l'allegato %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Puoi modificare solo il tuo profilo."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Stai modificando il profilo di un utente. Procedi con attenzione."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Cambiamenti del profilo salvati"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Impostazioni del profilo salvate"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Devi confermare l'eliminazione del tuo account."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Hai già una raccolta che si chiama \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Questo utente ha già una raccolta con quel titolo."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Stai modificando la raccolta di un altro utente. Procedi con cautela."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Il tuo indirizzo email è stato verificato."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Password errata"
 
@@ -298,7 +410,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -306,58 +418,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -383,28 +495,28 @@ msgstr "Descrizione"
 msgid "I am sure I want to delete this"
 msgstr "Sono sicuro di volerlo eliminare"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Evviva! Caricato!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Il file non è stato eliminato perchè non hai confermato di essere sicuro."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -414,17 +526,17 @@ msgstr ""
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
 msgid "Edit Blog"
-msgstr ""
+msgstr "Modifica Blog"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
 msgid "Delete Blog"
-msgstr ""
+msgstr "Elimina Blog"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Modifica"
 
@@ -434,7 +546,7 @@ msgstr "Modifica"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Elimina"
 
@@ -473,7 +585,7 @@ msgstr "Elimina definitivamente"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
 msgid "Create/Edit a Blog"
-msgstr ""
+msgstr "Crea/Modifica un Blog"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
 #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
@@ -561,46 +673,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "indefinitamente"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Avvertimento da parte di"
 
@@ -618,26 +730,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Devi specificare un oauth_token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Spiacente, il file è troppo grande."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Spiacente, caricando questo file supereresti il tuo limite di memoria."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Spiacente, hai raggiunto il limite di memoria disponibile."
 
@@ -757,7 +869,7 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
 msgid "CAUTION:"
-msgstr ""
+msgstr "ATTENZIONE:"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
 msgid ""
@@ -982,11 +1094,7 @@ msgstr "Invia istruzioni"
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la tua password?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Posizione"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Visualizza su <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -997,11 +1105,11 @@ msgstr "Iscriviti per creare un account!"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
 msgid "Metadata"
-msgstr ""
+msgstr "Metadati"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
 msgid "Edit Metadata"
-msgstr ""
+msgstr "Modifica Metadati"
 
 #: mediagoblin/plugins/oauth/forms.py:29
 msgid "Allow"
@@ -1053,7 +1161,7 @@ msgstr "L'URI di reindirizzamento per le applicazioni, questo campo\nè <strong>
 msgid "This field is required for public clients"
 msgstr "Questo campo è richiesto per i client pubblici"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Il client {0} è stato registrato!"
 
@@ -1066,8 +1174,8 @@ msgid "Your OAuth clients"
 msgstr "I tuoi client OAuth"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Mi dispiace, esiste già un account registrato con quell'OpenID."
 
@@ -1075,39 +1183,39 @@ msgstr "Mi dispiace, esiste già un account registrato con quell'OpenID."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Mi dispiace, il server OpenID non è stato trovato"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Nessun servizio OpenID è stato trovato per %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Verifica di %s fallita: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Verifica annullata"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Il tuo url OpenID è stato salvato con successo."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Non puoi eliminare il tuo unico URL OpenID se prima non hai impostato una password"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Quell'OpenID non è registrato a questo account."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID è stato rimosso con successo."
 
@@ -1131,7 +1239,7 @@ msgstr "Gli OpenID"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1163,26 +1271,26 @@ msgstr "O registrati con OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Mi dispiace, esiste già un account registrato con quell'indirizzo email Persona."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "L'indirizzo email Persona è stato rimosso con successo."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Non puoi eliminare il tuo unico indirizzo email Persona se prima non hai impostato una password."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Quell'indirizzo email Persona non è registrato in questo account."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Mi dispiace, esiste già un account registrato con quell'indirizzo email Persona."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Il tuo indirizzo email Persona è stato salvato con successo."
 
@@ -1206,15 +1314,15 @@ msgstr "O accedi con Persona!"
 msgid "Or register with Persona!"
 msgstr "O registrati con Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "File non valido per il tipo di file multimediale indicato."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1233,11 +1341,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Puoi utilizzare il\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> per la formattazione."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Devi specificare un file."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Raccolta \"%s\" aggiunta!"
@@ -1260,26 +1368,26 @@ msgstr "Sei stato bannato"
 msgid "until %(until_when)s"
 msgstr "fino al %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Verifica la tua email!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "esci"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Account di <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Cambia le impostazioni dell'account"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1287,29 +1395,29 @@ msgstr "Cambia le impostazioni dell'account"
 msgid "Media processing panel"
 msgstr "Pannello di elaborazione file multimediali"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Esci"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Aggiungi file multimediali"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Crea una nuova raccolta"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Pannello di gestione degli utenti"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Pannello di gestione delle segnalazioni"
 
@@ -1363,8 +1471,8 @@ msgid "Authorization Complete"
 msgstr "Autorizzazione Completata"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Copia e incolla questo nel tuo client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1434,7 +1542,7 @@ msgid ""
 "\n"
 "            >Create an account at this site</a>\n"
 "            or"
-msgstr ""
+msgstr "\n>Crea un account in questo sito</a>\noppure"
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
 msgid ""
@@ -1454,13 +1562,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Stai modificando gli allegati di %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Allegati"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Aggiungi allegato"
 
@@ -1478,6 +1586,47 @@ msgstr "Salva le modifiche"
 msgid "Changing %(username)s's email"
 msgstr "Stai cambiando l'email di %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s fa"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1503,7 +1652,7 @@ msgstr "Stai cambiando le impostazioni dell'account di %(username)s"
 msgid "Delete my account"
 msgstr "Elimina il mio account"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Email"
 
@@ -1557,19 +1706,6 @@ msgstr "Salve,\n\nVogliamo verificare che tu sia %(username)s. Se è così, allo
 msgid "New comments"
 msgstr "Nuovi commenti"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s fa"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Segna tutti come letti"
@@ -1582,38 +1718,38 @@ msgstr "Segna tutti come letti"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "File taggati con: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Scarica"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Originale"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Spiacente ma è impossibile leggere questo file audio perché\n\til tuo browser web non supporta l'HTML5 \n\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Puoi scaricare un browser web moderno,\n\t  in grado di leggere questo file audio, qui <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "File originario"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "File WebM (codec Vorbis)"
 
@@ -1621,70 +1757,70 @@ msgstr "File WebM (codec Vorbis)"
 msgid "Created"
 msgstr "Creato"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "File PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Prospettiva"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Prospetto"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Pianta"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Lato"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Scarica il modello"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Formato del File"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Altezza Oggetto"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Mi dispiace, questo video non funzionerà perché\n      il tuo browser web non supporta i video in\n      HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Qui <a href=\"http://getfirefox.com\">http://getfirefox.com</a>\npuoi scaricare un browser web moderno, in grado di visualizzare\nquesto video!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "File WebM (VP8/Vorbis)"
 
@@ -1769,7 +1905,7 @@ msgid "Return to Reports Panel"
 msgstr "Ritorna al Pannello Segnalazioni"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Segnala"
 
@@ -1882,7 +2018,7 @@ msgstr "Segnalazioni Chiuse"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
 msgid "Resolved"
-msgstr ""
+msgstr "Risolto"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
 msgid "Action Taken"
@@ -1903,7 +2039,7 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/moderation/user.html:23
 #, python-format
 msgid "User: %(username)s"
-msgstr ""
+msgstr "Utente: %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:42
 msgid "Return to Users Panel"
@@ -2018,11 +2154,11 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:180
 msgid "Yes"
-msgstr ""
+msgstr "Sì"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:182
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:213
 msgid "Ban User"
@@ -2075,17 +2211,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Aggiungi un commento"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Aggiungi questo commento"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Aggiunto"
 
@@ -2157,12 +2293,12 @@ msgstr "File multimediali di <a href=\"%(user_url)s\">%(username)s</a> con tag <
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "File multimediali di <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Stai guardando i file multimediali di <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Anteprima Commento"
 
@@ -2321,6 +2457,10 @@ msgstr "più recente"
 msgid "older"
 msgstr "più vecchio"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Posizione"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2329,38 +2469,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "Taggato con"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Impossibile leggere il file immagine."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Oops!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Si è verificato un errore"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Richiesta Non Valida"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "La richiesta inviata al server non è valida, per favore ricontrolla"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Operazione non consentita"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Scusa Dave, non posso lasciartelo fare!</p><p>Hai cercato di eseguire una funzione non autorizzata. Stavi provando a eliminare di nuovo tutti gli account utente?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2428,69 +2568,69 @@ msgstr "Puoi usare il\n<a href=\"http://daringfireball.net/projects/markdown/bas
 msgid "Reason for Reporting"
 msgstr "Motivazione della Segnalazione"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Mi dispiace, i commenti sono disabilitati."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Oops, il tuo commento era vuoto."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Il tuo commento è stato aggiunto!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Per favore controlla i tuoi elementi e riprova."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Devi selezionare o aggiungere una raccolta"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" è già nella raccolta \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" aggiunto alla raccolta \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Hai eliminato il file."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Stai eliminando un file multimediale di un altro utente. Procedi con attenzione."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Hai eliminato l'elemento dalla raccolta."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "L'elemento non è stato eliminato perchè non hai confermato di essere sicuro."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Stai eliminando un elemento dalla raccolta di un altro utente. Procedi con cautela."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Hai eliminato la raccolta \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "La raccolta non è stata eliminata perchè non hai confermato di essere sicuro."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Stai eliminando la raccolta di un altro utente. Procedi con cautela."
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 49b23def..00000000
--- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/mediagoblin.po
index 4df8084b..32f8714b 100644
--- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ja/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/mediagoblin/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -21,67 +21,167 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "申�訳�り��ん����インスタンス�登録�無効�������。"
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "申�訳�り��ん������を��ユーザー����存在�����。"
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "メアド�確��れ����。�れ��ログイン��プロファイルを編集��画�を�出�る��������"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "検証キー���ユーザーID�間������"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "検証メールを������。"
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -97,7 +197,7 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -113,11 +213,11 @@ msgstr "ã‚¿ã‚°"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "スラグ"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "スラグ�必���。"
 
@@ -145,125 +245,137 @@ msgstr "URL"
 msgid "This address contains errors"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "旧パスワード"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "新パスワード"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "パスワード"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "��スラグを��エントリ����ユーザー�既�存在���。"
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "�����他�ユーザー�メディアを編集�����。�注�����。"
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr ""
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "�����他�ユーザー�プロファイルを編集�����。�注�����。"
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr ""
 
@@ -294,7 +406,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -302,58 +414,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -379,28 +491,28 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "投稿終了�"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -420,7 +532,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "編集"
 
@@ -430,7 +542,7 @@ msgstr "編集"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "削除"
 
@@ -557,46 +669,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -614,26 +726,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -978,11 +1090,7 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr "パスワードを忘れ����？"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
@@ -1049,7 +1157,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1062,8 +1170,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1071,39 +1179,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1127,7 +1235,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1159,26 +1267,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1202,15 +1310,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1229,11 +1337,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "ファイルを�供�る必���り��。"
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr ""
@@ -1256,26 +1364,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "ログアウト"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1283,29 +1391,29 @@ msgstr ""
 msgid "Media processing panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "ログアウト"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1359,7 +1467,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1450,13 +1558,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr ""
 
@@ -1474,6 +1582,47 @@ msgstr "投稿�る"
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1499,7 +1648,7 @@ msgstr ""
 msgid "Delete my account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1553,19 +1702,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1578,38 +1714,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "ダウンロード"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1617,70 +1753,70 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "�視図"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "正�図"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "上�図"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "��図"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1765,7 +1901,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2071,17 +2207,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr ""
 
@@ -2153,12 +2289,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>�ん�コンテンツ"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2317,6 +2453,10 @@ msgstr ""
 msgid "older"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2325,38 +2465,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr ""
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr ""
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2424,69 +2564,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/jbo/mediagoblin.po b/mediagoblin/i18n/jbo/mediagoblin.po
new file mode 100644
index 00000000..eda96b55
--- /dev/null
+++ b/mediagoblin/i18n/jbo/mediagoblin.po
@@ -0,0 +1,2630 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# 
+# Translators:
+# .djac.grant. <inactive+tadni@transifex.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
+"Language-Team: Lojban (http://www.transifex.com/projects/p/mediagoblin/language/jbo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Language: jbo\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie blocker "
+"or somesuch.<br/>Make sure to permit the settings of cookies for this "
+"domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
+"      then paste it into a new line in the text box above. There should be only\n"
+"      one url per line. The url that you paste into the text box should be under\n"
+"      the header describing how prominent a feature it will be (whether Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
+"      inside the text box, click the Submit Query button, and your media should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
+"        of media you would like to feature or unfeature and look at the bar to\n"
+"        the side of the media entry. If the piece of media has not been featured\n"
+"        yet you should see a button that says \"Feature\". Press that button and\n"
+"        the media will be featured as a Primary Feature at the top of the page.\n"
+"        All other featured media entries will remain as features, but will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". Click\n"
+"        Unfeature and that media entry will no longer be displayed on the\n"
+"        front page, although you can feature it again at any point. Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on your\n"
+"      front page. Primary Features are placed at the top of the front page and are\n"
+"      much larger. Next are Secondary Features, which are slightly smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than Secondary\n"
+"      Features, and Secondary Features can display longer descriptions than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
+"      portion of its description will be displayed on your website's front page.\n"
+"      The number of characters displayed varies on the prominence of the feature.\n"
+"      Primary Features display the first 512 characters of their description,\n"
+"      Secondary Features display the first 256 characters of their description,\n"
+"      and Tertiary Features display the first 128 characters of their description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware that if\n"
+"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
+"      featured. Make sure that all your intended Media Entries are featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be sure to\n"
+"        have media featured as long as your instance has the 'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been sent"
+" with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your "
+"MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid ""
+"Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid ""
+"You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can <a "
+"href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr "nanca"
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr "matsi"
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr "jetfu"
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr "djedi"
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr "carca"
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr "mentu"
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""
diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index c39cb648..00000000
--- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ko_KR/mediagoblin.po
index ba54d112..c49bbfaf 100644
--- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ko_KR/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/mediagoblin/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,67 +19,167 @@ msgstr ""
 "Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "죄송합니다. 지금� 가입 하실 수 없습니다."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "죄송합니다. 해당 사용� �름� �미 존재 합니다."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "죄송합니다. 사용�와 해당 �메�� �미 등��어 있습니다."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "해당 email 주소가 �미 �� �어 있습니다. 지금 로그�하시고 계정 정보를 수정하고 사진� 전송해 보세요!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "�� 키 �는 사용� ID가 올바르지 않습니다."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "로그�� 하셔야 고블린�서 메�� 보낼 수 있습니다!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "�미 ��받� email 주소를 가지고 있습니다!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "�� 메�� 다시 보내 주세요."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -95,7 +195,7 @@ msgid "Description of this work"
 msgstr "� 작업� 대한 설명"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -111,11 +211,11 @@ msgstr "태그"
 msgid "Separate tags by commas."
 msgstr "태그는 , 로 구분 �니다."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "'슬러그'"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "'슬러그'는 공백� 수 없습니다."
 
@@ -143,125 +243,137 @@ msgstr "웹 주소"
 msgid "This address contains errors"
 msgstr "주소� �러가 있습니다."
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "제 미디어� 대한 컨�� �한다면, 메�� 보내주세요."
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "제목� 공백� 수 없습니다."
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "모�집� 대한 설명"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "예전 비밀번호"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "계정 확�� 위해, �전 비밀 번호를 입력해 주세요."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "새로운 비밀번호"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "비밀번호"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "해당 유저� 대한 '슬러그'가 �미 존재합니다."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "다른 사용�� 미디어를 수정하고 있습니다. 조심해서 수정하세요."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr ""
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "사용�� 계정 정보를 수정하고 있습니다. 조심해서 수정하세요."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "계정 정보가 저장 �었습니다."
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "계정 설정� 저장 �었습니다."
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "\"%s\" 모�집� �미 가지고 있습니다!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "다른 유저� 모�집� 수정 중 입니다. 주�하세요."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "잘못� 비밀번호"
 
@@ -292,7 +404,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -300,58 +412,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -377,28 +489,28 @@ msgstr "설명"
 msgid "I am sure I want to delete this"
 msgstr "�걸 지우고 싶습니다."
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "��!! 등�했습니다!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "확� 체�를 하지 않았습니다. 미디어는 삭제�지 않았습니다."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -418,7 +530,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "수정"
 
@@ -428,7 +540,7 @@ msgstr "수정"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "삭제"
 
@@ -555,46 +667,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -612,26 +724,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -976,11 +1088,7 @@ msgstr "설명서 보내기"
 msgid "Forgot your password?"
 msgstr "비밀번호를 잊으셨나요?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "장소"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr " <a href=\"%(osm_url)s\">OpenStreetMap</a>으로 보기"
@@ -1047,7 +1155,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr "� 항목� 공개 사용�들� 위해 꼭 필요 합니다."
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "사용� {0}님� 등� �었습니다!"
 
@@ -1060,8 +1168,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1069,39 +1177,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1125,7 +1233,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1157,26 +1265,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1200,15 +1308,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "알수없는 미디어 파� 입니다."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1227,11 +1335,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "파�� 등�하셔야 합니다."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "\"%s\" 모�집� 추가�었습니다!"
@@ -1254,26 +1362,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "메�� 확�하세요!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "계정 설정 변경"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1281,29 +1389,29 @@ msgstr "계정 설정 변경"
 msgid "Media processing panel"
 msgstr "미디어 작업 패�"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "미디어 추가"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1357,7 +1465,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1448,13 +1556,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "%(media_title)s� 첨부 수정 중..."
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "첨부"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "첨부 추가"
 
@@ -1472,6 +1580,47 @@ msgstr "저장"
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1497,7 +1646,7 @@ msgstr "%(username)s'� 계정 설정 변경중..."
 msgid "Delete my account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1551,19 +1700,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1576,38 +1712,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr "미디어는 다�으로 태그 �었습니다.: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "다운로드"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "�본"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "사용중�신 웹 브�우져가 HTML5를 지�하지 않아\n\t오디오 파�� 재�할 수 없습니다.\n\t죄송합니다."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "사운드 파�� 재� 하시려면\n\t�곳�서 최신� 브�우져를 다운받으세요! <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "�본 파�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM 파� (Vorbis 코�)"
 
@@ -1615,70 +1751,70 @@ msgstr "WebM 파� (Vorbis 코�)"
 msgid "Created"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "%(media_title)s �미지"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1763,7 +1899,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2069,17 +2205,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "�글 달기"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "�글 추가"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr ""
 
@@ -2151,12 +2287,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>� 미디어"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� <a href=\"%(user_url)s\">%(username)s</a>� 미디어를 보고 있습니다."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2315,6 +2451,10 @@ msgstr "최근"
 msgid "older"
 msgstr "�전"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "장소"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2323,38 +2463,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "태그 정보"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "�미지 파�� �� 수 없습니다."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "�스!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2422,69 +2562,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "오우, 댓글� 비었습니다."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "댓글� 등� �었습니다!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "확�� 하시고 다시 시�하세요."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "모�집� 추가하거나 기존 모�집� 선�하세요."
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" 모�집� �미 존재 합니다. \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" 모�집� 추가했습니다. \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "미디어를 삭제 했습니다."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "다른 사람� 미디어를 삭제하려고 합니다. 다시 한번 확�하세요."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "모�집� 있는 항목� 삭제 했습니다."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "확�� 하지 않았습니다. 항목� 삭제하지 않았습니다."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "다른 사용�� 모�집� 있는 항목� 삭제하였습니다. 주�하세요."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "\"%s\" 모�집� 삭제하셨습니다."
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "확�� 하지 않았습니다. 모�집� 삭제하지 않았습니다."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "다른 사용�� 모�집� 삭제하려고 합니다. 주�하세요."
diff --git a/mediagoblin/i18n/nb_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nb_NO/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 5aed8f4a..00000000
--- a/mediagoblin/i18n/nb_NO/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/nb_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nb_NO/LC_MESSAGES/mediagoblin.po
deleted file mode 100644
index 163a9c06..00000000
--- a/mediagoblin/i18n/nb_NO/LC_MESSAGES/mediagoblin.po
+++ /dev/null
@@ -1,2493 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU MediaGoblin\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-07-29 11:01-0500\n"
-"PO-Revision-Date: 2011-08-07 03:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nb_NO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202
-msgid "Sorry, registration is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/decorators.py:315
-msgid "Sorry, reporting is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
-msgid "Sorry, authentication is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:43
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:44
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:45
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:116
-msgid "Sorry, a user with that name already exists."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
-msgid "Sorry, a user with that email address already exists."
-msgstr ""
-
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
-msgid "The verification key or user id is incorrect."
-msgstr ""
-
-#: mediagoblin/auth/views.py:161
-msgid ""
-"Your email address has been verified. You may now login, edit your profile, "
-"and submit images!"
-msgstr ""
-
-#: mediagoblin/auth/views.py:167
-msgid "The verification key or user id is incorrect"
-msgstr ""
-
-#: mediagoblin/auth/views.py:185
-msgid "You must be logged in so we know who to send the email to!"
-msgstr ""
-
-#: mediagoblin/auth/views.py:193
-msgid "You've already verified your email address!"
-msgstr ""
-
-#: mediagoblin/auth/views.py:203
-msgid "Resent your verification email."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
-#: mediagoblin/media_types/blog/forms.py:24
-#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
-#: mediagoblin/submit/forms.py:61
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
-#: mediagoblin/user_pages/forms.py:45
-msgid "Title"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
-msgid "Description of this work"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
-msgid ""
-"You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"                      Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
-#: mediagoblin/submit/forms.py:45
-msgid "Tags"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
-msgid "Separate tags by commas."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
-msgid "Slug"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
-msgid "The slug can't be empty"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:44
-msgid ""
-"The title part of this media's address. You usually don't need to change "
-"this."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
-#: mediagoblin/submit/forms.py:50
-#: mediagoblin/templates/mediagoblin/utils/license.html:20
-msgid "License"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:54
-msgid "Bio"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:60
-msgid "Website"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:62
-msgid "This address contains errors"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "Email me when others comment on my media"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:69
-msgid "Enable insite notifications about events."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:71
-msgid "License preference"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:77
-msgid "This will be your default license on upload forms."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:90
-msgid "The title can't be empty"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
-#: mediagoblin/user_pages/forms.py:48
-msgid "Description of this collection"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:99
-msgid ""
-"The title part of this collection's address. You usually don't need to "
-"change this."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:119
-msgid "New email address"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
-#: mediagoblin/plugins/basic_auth/forms.py:43
-#: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
-msgid "Password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:125
-msgid "Enter your password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:155
-msgid "Identifier"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:156
-msgid "Value"
-msgstr ""
-
-#: mediagoblin/edit/views.py:78
-msgid "An entry with that slug already exists for this user."
-msgstr ""
-
-#: mediagoblin/edit/views.py:96
-msgid "You are editing another user's media. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/edit/views.py:166
-#, python-format
-msgid "You added the attachment %s!"
-msgstr ""
-
-#: mediagoblin/edit/views.py:193
-msgid "You can only edit your own profile."
-msgstr ""
-
-#: mediagoblin/edit/views.py:199
-msgid "You are editing a user's profile. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/edit/views.py:215
-msgid "Profile changes saved"
-msgstr ""
-
-#: mediagoblin/edit/views.py:248
-msgid "Account settings saved"
-msgstr ""
-
-#: mediagoblin/edit/views.py:282
-msgid "You need to confirm the deletion of your account."
-msgstr ""
-
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
-#, python-format
-msgid "You already have a collection called \"%s\"!"
-msgstr ""
-
-#: mediagoblin/edit/views.py:322
-msgid "A collection with that slug already exists for this user."
-msgstr ""
-
-#: mediagoblin/edit/views.py:337
-msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/edit/views.py:378
-msgid "Your email address has been verified."
-msgstr ""
-
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:60
-msgid "Cannot link theme... no theme set\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:73
-msgid "No asset directory for this theme\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:76
-msgid "However, old link directory symlink found; removed.\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:112
-#, python-format
-msgid "Could not link \"%s\": %s exists and is not a symlink\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:119
-#, python-format
-msgid "Skipping \"%s\"; already set up.\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:124
-#, python-format
-msgid "Old link found for \"%s\"; removing.\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
-msgid ""
-"For more information about how to properly run this\n"
-"script (and how to format the metadata csv file), read the MediaGoblin\n"
-"documentation page on command line uploading\n"
-"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
-msgid "Name of user these media entries belong to"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
-msgid "Path to the csv file containing metadata information."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
-msgid "Don't process eagerly, pass off to celery"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
-msgid "Sorry, no user by username '{username}' exists"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
-msgid "File at {path} not found, use -h flag for help"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
-msgid ""
-"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
-"Metadata was not uploaded."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
-msgid ""
-"FAIL: Local file {filename} could not be accessed.\n"
-"{filename} will not be uploaded."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
-msgid ""
-"Successfully submitted {filename}!\n"
-"Be sure to look at the Media Processing Panel on your website to be sure it\n"
-"uploaded successfully."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
-msgid "FAIL: This file is larger than the upload limits for this site."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
-msgid "FAIL: This file will put this user past their upload limits."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
-msgid "FAIL: This user is already past their upload limits."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
-msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
-msgstr ""
-
-#: mediagoblin/meddleware/csrf.py:134
-msgid ""
-"CSRF cookie not present. This is most likely the result of a cookie blocker "
-"or somesuch.<br/>Make sure to permit the settings of cookies for this "
-"domain."
-msgstr ""
-
-#: mediagoblin/media_types/__init__.py:79
-#: mediagoblin/media_types/__init__.py:101
-msgid "Sorry, I don't support that file type :("
-msgstr ""
-
-#: mediagoblin/media_types/blog/forms.py:26
-#: mediagoblin/media_types/blog/forms.py:35
-#: mediagoblin/plugins/oauth/forms.py:36
-msgid "Description"
-msgstr ""
-
-#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
-msgid "I am sure I want to delete this"
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
-msgid "Woohoo! Submitted!"
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:198
-msgid "Woohoo! edited blogpost is submitted"
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:320
-msgid "You deleted the Blog."
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
-msgid "The media was not deleted because you didn't check that you were sure."
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:333
-msgid "You are about to delete another user's Blog. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:344
-msgid "The blog was not deleted because you have no rights."
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
-msgid "Add Blog Post"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
-msgid "Edit Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
-msgid "Delete Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
-msgid "Delete"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
-msgid "<em> Go to list view </em>"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
-msgid " No blog post yet. "
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
-#, python-format
-msgid "Really delete %(title)s?"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit.html:41
-#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
-msgid "Cancel"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
-msgid "Delete permanently"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
-msgid "Create/Edit a Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
-#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
-#: mediagoblin/templates/mediagoblin/submit/collection.html:30
-#: mediagoblin/templates/mediagoblin/submit/start.html:39
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
-msgid "Add"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
-msgid "Create/Edit a blog post."
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
-msgid "Create/Edit a Blog Post."
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
-#, python-format
-msgid "%(blog_owner_name)s's Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
-msgid "View"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
-msgid "Create a Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
-msgid " Blog Dashboard "
-msgstr ""
-
-#: mediagoblin/media_types/pdf/processing.py:142
-msgid "unoconv failing to run, check log file"
-msgstr ""
-
-#: mediagoblin/media_types/video/processing.py:44
-msgid "Video transcoding failed"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:21
-msgid "Take away privilege"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:22
-msgid "Ban the user"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:23
-msgid "Send the user a message"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:24
-msgid "Delete the content"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
-msgid "User will be banned until:"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:57
-msgid "Why are you banning this User?"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:109
-msgid "What action will you take to resolve the report?"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:115
-msgid "What privileges will you take away?"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:122
-msgid "Why user was banned:"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:125
-msgid "Message to user:"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:128
-msgid "Resolution content:"
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:34
-msgid ""
-"\n"
-"{mod} took away {user}'s {privilege} privileges."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:47
-msgid ""
-"\n"
-"{mod} banned user {user} {expiration_date}."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:51
-msgid "until {date}"
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:53
-#: mediagoblin/templates/mediagoblin/banned.html:30
-msgid "indefinitely"
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:62
-msgid ""
-"\n"
-"{mod} sent a warning email to the {user}."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:71
-msgid ""
-"\n"
-"{mod} deleted the comment."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:78
-msgid ""
-"\n"
-"{mod} deleted the media entry."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:91
-msgid "Warning from"
-msgstr ""
-
-#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
-msgid "commented on your post"
-msgstr ""
-
-#: mediagoblin/notifications/views.py:35
-#, python-format
-msgid "Subscribed to comments on %s!"
-msgstr ""
-
-#: mediagoblin/notifications/views.py:48
-#, python-format
-msgid "You will not receive notifications for comments on %s."
-msgstr ""
-
-#: mediagoblin/oauth/views.py:242
-msgid "Must provide an oauth_token."
-msgstr ""
-
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
-msgid "No request token found."
-msgstr ""
-
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
-msgid "Sorry, the file size is too big."
-msgstr ""
-
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
-msgid "Sorry, uploading this file will put you over your upload limit."
-msgstr ""
-
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
-msgid "Sorry, you have reached your upload limit."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/forms.py:21
-msgid "Enter the URL for the media to be featured"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:132
-msgid "Primary"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:133
-msgid "Secondary"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:134
-msgid "Tertiary"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:135
-msgid "-----------{display_type}-Features---------------------------\n"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
-msgid "How does this work?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
-msgid "How to feature media?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
-msgid ""
-"\n"
-"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
-"      then paste it into a new line in the text box above. There should be only\n"
-"      one url per line. The url that you paste into the text box should be under\n"
-"      the header describing how prominent a feature it will be (whether Primary,\n"
-"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
-"      inside the text box, click the Submit Query button, and your media should be\n"
-"      displayed on the front page.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
-msgid "Is there another way to manage featured media?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
-msgid ""
-"\n"
-"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
-"        of media you would like to feature or unfeature and look at the bar to\n"
-"        the side of the media entry. If the piece of media has not been featured\n"
-"        yet you should see a button that says \"Feature\". Press that button and\n"
-"        the media will be featured as a Primary Feature at the top of the page.\n"
-"        All other featured media entries will remain as features, but will be\n"
-"        pushed further down the page.<br /><br />\n"
-"\n"
-"        If you go to the media homepage of a piece of media that is currently\n"
-"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
-"        where previously there was the button which said \"Feature\". Click\n"
-"        Unfeature and that media entry will no longer be displayed on the\n"
-"        front page, although you can feature it again at any point. Promote\n"
-"        moves the featured media higher up on the page and makes it more\n"
-"        prominent and Demote moves the featured media lower down and makes it\n"
-"        less prominent.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
-msgid "What is a Primary Feature? What is a Secondary Feature?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
-msgid ""
-"\n"
-"      These categories just describe how prominent a feature will be on your\n"
-"      front page. Primary Features are placed at the top of the front page and are\n"
-"      much larger. Next are Secondary Features, which are slightly smaller.\n"
-"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
-"\n"
-"      Primary Features also can display longer descriptions than Secondary\n"
-"      Features, and Secondary Features can display longer descriptions than\n"
-"      Tertiary Features."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
-msgid ""
-"How to decide what information is displayed when a media entry is\n"
-"    featured?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
-msgid ""
-"\n"
-"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
-"      portion of its description will be displayed on your website's front page.\n"
-"      The number of characters displayed varies on the prominence of the feature.\n"
-"      Primary Features display the first 512 characters of their description,\n"
-"      Secondary Features display the first 256 characters of their description,\n"
-"      and Tertiary Features display the first 128 characters of their description.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
-msgid "How to unfeature a piece of media?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
-msgid ""
-"\n"
-"      Unfeature a media by removing its line from the above textarea and then\n"
-"      pressing the Submit Query button.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
-msgid "CAUTION:"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
-msgid ""
-"\n"
-"      When copying and pasting urls into the above text box, be aware that if\n"
-"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
-"      featured. Make sure that all your intended Media Entries are featured.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
-msgid ""
-"\n"
-"Feature Media "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:64
-msgid "Feature"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
-msgid ""
-"\n"
-"Unfeature Media "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
-msgid "Unfeature"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
-msgid ""
-"\n"
-"Promote Feature "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
-msgid "Promote"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
-msgid ""
-"\n"
-"Demote Feature "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
-msgid "Demote"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
-#: mediagoblin/templates/mediagoblin/root.html:32
-msgid "Most recent media"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
-msgid "Nothing is currently featured."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
-msgid ""
-"If you would like to feature a\n"
-"        piece of media, go to that media entry's homepage and click the button\n"
-"        that says"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:65
-msgid ""
-"You're seeing this page because you are a user capable of\n"
-"        featuring media, a regular user would see a blank page, so be sure to\n"
-"        have media featured as long as your instance has the 'archivalook'\n"
-"        plugin enabled. A more advanced tool to manage features can be found\n"
-"        in the"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:72
-msgid "feature management panel."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:77
-msgid "View most recent media"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
-msgid "Feature management panel"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
-msgid ""
-"Sorry, this audio will not work because\n"
-"\tyour web browser does not support HTML5\n"
-"\taudio."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
-msgid ""
-"You can get a modern web browser that\n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
-msgid ""
-"Sorry, this video will not work because\n"
-"          your web browser does not support HTML5 \n"
-"          video."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
-msgid ""
-"You can get a modern web browser that \n"
-"          can play this video at <a href=\"http://getfirefox.com\">\n"
-"          http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:24
-#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
-#: mediagoblin/plugins/persona/forms.py:24
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
-msgid "Username"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:32
-#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
-#: mediagoblin/plugins/persona/forms.py:28
-#: mediagoblin/plugins/persona/forms.py:39
-msgid "Email address"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:39
-msgid "Username or Email"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:46
-msgid "Stay logged in"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:51
-msgid "Username or email"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:54
-msgid ""
-"If that email address (case sensitive!) is registered an email has been sent"
-" with instructions on how to change your password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:65
-msgid "Couldn't find someone with that username."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:68
-msgid ""
-"An email has been sent with instructions on how to change your password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:75
-msgid ""
-"Could not send password recovery email as your username is inactive or your "
-"account's email address has not been verified."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:123
-msgid "The user id is incorrect."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:139
-msgid "You can now log in using your new password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:163
-msgid ""
-"You are no longer an active user. Please contact the system admin to "
-"reactivate your account."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:215
-msgid "Your password was changed successfully"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
-msgid "Set your new password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
-msgid "Set password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
-#, python-format
-msgid "Changing %(username)s's password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
-msgid "Save"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
-msgid "Don't have an account yet?"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
-msgid "Create one here!"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
-msgid "Change your password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
-msgid "Recover password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
-msgid "Send instructions"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
-msgid "Forgot your password?"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
-#, python-format
-msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
-msgstr ""
-
-#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
-msgid "Sign in to create an account!"
-msgstr ""
-
-#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
-msgid "Metadata"
-msgstr ""
-
-#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
-msgid "Edit Metadata"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:29
-msgid "Allow"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:30
-msgid "Deny"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:34
-msgid "Name"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:35
-msgid "The name of the OAuth client"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:38
-msgid ""
-"This will be visible to users allowing your\n"
-"                application to authenticate as them."
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:40
-msgid "Type"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:45
-msgid ""
-"<strong>Confidential</strong> - The client can\n"
-"                make requests to the GNU MediaGoblin instance that can not be\n"
-"                intercepted by the user agent (e.g. server-side client).<br />\n"
-"                <strong>Public</strong> - The client can't make confidential\n"
-"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
-"                JavaScript client)."
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:52
-msgid "Redirect URI"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:54
-msgid ""
-"The redirect URI for the applications, this field\n"
-"            is <strong>required</strong> for public clients."
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:66
-msgid "This field is required for public clients"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/views.py:55
-msgid "The client {0} has been registered!"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
-msgid "OAuth client connections"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
-msgid "Your OAuth clients"
-msgstr ""
-
-#: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
-msgid "Sorry, an account is already registered to that OpenID."
-msgstr ""
-
-#: mediagoblin/plugins/openid/forms.py:38
-msgid "OpenID"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:48
-msgid "Sorry, the OpenID server could not be found"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:61
-#, python-format
-msgid "No OpenID service was found for %s"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:106
-#, python-format
-msgid "Verification of %s failed: %s"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:117
-msgid "Verification cancelled"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:314
-msgid "Your OpenID url was saved successfully."
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
-msgid "You can't delete your only OpenID URL unless you have a password set"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
-msgid "That OpenID is not registered to this account."
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:385
-msgid "OpenID was successfully removed."
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
-msgid "Add an OpenID"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
-msgid "Delete an OpenID"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
-msgid "OpenID's"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:47
-msgid "Log in"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
-msgid "Log in to create an account!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
-msgid "Or login with a password!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
-msgid "Or login with OpenID!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
-msgid "Or register with OpenID!"
-msgstr ""
-
-#: mediagoblin/plugins/persona/__init__.py:90
-msgid "Sorry, an account is already registered to that Persona email."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:138
-msgid "The Persona email address was successfully removed."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:144
-msgid ""
-"You can't delete your only Persona email address unless you have a password "
-"set."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:149
-msgid "That Persona email address is not registered to this account."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:176
-msgid ""
-"Sorry, an account is already registered with that Persona email address."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:192
-msgid "Your Persona email address was saved successfully."
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
-msgid "Delete a Persona email address"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
-msgid "Add a Persona email address"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
-msgid "Persona's"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
-msgid "Or login with Persona!"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
-msgid "Or register with Persona!"
-msgstr ""
-
-#: mediagoblin/processing/__init__.py:420
-msgid "Invalid file given for media type."
-msgstr ""
-
-#: mediagoblin/processing/__init__.py:427
-msgid "Copying to public storage failed."
-msgstr ""
-
-#: mediagoblin/processing/__init__.py:435
-msgid "An acceptable processing file was not found"
-msgstr ""
-
-#: mediagoblin/submit/forms.py:30
-msgid "Max file size: {0} mb"
-msgstr ""
-
-#: mediagoblin/submit/forms.py:34
-msgid "File"
-msgstr ""
-
-#: mediagoblin/submit/forms.py:41
-msgid ""
-"You can use\n"
-"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"                        Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/submit/views.py:55
-msgid "You must provide a file."
-msgstr ""
-
-#: mediagoblin/submit/views.py:138
-#, python-format
-msgid "Collection \"%s\" added!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:20
-msgid "You are Banned."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:24
-#: mediagoblin/templates/mediagoblin/error.html:24
-msgid "Image of goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:26
-msgid "You have been banned"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:28
-#, python-format
-msgid "until %(until_when)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:97
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
-msgid "log out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:131
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:138
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
-msgid "Media processing panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:152
-msgid "Log out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:155
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
-msgid "Add media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:158
-#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
-msgid "Create new collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:163
-msgid "Moderation powers:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:169
-msgid "User management panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:173
-msgid "Report management panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:21
-msgid "Authorization"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:26
-#: mediagoblin/templates/mediagoblin/api/authorize.html:53
-msgid "Authorize"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:29
-msgid "You are logged in as"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:33
-msgid "Do you want to authorize "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:37
-msgid "an unknown application"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:39
-msgid " to access your account? "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:41
-msgid "Applications with access to your account can: "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:43
-msgid "Post new media as you"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:44
-msgid "See your information (e.g profile, media, etc...)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:45
-msgid "Change your information"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/oob.html:21
-msgid "Authorization Finished"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/oob.html:26
-msgid "Authorization Complete"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/auth/register.html:28
-#: mediagoblin/templates/mediagoblin/auth/register.html:36
-msgid "Create an account!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/auth/register.html:41
-msgid "Create"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
-#, python-format
-msgid ""
-"Hi %(username)s,\n"
-"\n"
-"to activate your GNU MediaGoblin account, open the following URL in\n"
-"your web browser:\n"
-"\n"
-"%(verification_url)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
-#, python-format
-msgid ""
-"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
-"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
-#, python-format
-msgid ""
-"Released under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
-"href=\"%(source_link)s\">Source code</a> available."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
-msgid "Terms of Service"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
-msgid ""
-"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
-msgid ""
-"\n"
-"            >Create an account at this site</a>\n"
-"            or"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
-msgid ""
-"\n"
-"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/logo.html:23
-#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
-msgid "MediaGoblin logo"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
-#, python-format
-msgid "Editing attachments for %(media_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
-msgid "Attachments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
-msgid "Add attachment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
-#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
-msgid "Save changes"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
-#, python-format
-msgid "Changing %(username)s's email"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
-#, python-format
-msgid "Really delete user '%(user_name)s' and all related media/comments?"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
-msgid "Yes, really delete my account"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit.html:23
-#: mediagoblin/templates/mediagoblin/edit/edit.html:35
-#, python-format
-msgid "Editing %(media_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
-#, python-format
-msgid "Changing %(username)s's account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
-msgid "Delete my account"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
-msgid "Email"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
-#, python-format
-msgid "Editing %(collection_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
-#, python-format
-msgid "Editing %(username)s's profile"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
-#, python-format
-msgid "Metadata for \"%(media_name)s\""
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
-msgid "MetaData"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
-msgid "Add new Row"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
-msgid "Update Metadata"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
-msgid "Clear empty Rows"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
-#, python-format
-msgid ""
-"Hi,\n"
-"\n"
-"We wanted to verify that you are %(username)s. If this is the case, then \n"
-"please follow the link below to verify your new email address.\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"If you are not %(username)s or didn't request an email change, you can ignore\n"
-"this email."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
-msgid "New comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
-msgid "Mark all read"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/listings/collection.html:30
-#: mediagoblin/templates/mediagoblin/listings/collection.html:35
-#: mediagoblin/templates/mediagoblin/listings/tag.html:30
-#: mediagoblin/templates/mediagoblin/listings/tag.html:35
-#, python-format
-msgid "Media tagged with: %(tag_name)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
-msgid "Download"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-msgid "Original"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
-msgid ""
-"Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
-msgid ""
-"You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
-msgid "Original file"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
-msgid "WebM file (Vorbis codec)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
-msgid "Created"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
-#, python-format
-msgid "Image for %(media_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
-msgid "PDF file"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-msgid "Perspective"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
-msgid "Front"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
-msgid "Top"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
-msgid "Side"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-msgid "WebGL"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
-msgid "Download model"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
-msgid "File Format"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
-msgid "Object Height"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
-msgid ""
-"Sorry, this video will not work because\n"
-"      your web browser does not support HTML5 \n"
-"      video."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
-msgid ""
-"You can get a modern web browser that \n"
-"      can play this video at <a href=\"http://getfirefox.com\">\n"
-"      http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
-msgid "WebM file (VP8/Vorbis)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
-msgid ""
-"Here you can track the state of media being processed on this instance."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
-msgid "Media in-processing"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
-msgid "ID"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
-msgid "User"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
-msgid "When submitted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
-msgid "Transcoding progress"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
-msgid "Unknown"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
-msgid "No media in-processing"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
-msgid "These uploads failed to process:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
-msgid "Reason for failure"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
-msgid "Failure metadata"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
-msgid "No failed entries!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
-msgid "Last 10 successful uploads"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
-msgid "Submitted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
-msgid "No processed entries, yet!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:27
-msgid "Sorry, no such report found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:33
-msgid "Return to Reports Panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
-msgid "Report"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:38
-msgid "Reported comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:83
-#, python-format
-msgid ""
-"\n"
-"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
-"    "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:92
-#, python-format
-msgid ""
-"\n"
-"          CONTENT BY\n"
-"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
-"          HAS BEEN DELETED\n"
-"        "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:102
-msgid "Reason for report:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:133
-#: mediagoblin/templates/mediagoblin/moderation/user.html:136
-msgid "Resolve"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:137
-#: mediagoblin/templates/mediagoblin/moderation/report.html:157
-msgid "Resolve This Report"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:149
-msgid "Status"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:151
-msgid "RESOLVED"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:159
-msgid "You cannot take action against an administrator"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
-msgid "Report panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
-msgid ""
-"\n"
-"    Here you can look up open reports that have been filed by users.\n"
-"  "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
-msgid "Active Reports Filed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
-msgid "Offender"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
-msgid "When Reported"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
-msgid "Reported By"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
-msgid "Reason"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
-#, python-format
-msgid ""
-"\n"
-"                Comment Report #%(report_id)s\n"
-"              "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
-#, python-format
-msgid ""
-"\n"
-"                Media Report #%(report_id)s\n"
-"              "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
-msgid "No open reports found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
-msgid "Closed Reports"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
-msgid "Resolved"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
-msgid "Action Taken"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
-#, python-format
-msgid ""
-"\n"
-"              Closed Report #%(report_id)s\n"
-"            "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
-msgid "No closed reports found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:23
-#, python-format
-msgid "User: %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:42
-msgid "Return to Users Panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:49
-msgid "Sorry, no such user found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:53
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
-msgid "Email verification needed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:55
-msgid ""
-"Someone has registered an account with this username, but it still has\n"
-"        to be activated."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:66
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
-#, python-format
-msgid "%(username)s's profile"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:68
-#, python-format
-msgid "BANNED until %(expiration_date)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:72
-msgid "Banned Indefinitely"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:78
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
-msgid "This user hasn't filled in their profile (yet)."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:89
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
-msgid "Edit profile"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:96
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
-msgid "Browse collections"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:105
-#, python-format
-msgid "Active Reports on %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:112
-msgid "Report ID"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:113
-msgid "Reported Content"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:114
-msgid "Description of Report"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:122
-#, python-format
-msgid "Report #%(report_number)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:129
-msgid "Reported Comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:131
-msgid "Reported Media Entry"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:142
-#, python-format
-msgid "No active reports filed on %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:150
-#, python-format
-msgid "All reports on %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:155
-#, python-format
-msgid "All reports that %(username)s has filed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:164
-#, python-format
-msgid "%(username)s's Privileges"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:172
-msgid "Privilege"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:173
-msgid "Granted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:180
-msgid "Yes"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:182
-msgid "No"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:213
-msgid "Ban User"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:218
-msgid "UnBan User"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
-msgid "User panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
-msgid ""
-"\n"
-"    Here you can look up users in order to take punitive actions on them.\n"
-"  "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
-msgid "Active Users"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
-msgid "When Joined"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
-msgid "# of Comments Posted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
-msgid "No users found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/submit/collection.html:26
-msgid "Add a collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/submit/start.html:28
-#: mediagoblin/templates/mediagoblin/submit/start.html:35
-msgid "Add your media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
-#, python-format
-msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
-msgid "Add a comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
-msgid "Add this comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
-msgid "Added"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
-#, python-format
-msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
-#, python-format
-msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
-#, python-format
-msgid "Delete collection %(collection_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
-#, python-format
-msgid "Really delete collection: %(title)s?"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
-#, python-format
-msgid "Remove %(media_title)s from %(collection_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
-#, python-format
-msgid "Really remove %(media_title)s from %(collection_title)s?"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
-msgid "Remove"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
-#, python-format
-msgid "%(username)s's collections"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
-#, python-format
-msgid ""
-"Hi %(username)s,\n"
-"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
-#, python-format
-msgid "%(username)s's media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
-#, python-format
-msgid ""
-"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
-"href=\"%(tag_url)s\">%(tag)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
-#, python-format
-msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
-msgid "Comment Preview"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
-#, python-format
-msgid "Add “%(media_title)s� to a collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
-msgid "+"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
-msgid "Add a new collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
-msgid ""
-"You can track the state of media being processed for your gallery here."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
-msgid "Your last 10 successful uploads"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
-msgid "<h2>File a Report</h2>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
-msgid "Reporting this Comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
-msgid "Reporting this Media Entry"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
-#, python-format
-msgid ""
-"\n"
-"            � Published by <a href=\"%(user_url)s\"\n"
-"                          class=\"comment_authorlink\">%(username)s</a>\n"
-"      "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
-msgid "File Report "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
-msgid "Here's a spot to tell others about yourself."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
-#, python-format
-msgid "View all of %(username)s's media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
-msgid ""
-"This is where your media will appear, but you don't seem to have added "
-"anything yet."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
-#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
-msgid "There doesn't seem to be any media here yet..."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
-msgid "Almost done! Your account still needs to be activated."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
-msgid ""
-"An email should arrive in a few moments with instructions on how to do so."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
-msgid "In case it doesn't:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
-msgid "Resend verification email"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
-msgid ""
-"Someone has registered an account with this username, but it still has to be"
-" activated."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
-#, python-format
-msgid ""
-"If you are that person but you've lost your verification email, you can <a "
-"href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
-msgid "(remove)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collections.html:21
-msgid "Collected in"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collections.html:40
-msgid "Add to a collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
-msgid "Subscribe to comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
-msgid "Silence comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
-#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
-msgid "feed icon"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
-#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
-msgid "Atom feed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/license.html:25
-msgid "All rights reserved"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
-msgid "� Newer"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
-msgid "Older →"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
-msgid "Go to page:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
-msgid "newer"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
-msgid "older"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/report.html:25
-msgid "Report media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "Tagged with"
-msgstr ""
-
-#: mediagoblin/tools/exif.py:81
-msgid "Could not read the image file."
-msgstr ""
-
-#: mediagoblin/tools/response.py:38
-msgid "Oops!"
-msgstr ""
-
-#: mediagoblin/tools/response.py:39
-msgid "An error occured"
-msgstr ""
-
-#: mediagoblin/tools/response.py:53
-msgid "Bad Request"
-msgstr ""
-
-#: mediagoblin/tools/response.py:55
-msgid "The request sent to the server is invalid, please double check it"
-msgstr ""
-
-#: mediagoblin/tools/response.py:63
-msgid "Operation not allowed"
-msgstr ""
-
-#: mediagoblin/tools/response.py:64
-msgid ""
-"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
-"function that you are not allowed to. Have you been trying to delete all "
-"user accounts again?"
-msgstr ""
-
-#: mediagoblin/tools/response.py:72
-msgid ""
-"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
-" the address is correct, maybe the page you're looking for has been moved or"
-" deleted."
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:62
-msgid "year"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:63
-msgid "month"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:64
-msgid "week"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:65
-msgid "day"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:66
-msgid "hour"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:67
-msgid "minute"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:23
-msgid "Comment"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:25
-msgid ""
-"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
-"target=\"_blank\">Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:35
-msgid "I am sure I want to remove this item from the collection"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:39
-msgid "Collection"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:40
-msgid "-- Select --"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:42
-msgid "Include a note"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:49
-msgid ""
-"You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
-"                      Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
-msgid "Reason for Reporting"
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:188
-msgid "Sorry, comments are disabled."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:193
-msgid "Oops, your comment was empty."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:199
-msgid "Your comment has been posted!"
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:235
-msgid "Please check your entries and try again."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:275
-msgid "You have to select or add a collection"
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:286
-#, python-format
-msgid "\"%s\" already in collection \"%s\""
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:292
-#, python-format
-msgid "\"%s\" added to collection \"%s\""
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:317
-msgid "You deleted the media."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:336
-msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:409
-msgid "You deleted the item from the collection."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:413
-msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:421
-msgid ""
-"You are about to delete an item from another user's collection. Proceed with"
-" caution."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:453
-#, python-format
-msgid "You deleted the collection \"%s\""
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:460
-msgid ""
-"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:468
-msgid ""
-"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
diff --git a/mediagoblin/i18n/nb_NO/mediagoblin.po b/mediagoblin/i18n/nb_NO/mediagoblin.po
new file mode 100644
index 00000000..60e096b1
--- /dev/null
+++ b/mediagoblin/i18n/nb_NO/mediagoblin.po
@@ -0,0 +1,2638 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# 
+# Translators:
+# BÃ¥rd <bard@kvidder.com>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-02-14 10:37+0000\n"
+"Last-Translator: BÃ¥rd <bard@kvidder.com>\n"
+"Language-Team: Norwegian Bokmål (Norway) "
+"(http://www.transifex.com/projects/p/mediagoblin/language/nb_NO/)\n"
+"Language: nb_NO\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"Generated-By: Babel 1.3\n"
+"X-POOTLE-MTIME: 1423910245.0\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Beklager, registrering er skrudd av på denne instansen."
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr "Beklager, rapportering er skrudd av på denne instansen."
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr "Ugyldig brukernavn eller epostadresse."
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr "Dette feltet kan ikke inneholde ikke epostadresser."
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr "Dette feltet krever en epostadresse."
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr "Beklager, en bruker ved det navnet eksisterer allerede."
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr "Beklager, en bruker med den epostadressen eksisterer allerede."
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr "Verifikasjonsnøkkelen eller bruker id-en stemmer ikke."
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+"Epostadressen din har blitt verifisert. Du kan nå logge inn, redigere "
+"profilen din og legge til bilder!"
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr "Verifikasjonsnøkkelen eller bruker id-en stemmer ikke."
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr "Du må være logget inn, så vi vet hvem vi skal sende eposten til!"
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr "Du har allerede verifisert epostadressen din!"
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr "Sendte verifikasjonseposten din på nytt."
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr "{username} la til {object}"
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr "{username} la til {object} til {target}"
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr "{username} favorittmarkerte {object}"
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr "{username} likte {object}"
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr "{username} delte {object}"
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr "{username} fjernet favorittmarkering av {object}"
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr "{username} sluttet å følge {object}"
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr "{username} merket {object}"
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr "et bilde"
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr "lyd"
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr "en person"
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr "et objekt"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr "Tittel"
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr "Beskrivelse av verket"
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+"Du kan bruke\n"
+"<a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"Markdown</a> til formatering."
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr "Merkelapper"
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr "Separer merkelapper med komma."
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr "Denne adressen inneholder feil"
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr "Hjemsted"
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr "Send meg epost når andre kommenterer på mine medier"
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr "Dette vil være din standardlisens i opplastingsskjemaer."
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr "Tittelen kan ikke være tom"
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr "Beskrivelse av denne samlingen"
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie blocker "
+"or somesuch.<br/>Make sure to permit the settings of cookies for this "
+"domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
+"      then paste it into a new line in the text box above. There should be only\n"
+"      one url per line. The url that you paste into the text box should be under\n"
+"      the header describing how prominent a feature it will be (whether Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
+"      inside the text box, click the Submit Query button, and your media should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
+"        of media you would like to feature or unfeature and look at the bar to\n"
+"        the side of the media entry. If the piece of media has not been featured\n"
+"        yet you should see a button that says \"Feature\". Press that button and\n"
+"        the media will be featured as a Primary Feature at the top of the page.\n"
+"        All other featured media entries will remain as features, but will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". Click\n"
+"        Unfeature and that media entry will no longer be displayed on the\n"
+"        front page, although you can feature it again at any point. Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on your\n"
+"      front page. Primary Features are placed at the top of the front page and are\n"
+"      much larger. Next are Secondary Features, which are slightly smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than Secondary\n"
+"      Features, and Secondary Features can display longer descriptions than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
+"      portion of its description will be displayed on your website's front page.\n"
+"      The number of characters displayed varies on the prominence of the feature.\n"
+"      Primary Features display the first 512 characters of their description,\n"
+"      Secondary Features display the first 256 characters of their description,\n"
+"      and Tertiary Features display the first 128 characters of their description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware that if\n"
+"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
+"      featured. Make sure that all your intended Media Entries are featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be sure to\n"
+"        have media featured as long as your instance has the 'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been sent"
+" with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your "
+"MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid ""
+"Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid ""
+"You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can <a "
+"href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 4d400e6e..00000000
--- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/mediagoblin.po
index d06a25a4..b28e4dd1 100644
--- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nl/mediagoblin.po
@@ -1,87 +1,190 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2014
+# André Koot <meneer@tken.net>, 2014, 2015.
 # schendje <mail@jefvanschendel.nl>, 2011, 2012
 # mvanderboom <mvanderboom@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-24 16:42+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/mediagoblin/language/nl/)\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-24 22:42+0000\n"
+"Last-Translator: meneer <meneer@tken.net>\n"
+"Language-Team: Dutch "
+"(http://www.transifex.com/projects/p/mediagoblin/language/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"Generated-By: Babel 1.3\n"
+"X-POOTLE-MTIME: 1422139339.0\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Sorry, registratie is uitgeschakeld op deze goblin."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Sorry, rapportage is uitgeschakeld op deze goblin."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Sorry, authenticatie is uitgeschakeld op deze goblin."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Ongeldige gebruikersnaam of e-mailadres."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Dit veld accepteert geen e-mailadressen."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Dit veld vereist een e-mailadres."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Sorry, er bestaat al een gebruiker met die naam."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Sorry, een gebruiker met dat e-mailadres bestaat al."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "De verificatiecode of gebruikersnaam is onjuist."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Uw e-mailadres is geverifieerd. U kunt nu inloggen, uw profiel bewerken, en afbeeldingen toevoegen!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "De verificatiecode of gebruikersnaam is onjuist"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Je moet ingelogd zijn, anders weten we niet waar we de e-mail naartoe moeten sturen!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Je hebt je e-mailadres al geverifieerd!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Verificatie e-mail opnieuw opgestuurd."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr "{username} voegde toe {object}"
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr "{username} voegde {object} toe aan {target}"
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr "{username} bewerkte {object}"
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr "{username} creëerde {object}"
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr "{username} verwijderde {object}"
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr "{username} vond {object} niet meer leuk"
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr "{username} maakte {object} favoriet"
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr "{username} volgde {object}"
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr "{username} vond {object} leuk"
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr "{username} plaatste {object}"
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr "{username} plaatste {object} in {target}"
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr "{username} deelde {object}"
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr "{username} verwijderde {object} als favoriet"
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr "{username} beëindigde volgen {object}"
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr "{username} vond {object} niet leuk"
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr "{username} beëindigde delen {object}"
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr "{username} werkte {object} bij"
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr "{username} tagde {object}"
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr "een afbeelding"
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr "een reactie"
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr "een verzameling"
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr "een video"
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr "audio"
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr "een persoon"
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr "een object"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -97,7 +200,7 @@ msgid "Description of this work"
 msgstr "Beschrijving van dit werk"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -113,11 +216,11 @@ msgstr "Tags"
 msgid "Separate tags by commas."
 msgstr "Hou labels gescheiden met komma's."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Slug"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "De slug kan niet leeg zijn"
 
@@ -145,125 +248,137 @@ msgstr "Website"
 msgid "This address contains errors"
 msgstr "Dit adres bevat fouten"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr "Thuis"
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Notificeer me per e-mail bij reacties op mijn media"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Activeer notificaties over gebeurtenissen op de site."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Licentievoorkeuren"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Dit wordt de standaardlicentie op uploadformulieren."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "De titel mag niet leeg zijn"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Beschrijving van deze verzameling"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Het titelgedeelte van het adres van deze verzameling. Normaal gesproken hoef je deze niet te veranderen."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Oud wachtwoord"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Vul je oude wachtwoord in om te bewijzen dat dit jouw account is"
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Nieuw e-mailadres"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Vul je wachtwoord in om te bewijzen dat dit jouw account is."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr "Identificatie"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr "Waarde"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Er bestaat al een onderwerp met die slug voor deze gebruiker."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "U bent de media van een andere gebruiker aan het aanpassen. Ga voorzichtig te werk."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Je hebt bijlage %s toegevoegd!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Je kunt alleen je eigen profiel bijwerken."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Profielaanpassingen opgeslagen"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Accountinstellingen opgeslagen"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr "Onbekende applicatie, kon autorisatie niet intrekken"
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr "Autorisatie voor applicatie is ingetrokken"
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Je moet het verwijderen van je account bevestigen."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Je hebt al een verzameling met de naam \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Er bestaat al een verzameling met die slug voor deze gebruiker."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Je bewerkt de verzameling van een andere gebruiker. Ga voorzichtig te werk."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Je e-mailadres is geverifieerd."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Verkeerd wachtwoord"
 
@@ -294,66 +409,66 @@ msgstr "Overslaan \"%s\"; is al ingesteld\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Oude link gevonden voor \"%s\"; verwijderen.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
 "documentation page on command line uploading\n"
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
-msgstr ""
+msgstr "Voor meer informatie over het juist uitvoeren van dit \nscript (en het opmaken van het metadata csv bestand), lees de MediaGoblin\ndocumentatie over commandoregel uploaden\n<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr "Gebruikersnaam van de eigenaar van deze nummers"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr "Pad naar het csv-bestand met metadata informatie."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr "Geen haast, rustig, dan breekt het lijntje niet"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr "Sorry, er bestaat geen gebruiker met de naam '{username}'"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr "Bestand op {path} niet gevonden, gebruik de -h flag voor hulp"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr "Fout met media '{media_id}' waarde '{error_path}': {error_msg}\nMetadata niet geüpload."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr "FOUT: Lokaal bestand {filename} kon niet worden benaderd.\n{filename} wordt niet geüpload."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
-msgstr ""
+msgstr "Succesvol aangemeld {filename}!\nKijk in het Mediaverwerking panel op je website om te zien\nof het succesvol werd geüpload."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr "FOUT: Dit bestand is groter dan de uploadlimiet voor deze site."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr "FOUT: Dit bestand laat de gebruiker voorbij de uploadlimiet gaan."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr "FOUT: Deze gebruiker is al voorbij de uploadlimiet."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr "{files_uploaded} van {files_attempted} bestanden succesvol aangemeld"
 
@@ -362,7 +477,7 @@ msgid ""
 "CSRF cookie not present. This is most likely the result of a cookie blocker "
 "or somesuch.<br/>Make sure to permit the settings of cookies for this "
 "domain."
-msgstr ""
+msgstr "CSRF cookie niet aanwezig. Dit komt waarschijnlijk door een cookie blocker of iets dergelijks.<br/>Zorg ervoor dat je browser cookies van dit domein wel accepteert.."
 
 #: mediagoblin/media_types/__init__.py:79
 #: mediagoblin/media_types/__init__.py:101
@@ -379,28 +494,28 @@ msgstr "Beschrijving"
 msgid "I am sure I want to delete this"
 msgstr "Ik weet zeker dat ik dit wil verwijderen."
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Mooizo! Toegevoegd!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr "Zohee! bijgewerkt blogbericht geplaatst"
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr "Je hebt het blogbericht verwijderd."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Deze media was niet verwijderd omdat je niet hebt aangegeven dat je het zeker weet."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr "Je staat op het punt het Blog van iemand anders te verwijderen. Pas op."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr "Het blog werd niet verwijderd omdat je niet de juiste rechten hebt."
 
@@ -420,7 +535,7 @@ msgstr "Verwijder Blog"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Pas aan"
 
@@ -430,7 +545,7 @@ msgstr "Pas aan"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -557,46 +672,46 @@ msgstr "Bericht aan de gebruiker:"
 msgid "Resolution content:"
 msgstr "Oplossing inhoud:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr "\n{mod} nam van {user} de {privilege} rechten af."
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr "\n{mod} blokkeerde de gebruiker {user} {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr "tot {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "onbepaalde tijd"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr "\n{mod} stuurde een waarschuwingsbericht naar {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr "\n{mod} verwijderde de reactie."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr "\n{mod} verwijderde het mediaonderwerp."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Waarschuwing van"
 
@@ -614,32 +729,32 @@ msgstr "Geabonneerd op reacties op %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Je ontvangt geen meldingen over reacties op %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Moet een oauth_token leveren."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Geen aanvraagtoken gevonden."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Sorry, het bestand is te groot."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Sorry, door te uploaden zou je over je uploadlimiet gaan."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Sorry, je hebt je uploadlimiet bereikt."
 
 #: mediagoblin/plugins/archivalook/forms.py:21
 msgid "Enter the URL for the media to be featured"
-msgstr ""
+msgstr "Geef de URL op van de aanbevolen media"
 
 #: mediagoblin/plugins/archivalook/tools.py:132
 msgid "Primary"
@@ -663,7 +778,7 @@ msgstr "Hoe werkt het?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
 msgid "How to feature media?"
-msgstr "Hoe publiceer je media?"
+msgstr "Hoe kun je media aanbevelen?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
 msgid ""
@@ -676,11 +791,11 @@ msgid ""
 "      inside the text box, click the Submit Query button, and your media should be\n"
 "      displayed on the front page.\n"
 "    "
-msgstr ""
+msgstr "\n      Ga naar de pagina van het mediabestand dat je wilt aanbevelen. Kopieer de URL en\n      plak die in een nieuwe regel in het bovenstaande invulveld. Er mag maar één url in een regel staan. De url die je in het veld plakte moet staan onder de koptekst die aangeeft hoe prominent de aanbeveling is (ofwel Primair,\n      Secundair, of Tertiair). Wanneer al je aanbevolen media in het invoerveld staan, druk je op de Verwerk Aanvraag knop en je media zouden moeten worden getoond op de voorpagina.\n    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
 msgid "Is there another way to manage featured media?"
-msgstr ""
+msgstr "Bestaat er een andere manier om media aan te bevelen?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
 msgid ""
@@ -702,11 +817,11 @@ msgid ""
 "        prominent and Demote moves the featured media lower down and makes it\n"
 "        less prominent.\n"
 "    "
-msgstr ""
+msgstr "\n        Ja. als dat liever hebt, kun je naar de media hoofdpagina gaan van het\n        nummer dat je wilt aanbevelen, of wat je niet langer wilt aanbevelen en\n        kijk naar de balk naast de inhoud. Als het nummer nog niet is\n        aanbevolen, zie je een knop met de tekst \"Aanbevelen\". Druk op die\n        knop en het nummer wordt als een Primaire aanbeveling bovenaan\n        de pagina getoond.\n        Alle andere aanbevelen nummers blijven aanbevelingen, maar worden\n        naar beneden gedrukt.<br /><br />\n\n        Als je naar de media homepagina van een nummer dat momenteel is\n        aanbevolen gaat, zie je de opties \"Intrekken\", \"Promoveren\" en\n        \"Demoveren\" waar eerst alleen de knop \"Aanbevelen\" stond.\n        Klik op \"Intrekken\" en het nummer wordt niet langer op de voorpagina \n        getoond. Je kunt het later altijd weer aanbevelen. Promoveren\n        verplaatst het nummer naar boven op de pagina en Demoveren\n        verplaatst het omlaag en maakt het minder prominent.\n    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
 msgid "What is a Primary Feature? What is a Secondary Feature?"
-msgstr ""
+msgstr "Wat is een Primaire aanbeveling? Wat is een secundaire aanbeveling?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
 msgid ""
@@ -719,13 +834,13 @@ msgid ""
 "      Primary Features also can display longer descriptions than Secondary\n"
 "      Features, and Secondary Features can display longer descriptions than\n"
 "      Tertiary Features."
-msgstr ""
+msgstr "\n      Deze categorieën geven aan hoe prominent een aanbeveling op jouw voorpagina wordt getoond. Primaire Aanbevelingen worden bovenaan en groter je voorpagina getoond. Daarna komen de Secundaire aanbevelingen, iets kleiner ook.\n      Tertiaure aanbevelingen worden in een tabel ondaraan de pagina getoond.<br /><br />\n\n      Van Primaire aanbevelingen wordt ook meer tekst getoond dan van secundaire aanbevelingen, die weer meer tekst tonen dan de Tertiaire aanbevelingen."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
 msgid ""
 "How to decide what information is displayed when a media entry is\n"
 "    featured?"
-msgstr ""
+msgstr "Hoe bepaal je welke informatie wordt getoond als een mediabestand is\n    aanbevolen?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
 msgid ""
@@ -737,11 +852,11 @@ msgid ""
 "      Secondary Features display the first 256 characters of their description,\n"
 "      and Tertiary Features display the first 128 characters of their description.\n"
 "    "
-msgstr ""
+msgstr "\n      Als een nummer wordt aanbevolen, worden de titel, een miniatuurafbeelding en een deel van de omschrijving op de voorpagina van je website getoond.\n      Het aantal weergegeven tekens hangt af van de prioriteit van de aanbeveling.\n      Van een Primaire aanbeveling worden de eerste 512 tekens van de omschrijving getoond,\n      Secundaire aanbevelingen omvatten 256 tekens van de omschrijving.\n      Tertiaire aanbevelingen omvatten de eerste 128 tekens van de omschrijving.\n    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
 msgid "How to unfeature a piece of media?"
-msgstr ""
+msgstr "Hoe verwijder je een aanbeveling?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
 msgid ""
@@ -749,7 +864,7 @@ msgid ""
 "      Unfeature a media by removing its line from the above textarea and then\n"
 "      pressing the Submit Query button.\n"
 "    "
-msgstr ""
+msgstr "\n      Een medium uit de aanbevelingen verwijderen gebeurt door de regel uit het bovenstaande tekstveld te verwijderen en dan\n      de Verwerken Query knop in te drukken.\n    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
 msgid "CAUTION:"
@@ -762,7 +877,7 @@ msgid ""
 "      you make a typo, once you press Submit Query, your media entry will NOT be\n"
 "      featured. Make sure that all your intended Media Entries are featured.\n"
 "    "
-msgstr ""
+msgstr "\n      Let er bij knippen en plakken van url's in bovenstaande invoerveld op dat als je een typefout maakt, het nummer niet worden aanbevolen als je op Verwerk Query drukt. Zorg er voor dat de bedoelde nummer worden aanbevolen.\n    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
 msgid ""
@@ -782,7 +897,7 @@ msgstr "\nMedia niet meer aanbevelen"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
 msgid "Unfeature"
-msgstr "Niet aanbevolen"
+msgstr "Intrekken"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
 msgid ""
@@ -818,7 +933,7 @@ msgid ""
 "If you would like to feature a\n"
 "        piece of media, go to that media entry's homepage and click the button\n"
 "        that says <a class=\"button_action\">Feature</a>."
-msgstr ""
+msgstr "Als je een nummer wilt aanbevelen,\n        ga dan naar de homepagina van dat nummer en klik op de knop  \n<a class=\"button_action\">Aanbevelen</a>."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
 #, python-format
@@ -828,7 +943,7 @@ msgid ""
 "        have media featured as long as your instance has the 'archivalook'\n"
 "        plugin enabled. A more advanced tool to manage features can be found\n"
 "        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
-msgstr ""
+msgstr "Je ziet deze pagina om dat je een gebruiker bent met het recht nummers aan te bevelen, een gewone gebruiker ziet alleen een blanco pagina. Dus let erop je nummer aan te bevelen zolang jouw goblin de 'archivalook'\n        plugin heeft geactiveerd. Een meer geavanceerde plugin voor het aanbevelen kan worden gevonden in het <a href=\"%(featured_media_url)s\">Aanbevelingenbeheer paneel.</a>"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
 msgid "View most recent media"
@@ -836,7 +951,7 @@ msgstr "Bekijk de meest recente media"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
 msgid "Feature management panel"
-msgstr ""
+msgstr "Aanbevelingenbeheer panel"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
 msgid ""
@@ -898,7 +1013,7 @@ msgstr "Gebruikersnaam of e-mailadres"
 msgid ""
 "If that email address (case sensitive!) is registered an email has been sent"
 " with instructions on how to change your password."
-msgstr ""
+msgstr "Als dat e-mailadres (hoofdlettergevoelig!) is geregistreerd, dan wordt een e-mailbericht verstuurd met instructies voor het wijzigen van je wachtwoord."
 
 #: mediagoblin/plugins/basic_auth/views.py:65
 msgid "Couldn't find someone with that username."
@@ -927,7 +1042,7 @@ msgstr "Je kunt nu inloggen met je nieuwe wachtwoord."
 msgid ""
 "You are no longer an active user. Please contact the system admin to "
 "reactivate your account."
-msgstr ""
+msgstr "Je bent geen actieve gebruiker meer. Neem contact op met de beheerder om je account te heractiveren."
 
 #: mediagoblin/plugins/basic_auth/views.py:215
 msgid "Your password was changed successfully"
@@ -978,11 +1093,7 @@ msgstr "Stuur instructies"
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Locatie"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Bekijken op <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1019,7 +1130,7 @@ msgstr "De naam van de OAuth client"
 msgid ""
 "This will be visible to users allowing your\n"
 "                application to authenticate as them."
-msgstr ""
+msgstr "Dit is zichtbaar voor gebruikers waardoor je\n                applicatie als hen kan inloggen."
 
 #: mediagoblin/plugins/oauth/forms.py:40
 msgid "Type"
@@ -1033,7 +1144,7 @@ msgid ""
 "                <strong>Public</strong> - The client can't make confidential\n"
 "                requests to the GNU MediaGoblin instance (e.g. client-side\n"
 "                JavaScript client)."
-msgstr ""
+msgstr "<strong>Vertrouwelijk</strong> - De client kan\n                aanvragen doen bij de GNU MediaGoblin server die niet kunnen worden afgevangen door de user agent (bijv. server-side client).<br />\n                <strong>Openbaar</strong> - De client kan geen vertrouwelijke aanvragen bij de GNU MediaGoblin server maken (bijv. client-side\n                JavaScript client)."
 
 #: mediagoblin/plugins/oauth/forms.py:52
 msgid "Redirect URI"
@@ -1043,13 +1154,13 @@ msgstr "Redirect URI"
 msgid ""
 "The redirect URI for the applications, this field\n"
 "            is <strong>required</strong> for public clients."
-msgstr ""
+msgstr "De verwijs URI voor de applicaties, dit veld\n            is <strong>verplicht</strong> voor openbare clients."
 
 #: mediagoblin/plugins/oauth/forms.py:66
 msgid "This field is required for public clients"
 msgstr "Dit is een verplicht veld voor openbare clients"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "De client {0} is geregistereerd!"
 
@@ -1062,8 +1173,8 @@ msgid "Your OAuth clients"
 msgstr "Je OAuth clients"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Sorry, er is al een account geregistreerd met die OpenID"
 
@@ -1071,39 +1182,39 @@ msgstr "Sorry, er is al een account geregistreerd met die OpenID"
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Sorry, de OpenID server kon niet worden gevonden"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Geen OpenID service gevonden voor %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Verificatie van %s mislukt\"%s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Verificatie geannuleerd"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Je OpenID URL is succesvol bewaard."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Je kunt je OpenID URL alleen verwijderen als je een wachtwoord hebt ingesteld."
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Die OpenID is niet geregistreerd voor dit account."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID succesvol verwijderd."
 
@@ -1127,7 +1238,7 @@ msgstr "OpenID's"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1159,26 +1270,26 @@ msgstr "Of registreer met een OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Sorry, er is al een account geregistreerd met dat Persona e-mailadres."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "Het Persona e-mailadres is succesvol verwijderd."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Je kunt je Persona e-mailadres alleen verwijderen als je een wachtwoord hebt ingesteld."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Dat Persona e-mailadres is niet geregistreerd voor dit account."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Sorry, er is al een account geregistreerd met dat Persona e-mailadrers."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Je Persona e-mailadres is succesvol bewaard."
 
@@ -1202,17 +1313,17 @@ msgstr "Of login met Persona!"
 msgid "Or register with Persona!"
 msgstr "Of registreer mer Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Verkeerd bestandsformaat voor mediatype opgegeven."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Kopiëren naar openbare opslag mislukt."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
-msgstr ""
+msgstr "Een acceptabel verwerkingsbestand is niet aanwezig"
 
 #: mediagoblin/submit/forms.py:30
 msgid "Max file size: {0} mb"
@@ -1229,11 +1340,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Je kunt\n                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                        Markdown</a> gebruiken voor opmaak."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Je moet een bestand opgeven."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Verzameling \"%s\" toegevoegd!"
@@ -1245,7 +1356,7 @@ msgstr "Je bent geblokkeerd."
 #: mediagoblin/templates/mediagoblin/banned.html:24
 #: mediagoblin/templates/mediagoblin/error.html:24
 msgid "Image of goblin stressing out"
-msgstr ""
+msgstr "Afbeelding van uitgestrekte goblin"
 
 #: mediagoblin/templates/mediagoblin/banned.html:26
 msgid "You have been banned"
@@ -1256,26 +1367,26 @@ msgstr "Je bent geblokkeerd"
 msgid "until %(until_when)s"
 msgstr "tot %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Verifieer je e-mailadres!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "uitloggen"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Accountinstellingen aanpassen"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1283,29 +1394,29 @@ msgstr "Accountinstellingen aanpassen"
 msgid "Media processing panel"
 msgstr "Mediaverwerkingspaneel"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Afmelden"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Voeg media toe"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Creëer een nieuwe verzameling"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr "Moderator mogelijkheden:"
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Gebruikersbeheer panel"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Meldingenbeheer panel"
 
@@ -1359,8 +1470,8 @@ msgid "Authorization Complete"
 msgstr "Autorisatie compleet"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Kopieer en plak dit in je client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr "Kopieer en plak deze <strong>verificatiecode</strong> in je client:"
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1450,13 +1561,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Aanpassen bijlagen voor %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Bijlagen"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Voeg een bijlage toe"
 
@@ -1474,6 +1585,47 @@ msgstr "Wijzigingen opslaan"
 msgid "Changing %(username)s's email"
 msgstr "Wijzigen %(username)s's e-mailadres"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr "Intrekken applicatieautorisaties"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr "Intrekken applicatieautorisaties"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr "Deze applicaties kunnen je GNU MediaGoblin account gebruiken.\nDeautoriseren van de applicatie betekent dat die je account niet kan gebruiken."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr "Er zijn geen applicaties geautoriseerd."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr "Type:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr "Geautoriseerd:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s geleden"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1499,7 +1651,7 @@ msgstr "%(username)ss accountinstellingen aanpassen"
 msgid "Delete my account"
 msgstr "Verwijder mijn account"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "E-mailadres"
 
@@ -1553,19 +1705,6 @@ msgstr "Hallo,\n\nWe willen verifiëren dat jij %(username)s bent. Als dat zo is
 msgid "New comments"
 msgstr "Nieuwe reacties"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s geleden"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Alles markeren als gelezen"
@@ -1578,38 +1717,38 @@ msgstr "Alles markeren als gelezen"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Media met het label: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Download"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Origineel"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Sorry, dit geluidsfragment zal niet werken omdat \n\tje webbrowser geen HTML5 audio\n\tondersteunt."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr "Sorry, dit geluidsfragment zal niet werken omdat\n⇥ je webbrowser geen HTML5 audio ondersteunt"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Je kunt een moderne web-browser die \n\taudio kan afspelen vinden op <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr "Je kunt een moderne web-browser die wel\n⇥ audio kan afspelen vinden op <a href=\"http://getfirefox.com\">\n⇥ http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Origineel bestand"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM bestand (Vorbis codec)"
 
@@ -1617,70 +1756,70 @@ msgstr "WebM bestand (Vorbis codec)"
 msgid "Created"
 msgstr "Aangemaakt"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Afbeelding voor %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF bestand"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspectief"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Voorkant"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Bovenkant"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Zijkant"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Download model"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Bestandsformaat"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Object hoogte"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Sorry, deze video werkt niet omdat\nje webbrowser geen HTML5 video ondersteunt."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Je kunt een moderne webbrowser die\ndeze video af kan spelen krijgen op\n<a href=\"http://getfirefox.com\">http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "WebM bestand (VP8/Vorbis)"
 
@@ -1765,7 +1904,7 @@ msgid "Return to Reports Panel"
 msgstr "Terug naar Meldingenpanel"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Melden"
 
@@ -2071,17 +2210,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Blogbericht door <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Geef een reactie"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Voeg dit bericht toe"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Toegevoegd"
 
@@ -2153,12 +2292,12 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s media met tag <a href=\"%(ta
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Media van <a href=\"%(user_url)s\"> %(username)s </a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Blader door media van <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Voorbeeldreactie"
 
@@ -2317,6 +2456,10 @@ msgstr "nieuwer"
 msgid "older"
 msgstr "ouder"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Locatie"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Meld media"
@@ -2325,43 +2468,43 @@ msgstr "Meld media"
 msgid "Tagged with"
 msgstr "Getagged met"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Kon het afbeeldingsbestand niet lezen."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Oeps!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Er trad een fout op"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Verkeerde aanvraag"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "De aanvraag aan de server is ongeldig, controleer opnieuw"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Actie niet toegestaan"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
-msgstr ""
+msgstr "Sorry knul, dat kan ik je niet laten doen!</p><p>Je probeerde iets te doen wat je niet mag. Probeerde je opnieuw alle accounts te verwijderen?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
 " deleted."
-msgstr ""
+msgstr "Er lijkt geen pagina aanwezig op dit adres. Sorry!</p><p>Als je zeker weet dat het adres goed is, dan is de pagina misschien verplaatst of verwijderd."
 
 #: mediagoblin/tools/timesince.py:62
 msgid "year"
@@ -2424,69 +2567,69 @@ msgstr "Je kunt\n                      <a href=\"http://daringfireball.net/proje
 msgid "Reason for Reporting"
 msgstr "Aanleiding voor melding"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Sorry, reageren is uitgeschakeld."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Oeps, je bericht was leeg."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Je bericht is geplaatst!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Controleer de nummer en probeer het opnieuw."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Je moet een collectie selecteren of aanmaken"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" zit al in collectie \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" toegevoegd aan collectie \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Je hebt deze media verwijderd."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Je staat op het punt de media van iemand anders te verwijderen. Pas op."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Je hebt het nummer uit de collectie verwijderd."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Dit nummer is niet verwijderd omdat je niet hebt aangegeven dat je het zeker weet."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Je staat op het punt een nummer uit de collectie van iemand anders te verwijderen. Pas op."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Je verwijderde collectie \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "De collectie is niet verwijderd omdat je niet hebt aangegeven dat je het zeker weet."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Je staat op het punt om de collectie van iemand anders te verwijderen. Pas op."
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index ac158ea1..00000000
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/mediagoblin.po
index d34bb151..375b05fd 100644
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nn_NO/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -20,67 +20,167 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Registrering er slege av. Orsak."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Rapportering er slege av. Orsak."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Autentisering er slege av. Orsak."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Ugyldig brukarnamn eller passord."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Dette feltet tek ikkje epostadresser."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Dette feltet krev ei epostadresse."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Ein konto med dette brukarnamnet finst allereide."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Ein brukar med den epostadressa finst allereie."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Kontoen din er stadfesta. Du kan no logga inn, endra profilen din og lasta opp filer."
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Du må vera innlogga, slik me veit kven som skal ha eposten."
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Du har allereie verifisiert epostadressa."
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Stadfestingsepost sendt."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -96,7 +196,7 @@ msgid "Description of this work"
 msgstr "Skildring av verk"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -112,11 +212,11 @@ msgstr "Merkelappar"
 msgid "Separate tags by commas."
 msgstr "Separer merkelappar med komma."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Nettnamn"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Nettnamnet kan ikkje vera tomt"
 
@@ -144,125 +244,137 @@ msgstr "Heimeside"
 msgid "This address contains errors"
 msgstr "Adressa inneheld feil"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Send meg epost når andre kjem med innspel på verka mine."
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Slå av/på notifikasjonar om hendingar."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Lisens-val"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Dette vil vera standardvalet ditt for lisens."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Tittelen kjan ikkje vera tom"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Forklaringa til denne samlinga"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Tittel-delen av denne samlinga si adresse. Du treng normalt sett ikkje endra denne."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Gamalt passort"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Skriv inn det gamle passordet ditt for å stadfesta at du eig denne kontoen."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nytt passord"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Ny epostadresse"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Passord"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Skriv inn passordet som prov på at dette er din konto."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr "Identifikator"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr "Verdi"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Eit innlegg med denne adressetittelen finst allereie."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sine verk."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "La til vedlegg %s."
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Du kan berre enda din eigen profil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sin profil."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Lagra endring av profilen"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Lagra kontoinstellingar"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Du må stadfesta slettinga av kontoen din."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Du har allereie ei samling med namn «%s»."
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Ei samling med den nettadressa finst allereie for denne brukaren."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Du endrar ein annan brukar si samling. Trå varsamt."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Epostadressa di er bekrefta."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Feil passord"
 
@@ -293,7 +405,7 @@ msgstr "Hopper over «%s»: allereie satt opp.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Gamal lenkje funnen for «%s»; fjernar.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -301,58 +413,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr "For more information about how to properly run this\nscript (and how to format the metadata csv file), read the MediaGoblin\ndocumentation page on command line uploading\n<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr "Name of user these media entries belong to"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr "Path to the csv file containing metadata information."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr "Don't process eagerly, pass off to celery"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr "Sorry, no user by username '{username}' exists"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr "File at {path} not found, use -h flag for help"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr "Error with media '{media_id}' value '{error_path}': {error_msg}\nMetadata was not uploaded."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr "FAIL: Local file {filename} could not be accessed.\n{filename} will not be uploaded."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr "Successfully submitted {filename}!\nBe sure to look at the Media Processing Panel on your website to be sure it\nuploaded successfully."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr "FAIL: This file is larger than the upload limits for this site."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr "FAIL: This file will put this user past their upload limits."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr "FAIL: This user is already past their upload limits."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr "{files_uploaded} out of {files_attempted} files successfully submitted"
 
@@ -378,28 +490,28 @@ msgstr "Forklaring"
 msgid "I am sure I want to delete this"
 msgstr "Eg er sikker eg vil sletta dette"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Johoo! Opplasta!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr "Sende inn det endra innlegget"
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr "Du sletta bloggen."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Sletta ikkje verket."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr "Du er i ferd med å sletta ein annan brukar sin blogg. Trå varsamt."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr "Sletta ikkje bloggen fordi du ikkje har løyve."
 
@@ -419,7 +531,7 @@ msgstr "Slett blogg"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Endra"
 
@@ -429,7 +541,7 @@ msgstr "Endra"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Slett"
 
@@ -556,46 +668,46 @@ msgstr "Melding til brukar:"
 msgid "Resolution content:"
 msgstr "Løysingsinnhald:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr "\n{mod} tok vekk {privilege} privilegiane til {user}."
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr "\n{mod} utestengde brukaren {user} {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr "til {dato}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "for alltid"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr "\n{mod} sende ein åtvaringsepost til {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr "\n{mod} sletta innspelet."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr "\n{mod} sletta verket."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Åtvaring frå"
 
@@ -613,26 +725,26 @@ msgstr "Tingar innspel frå %s."
 msgid "You will not receive notifications for comments on %s."
 msgstr "Du vil ikkje få notifikasjonar for innspel på %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Treng oauth_token (must provide oath_token)."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Noko gjekk gale :( (no request token found)."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Fila er for stor."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Opplasting av denne fila vil putta deg over opplastingsgrensa di."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Du har nådd opplastingsgrensa di."
 
@@ -977,11 +1089,7 @@ msgstr "Send instruksjonar"
 msgid "Forgot your password?"
 msgstr "Gløymd passordet?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Stad"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Sjå på <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1048,7 +1156,7 @@ msgstr "Omdirigerings-URI-en for programmene. Denne feltet <strong>krevst</stron
 msgid "This field is required for public clients"
 msgstr "Dette feltet krevst for opne (public) klientar"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Klienten {0} er registrert."
 
@@ -1061,8 +1169,8 @@ msgid "Your OAuth clients"
 msgstr "Dine OAuth-klientar"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Ein konto er allereie registrert til den OpenID-en."
 
@@ -1070,39 +1178,39 @@ msgstr "Ein konto er allereie registrert til den OpenID-en."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Fann ikkje OpenID-tenaren."
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Ingen OpenID funne for %s."
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Stadfesting av %s feila: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Stadfesting avbrutt"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Lagra OpenID-url."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Kan ikkje sletta den einaste OpenID-urlen utan at du har eit passord satt."
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Den OpenID-en er ikkje registrert til denne kontoen."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "Fjerna OpenID-en."
 
@@ -1126,7 +1234,7 @@ msgstr "OpenID-ar"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1158,26 +1266,26 @@ msgstr "Eller registrer med OpenID."
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Ein konto er allereie registrert til den Persona-eposten."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "Persone-eposten fjerna."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Du kan ikkje sletta din einaste Persona-epostadresse utan eit passord satt."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Den Persona-epostadressa er ikkje registrert til denne kontoen."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Ein konto med den Persona-epostadressa finst allereie."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Persone-epostadressa lagra."
 
@@ -1201,15 +1309,15 @@ msgstr "Eller logg inn med Persona."
 msgid "Or register with Persona!"
 msgstr "Eller registrer med Persona."
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Ugyldig fil for medietypen."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Klarte ikkje kopiera til «public storage»."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "Fann ingen akseptable filar for prosessering."
 
@@ -1228,11 +1336,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Du kan bruka\n                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                        Markdown</a> til formattering."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Du må velja ei fil."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "La til samlinga «%s»."
@@ -1255,26 +1363,26 @@ msgstr "Du har blitt bannlyst."
 msgid "until %(until_when)s"
 msgstr "til %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Stadfest epostadressa di."
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "Logg ut"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> sin konto"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Endra kontoinstellingar"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1282,29 +1390,29 @@ msgstr "Endra kontoinstellingar"
 msgid "Media processing panel"
 msgstr "Verkprosesseringspanel"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Logg ut"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Legg til verk"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Lag ny samling"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Brukaradministrasjon"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Rapporteringsadministrasjon"
 
@@ -1358,8 +1466,8 @@ msgid "Authorization Complete"
 msgstr "Godkjenning ferdig"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Kopier og lim inn dette i klienten din:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1449,13 +1557,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Endrar vedlegg for %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Vedlegg"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Legg ved vedlegg"
 
@@ -1473,6 +1581,47 @@ msgstr "Lagra"
 msgid "Changing %(username)s's email"
 msgstr "Endrar eposten til %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s sidan"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1498,7 +1647,7 @@ msgstr "Endrar kontoinnstellingane til %(username)s"
 msgid "Delete my account"
 msgstr "Slett kontoen min"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Epost"
 
@@ -1552,19 +1701,6 @@ msgstr "Hei!\n\nMe ynskjer å stadfesta at du er %(username)s. Dersom du er\nfyl
 msgid "New comments"
 msgstr "Nye innspel"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s sidan"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Marker alt lese"
@@ -1577,38 +1713,38 @@ msgstr "Marker alt lese"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Verk merka med: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Last ned"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Opphavleg"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Orsak, dette lydklippet fungerer ikkje fordi netlesaren din ikkje stør HTML5-lyd."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Du kan skaffa ein moderne netlesar som kan spela av dette lydklippet hjå <a href=\"http://opera.com/download\">http://opera.com/download</a>."
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Opphavleg fil"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM-fil (Vorbis-kodek)"
 
@@ -1616,70 +1752,70 @@ msgstr "WebM-fil (Vorbis-kodek)"
 msgid "Created"
 msgstr "Oppretta"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Bilete for %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF-fil"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspektiv"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Front"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Topp"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Side"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Last ned modell"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Filformat"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Objekthøgd"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Orsak, denne videoen fungerer ikkje\nfordi netlesaren din ikkje stør\nHTML5 video."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Du kan skaffa deg ein moderne netlesar som kan spela denne videoen hjå <a href=http://opera.com>http://opera.com</a> eller <a href=\"http://getfirefox.com\">http://getfirefox.com</a>."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "WebM-fil (VP8/Vorbis)"
 
@@ -1764,7 +1900,7 @@ msgid "Return to Reports Panel"
 msgstr "Attende til rapporteringspanelet"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Rapport"
 
@@ -2070,17 +2206,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Legg att innspel"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Legg til dette innspelet"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Lagt til"
 
@@ -2152,12 +2288,12 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a> sine verk merka <a href=\"%(ta
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a> sine verk"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Ser på <a href=\"%(user_url)s\">%(username)s</a> sine verk"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Førehandsvisning av innspel"
 
@@ -2316,6 +2452,10 @@ msgstr "nyare"
 msgid "older"
 msgstr "eldre"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Stad"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Rapportér verk"
@@ -2324,38 +2464,38 @@ msgstr "Rapportér verk"
 msgid "Tagged with"
 msgstr "Merka med"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Klarte ikkje lesa biletefila."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Oops."
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Noko gjekk gale"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Bad Request (noko gjekk gale)"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "The request sent to the server is invalid, please double check it"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Ulovleg operasjon"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Orsak Dave, eg kan ikkje la deg gjera det!&lt;HAL2000&gt;</p>\n<p>Du prøvde å gjera noko du ikkje har løyve til. Prøvar du å sletta alle brukarkonti no igjen?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2423,69 +2563,69 @@ msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basic
 msgid "Reason for Reporting"
 msgstr "Ã…rsak for rapportering"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Innspel er avslege"
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Vops, innspelet ditt var tomt."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Innspelet ditt er lagt til."
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Sjekk filene dine og prøv omatt."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Du må velja eller laga ei samling"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "«%s» er allereie i samling «%s»"
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "«%s» lagt til samling «%s»"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Du sletta verket."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Du er i ferd med å sletta ein annan brukar sine verk. Trå varsamt."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Du fjerna fila frå samlinga."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Fila var ikkje fjerna fordi du ikkje var sikker."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Du er i ferd med å fjerna ei fil frå ein annan brukar si samling. Trå varsamt."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Samlinga «%s» sletta"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Sletta ikkje samlinga."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Du er i ferd med å sletta ein annan brukar si samling. Trå varsamt."
diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index ed82de03..00000000
--- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pl/mediagoblin.po
index a595286d..44a4d990 100644
--- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pl/mediagoblin.po
@@ -1,16 +1,17 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
+# Daniel Koć <daniel@xn--ko-wla.pl>, 2014
 # Daniel Koć <daniel@xn--ko-wla.pl>, 2012
 # Sergiusz Pawłowicz <transifex@pawlowicz.name>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/mediagoblin/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,67 +21,167 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Niestety rejestracja w tym serwisie jest wyłączona."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
-msgstr ""
+msgstr "W tym serwisie zgłaszanie zostało wyłączone."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Przepraszamy, autoryzacja jest wyłączona w tym systemie."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Nieprawidłowa nazwa konta albo niewłaściwy adres poczty elektronicznej."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Niniejsze pole nie jest przeznaczone na adres poczty elektronicznej."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Niniejsze pole wymaga podania adresu poczty elektronicznej."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Niestety użytkownik o takiej nazwie już istnieje."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Niestety użytkownik z tym adresem e-mail już istnieje."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "Klucz kontrolny albo identyfikator użytkownika jest nieprawidłowy."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Twój adres e-mail został zweryfikowany. Możesz się teraz zalogować, wypełnić opis swojego profilu i wysyłać grafiki!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Nieprawidłowy klucz weryfikacji lub identyfikator użytkownika."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Musisz się zalogować żebyśmy wiedzieli do kogo wysłać e-mail!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Twój adres e-mail już został zweryfikowany!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Wyślij ponownie e-mail weryfikujący."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -96,7 +197,7 @@ msgid "Description of this work"
 msgstr "Opis tej pracy"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -112,11 +213,11 @@ msgstr "Znaczniki"
 msgid "Separate tags by commas."
 msgstr "Rozdzielaj znaczniki przecinkami."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Slug"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Slug nie może być pusty"
 
@@ -144,125 +245,137 @@ msgstr "Strona internetowa"
 msgid "This address contains errors"
 msgstr "Ten adres zawiera błędy"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Powiadamiaj mnie e-mailem o komentarzach do moich mediów"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Włącz powiadomienia dotyczące wydarzeń"
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Ulubiona licencja"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "To będzie twoja domyślna licencja dla wgrywanych mediów."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Tytuł nie może być pusty"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Opis tej kolekcji"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Część adresu zawierająca tytuł. Zwykle nie musisz tego zmieniać."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Stare hasło"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Wprowadź swoje stare hasło aby udowodnić, że to twoje konto."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Nowy adres poczty elektronicznej"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Hasło"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Wprowadź swoje hasło aby potwierdzić, że jesteś właścicielem konta."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
-msgstr ""
+msgstr "Identyfikator"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
-msgstr ""
+msgstr "Wartość"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Adres z tym slugiem dla tego użytkownika już istnieje."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Edytujesz media innego użytkownika. Zachowaj ostrożność."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Dodałeś załącznik %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Masz możliwość edycji tylko własnego profilu."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Edytujesz profil innego użytkownika. Zachowaj ostrożność."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Zapisano zmiany profilu"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Zapisano ustawienia konta"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Musisz potwierdzić, że chcesz skasować swoje konto."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Kolekcja \"%s\" już istnieje!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Kolekcja tego użytkownika z takim slugiem już istnieje."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Edytujesz kolekcję innego użytkownika. Zachowaj ostrożność."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Twój adres poczty elektronicznej został potwierdzony."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Nieprawidłowe hasło"
 
@@ -293,7 +406,7 @@ msgstr "Opuszczam \"%s\"; już jest gotowe.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Znaleziono stary odnośnik dla \"%s\"; usuwam.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -301,58 +414,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -378,48 +491,48 @@ msgstr "Opis"
 msgid "I am sure I want to delete this"
 msgstr "Na pewno chcę to usunąć"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Hura! Wysłano!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
-msgstr ""
+msgstr "Blog został usunięty."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Media nie zostały usunięte ponieważ nie potwierdziłeś, że jesteś pewien."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
 msgid "Add Blog Post"
-msgstr ""
+msgstr "Dodaj wpis"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
 msgid "Edit Blog"
-msgstr ""
+msgstr "Edycja bloga"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
 msgid "Delete Blog"
-msgstr ""
+msgstr "Usuń bloga"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Edytuj"
 
@@ -429,7 +542,7 @@ msgstr "Edytuj"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Usuń"
 
@@ -439,7 +552,7 @@ msgstr ""
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
 msgid " No blog post yet. "
-msgstr ""
+msgstr "Brak wpisów"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -498,11 +611,11 @@ msgstr ""
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
 msgid "Create a Blog"
-msgstr ""
+msgstr "Utwórz bloga"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
 msgid " Blog Dashboard "
-msgstr ""
+msgstr "Panel bloga"
 
 #: mediagoblin/media_types/pdf/processing.py:142
 msgid "unoconv failing to run, check log file"
@@ -514,23 +627,23 @@ msgstr "Konwersja wideo nie powiodła się"
 
 #: mediagoblin/moderation/forms.py:21
 msgid "Take away privilege"
-msgstr ""
+msgstr "Wycofaj uprawnienia"
 
 #: mediagoblin/moderation/forms.py:22
 msgid "Ban the user"
-msgstr ""
+msgstr "Zablokuj użytkownika"
 
 #: mediagoblin/moderation/forms.py:23
 msgid "Send the user a message"
-msgstr ""
+msgstr "Wyślij wiadomość do użytkownika"
 
 #: mediagoblin/moderation/forms.py:24
 msgid "Delete the content"
-msgstr ""
+msgstr "Usuń treść"
 
 #: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
 msgid "User will be banned until:"
-msgstr ""
+msgstr "Blokada użytkownika do:"
 
 #: mediagoblin/moderation/forms.py:57
 msgid "Why are you banning this User?"
@@ -550,54 +663,54 @@ msgstr ""
 
 #: mediagoblin/moderation/forms.py:125
 msgid "Message to user:"
-msgstr ""
+msgstr "Wiadomość do użytkownika:"
 
 #: mediagoblin/moderation/forms.py:128
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
-msgstr ""
+msgstr "do {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
-msgstr ""
+msgstr "na zawsze"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
-msgstr ""
+msgstr "Ostrzeżenie od"
 
 #: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
 msgid "commented on your post"
@@ -613,26 +726,26 @@ msgstr "Zaprenumerowano komentarze do %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Nie będziesz otrzymywać komentarzy do %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Musisz podać oauth_token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Nie znaleziono żetonu żądania."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
-msgstr ""
+msgstr "Niestety rozmiar pliku jest zbyt duży."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -642,15 +755,15 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/tools.py:132
 msgid "Primary"
-msgstr ""
+msgstr "Podstawowy"
 
 #: mediagoblin/plugins/archivalook/tools.py:133
 msgid "Secondary"
-msgstr ""
+msgstr "Dodatkowy"
 
 #: mediagoblin/plugins/archivalook/tools.py:134
 msgid "Tertiary"
-msgstr ""
+msgstr "Kolejny"
 
 #: mediagoblin/plugins/archivalook/tools.py:135
 msgid "-----------{display_type}-Features---------------------------\n"
@@ -831,7 +944,7 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
 msgid "View most recent media"
-msgstr ""
+msgstr "PrzeglÄ…daj najnowsze media"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
 msgid "Feature management panel"
@@ -962,7 +1075,7 @@ msgstr "Utwórz je tutaj!"
 
 #: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
 msgid "Change your password."
-msgstr ""
+msgstr "Zmień hasło."
 
 #: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
 #: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
@@ -977,11 +1090,7 @@ msgstr "Wyślij instrukcje"
 msgid "Forgot your password?"
 msgstr "Zapomniałeś hasła?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Położenie"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Zobacz na <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -992,11 +1101,11 @@ msgstr ""
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
 msgid "Metadata"
-msgstr ""
+msgstr "Metadane"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
 msgid "Edit Metadata"
-msgstr ""
+msgstr "Edycja metadanych"
 
 #: mediagoblin/plugins/oauth/forms.py:29
 msgid "Allow"
@@ -1048,7 +1157,7 @@ msgstr "Przekierowanie URI dla aplikacji, to pole\n            jest <strong>wyma
 msgid "This field is required for public clients"
 msgstr "To pole jest wymagane dla klientów publicznych"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Klient {0} został zarejestrowany!"
 
@@ -1061,8 +1170,8 @@ msgid "Your OAuth clients"
 msgstr "Twoi klienci OAuth"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Przepraszamy, ale istnieje już konto zarejestrowane z tym OpenID."
 
@@ -1070,39 +1179,39 @@ msgstr "Przepraszamy, ale istnieje już konto zarejestrowane z tym OpenID."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Przepraszamy, serwer OpenID nie został znaleziony"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Nie znaleziono serwisu OpenID dla %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Potwierdzenie %s nie powiodło się: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Potwierdzenie anulowane"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Twój OpenID url został pomyślnie zachowany."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Wskazane OpenID nie jest powiÄ…zane z niniejszym kontem."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "Konto OpenID zostało pomyślnie usunięte."
 
@@ -1126,7 +1235,7 @@ msgstr "OpenID"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1158,26 +1267,26 @@ msgstr "Lub zarejestruj siÄ™ z OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "Konto związane z Persona zostało pomyślnie usunięte."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Nie możesz usunąć adresu poczty elektronicznej powiązanego z systemem Persona, gdyż twoje konto zostanie wtedy bez jakiegokolwiek hasła."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Niniejsze konto nie jest powiÄ…zane z adresem poczty elektronicznej w Persona."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Twój adres poczty elektronicznej powiązany z Persona został zachowany pomyślnie."
 
@@ -1201,21 +1310,21 @@ msgstr "Lub zaloguj z kontem Persona!"
 msgid "Or register with Persona!"
 msgstr "Lub zarejestruj z kontem Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Niewłaściwy plik dla tego rodzaju mediów."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Kopiowanie do dysku publicznego nie powiodło się."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
 #: mediagoblin/submit/forms.py:30
 msgid "Max file size: {0} mb"
-msgstr ""
+msgstr "Maksymalny rozmiar pliku: {0} MB"
 
 #: mediagoblin/submit/forms.py:34
 msgid "File"
@@ -1228,11 +1337,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Musisz podać plik."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Kolekcja \"%s\" została dodana!"
@@ -1255,26 +1364,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Zweryfikuj swój adres e-mail!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "wyloguj siÄ™"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "konto <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Zmień ustawienia konta"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1282,29 +1391,29 @@ msgstr "Zmień ustawienia konta"
 msgid "Media processing panel"
 msgstr "Panel przetwarzania mediów"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Wyloguj siÄ™"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Dodaj media"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Utwórz nową kolekcję"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1358,8 +1467,8 @@ msgid "Authorization Complete"
 msgstr "Uwierzytelnianie zakończone."
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Skopiuj i wklej to do swojego klienta:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1398,7 +1507,7 @@ msgstr "Opublikowane na licencji <a href=\"http://www.fsf.org/licensing/licenses
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
 msgid "Terms of Service"
-msgstr ""
+msgstr "Warunki korzystania"
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
 msgid "Explore"
@@ -1435,7 +1544,7 @@ msgstr ""
 msgid ""
 "\n"
 "            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
-msgstr ""
+msgstr "\n<a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Zainstaluj MediaGoblina na własnym serwerze</a>"
 
 #: mediagoblin/templates/mediagoblin/bits/logo.html:23
 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -1449,13 +1558,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Edycja załączników do %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Załączniki"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Dodaj załącznik"
 
@@ -1473,6 +1582,47 @@ msgstr "Zapisz zmiany"
 msgid "Changing %(username)s's email"
 msgstr "Zmieniam konto poczty elektronicznej dla %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s temu"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1498,7 +1648,7 @@ msgstr "Zmiana ustawień konta %(username)s"
 msgid "Delete my account"
 msgstr "Usuń moje konto"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Adres poczty elektronicznej"
 
@@ -1520,7 +1670,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:72
 msgid "MetaData"
-msgstr ""
+msgstr "Metadane"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:80
 msgid "Add new Row"
@@ -1528,7 +1678,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:83
 msgid "Update Metadata"
-msgstr ""
+msgstr "Aktualizacja metadanych"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:87
 msgid "Clear empty Rows"
@@ -1552,19 +1702,6 @@ msgstr ""
 msgid "New comments"
 msgstr "Nowe komentarze"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s temu"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Oznacz wszystkie jako przeczytane"
@@ -1577,38 +1714,38 @@ msgstr "Oznacz wszystkie jako przeczytane"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Media ze znacznikami: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Pobierz"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Oryginał"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Niestety, ten plik dźwiękowy nie zostanie odtworzony, \n\tponieważ ta przeglądarka nie obsługuje znaczników  \n\tdźwięku w HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Proszę pobrać przeglądarkę, która obsługuje  \n\tdźwięk w HTML5, pod adresem <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Oryginalny plik"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "plik WebM (kodek Vorbis)"
 
@@ -1616,70 +1753,70 @@ msgstr "plik WebM (kodek Vorbis)"
 msgid "Created"
 msgstr "Utworzono"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Grafika dla %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Plik PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspektywa"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "PoczÄ…tek"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Góra"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Krawędź"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Pobierz model"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Format pliku"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Wysokość obiektu"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Niestety ten materiał nie będzie widoczny�, ponieważ twoja przeglądarka nie� osbługuje formatu HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Możesz pobrać porządną przeglądarkę, która jest w stanie odtworzyć ten materiał filmowy, ze strony <a href=\"http://getfirefox.com/\">� http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "Plik WebM (VP8/Vorbis)"
 
@@ -1698,13 +1835,13 @@ msgstr "Przetwarzane media"
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
 msgid "ID"
-msgstr ""
+msgstr "Identyfikator"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
@@ -1764,7 +1901,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -1806,7 +1943,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:149
 msgid "Status"
-msgstr ""
+msgstr "Stan"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:151
 msgid "RESOLVED"
@@ -1819,7 +1956,7 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
 msgid "Report panel"
-msgstr ""
+msgstr "Panel zgłoszeń"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
 msgid ""
@@ -1835,21 +1972,21 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
 msgid "Offender"
-msgstr ""
+msgstr "Naruszyciel"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
 msgid "When Reported"
-msgstr ""
+msgstr "Data zgłoszenia"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
 msgid "Reported By"
-msgstr ""
+msgstr "Zgłoszone przez"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
 msgid "Reason"
-msgstr ""
+msgstr "Powód"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
 #, python-format
@@ -1881,7 +2018,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
 msgid "Action Taken"
-msgstr ""
+msgstr "Podjęte działanie"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
 #, python-format
@@ -1898,11 +2035,11 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/moderation/user.html:23
 #, python-format
 msgid "User: %(username)s"
-msgstr ""
+msgstr "Użytkownik: %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:42
 msgid "Return to Users Panel"
-msgstr ""
+msgstr "Powrót do panelu użytkownika"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:49
 msgid "Sorry, no such user found."
@@ -2005,32 +2142,32 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:172
 msgid "Privilege"
-msgstr ""
+msgstr "Uprawnienie"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:173
 msgid "Granted"
-msgstr ""
+msgstr "Przyznane"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:180
 msgid "Yes"
-msgstr ""
+msgstr "Tak"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:182
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:213
 msgid "Ban User"
-msgstr ""
+msgstr "Zablokuj użytkownika"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:218
 msgid "UnBan User"
-msgstr ""
+msgstr "Odblokuj użytkownika"
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
 msgid "User panel"
-msgstr ""
+msgstr "Panel użytkownika"
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
 msgid ""
@@ -2070,17 +2207,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Dodaj komentarz"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Dodaj komentarz"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Dodano"
 
@@ -2152,12 +2289,12 @@ msgstr "pliki użytkownika <a href=\"%(user_url)s\">%(username)s</a> z tagiem <a
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "media użytkownika <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Przeglądanie mediów użytkownika <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "PodglÄ…d komentarza"
 
@@ -2296,15 +2433,15 @@ msgstr "Wszystkie prawa zastrzeżone"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "� Newer"
-msgstr "� Nowsze"
+msgstr "� nowsze"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:45
 msgid "Older →"
-msgstr "Starsze →"
+msgstr "starsze →"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
-msgstr "Idź do strony:"
+msgstr "Przejdź do strony:"
 
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
@@ -2316,46 +2453,50 @@ msgstr "nowsze"
 msgid "older"
 msgstr "starsze"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Położenie"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
-msgstr ""
+msgstr "Zgłoś naruszenie"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
 msgid "Tagged with"
 msgstr "Znaczniki:"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Nie udało się odczytać pliku grafiki."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Ups!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Wystąpił błąd"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Niewłaściwe żądanie"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "Żądanie wysłane do serwera jest nieprawidłowe, sprawdź je proszę ponownie"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Operacja niedozwolona"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Misiaczku, nie możesz tego uczynić!</p><p>Próbowałeś wykonać działanie, do którego nie masz uprawnień. Czy naprawdę chciałeś skasować znowu wszystkie konta?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2421,71 +2562,71 @@ msgstr "Możesz formatować tekst za pomocą składni\n<a ref=\"http://daringfir
 
 #: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
 msgid "Reason for Reporting"
-msgstr ""
+msgstr "Powód zgłoszenia"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Komentowanie jest wyłączone."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Ups, twój komentarz nie zawierał treści."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Twój komentarz został opublikowany!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Sprawdź swoje wpisy i spróbuj ponownie."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Musisz wybrać lub dodać kolekcję"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" już obecne w kolekcji \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" dodano do kolekcji \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Media zostały usunięte."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Za chwilę usuniesz media innego użytkownika. Zachowaj ostrożność."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Element został usunięty z kolekcji."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Ten element nie został usunięty, ponieważ nie zaznaczono, że jesteś pewien."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Zamierzasz usunąć element z kolekcji innego użytkownika. Zachowaj ostrożność."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Usunięto kolekcję \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Ta kolekcja nie została usunięta, ponieważ nie zaznaczono, że jesteś pewien."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Zamierzasz usunąć kolekcję innego użytkownika. Zachowaj ostrożność."
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 0235ad2e..00000000
--- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/mediagoblin.po
index 3c3eddac..972a771d 100644
--- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pt_BR/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -8,83 +8,187 @@
 # Farid Abdelnour <snd.noise@gmail.com>, 2011
 # ufa <ufa@technotroll.org>, 2011
 # Vinicius, 2013
-# Vinicius, 2013
+# Vinicius, 2013-2014
+# danielneis <danielneis@gmail.com>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
-"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-21 17:41+0000\n"
+"Last-Translator: danielneis <danielneis@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) "
+"(http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
 "Generated-By: Babel 1.3\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-POOTLE-MTIME: 1421862085.0\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Desculpa, o registro está desativado neste momento."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Desculpe, criação de relatório está desabilitado nessa instância."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Desculpe, autenticação está desabilitada nessa instância."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Nome de usuário ou email inválidos."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Este campo não aceita endereços de email."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Este campo requer um endereço de email."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Desculpe, um usuário com este nome já existe."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Desculpe, um usuário com esse endereço de email já está cadastrado."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "A chave de verificação ou ID de usuário estão incorretos."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "O seu endereço de email foi verificado. Você pode agora fazer login, editar seu perfil, e enviar imagens!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "A chave de verificação ou ID de usuário estão incorretos."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Você precisa entrar primeiro para sabermos para quem mandar o email!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Você já verificou seu email!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "O email de verificação foi enviado novamente."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr "{username} adicionou {object}"
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr "{username} adicionou {object} em {target}"
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr "{username} autorou {object}"
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr "{username} criou {object}"
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr "{username} excluíu {object}"
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr "{username} não gostou de {object}"
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr "{username} favoritou {object}"
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr "{username} seguiu {object}"
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr "{username} gostou de {object}"
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr "{username} postou {object}"
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr "{username} postou {objet} em {target}"
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr "{username} compartilhou {object}"
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr "{username} removeu {object} dos favoritos"
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr "{username} parou de seguir {object}"
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr "{username} deixou de gostar de {object}"
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr "{username} cancelou o compartilhamento de {object}"
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr "{username} atualizou {object}"
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr "{username} adicinou uma etiqueta em {object}"
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr "um imagem"
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr "um comentário"
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr "uma coleção"
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr "um vídeo"
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr "audio"
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr "uma pessoa"
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr "um objeto"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -100,7 +204,7 @@ msgid "Description of this work"
 msgstr "Descrição desse trabalho"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +220,11 @@ msgstr "Etiquetas"
 msgid "Separate tags by commas."
 msgstr "Separe as etiquetas com vírgulas."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Arquivo"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "O arquivo não pode estar vazio"
 
@@ -148,125 +252,137 @@ msgstr "Website"
 msgid "This address contains errors"
 msgstr "Este endereço contém erros"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr "Cidade natal"
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Me enviar um email quando outras pessoas comentarem minhas mídias"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Habilitar notificações instantâneas sobre eventos."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Licença preferida"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Esta será sua licença padrão nos formulários de envio."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "O título não pode ficar vazio"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Descrição desta coleção"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "A parte do título do endereço dessa coleção. Geralmente você não precisa mudar isso."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Digite sua senha antiga para provar que esta conta é sua."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nova senha"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Novo endereço de email"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Senha"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Digite sua senha para provar que esta conta é sua."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr "Identificador"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr "Valor"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Uma entrada com esse arquivo já existe para esse usuário."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Você está editando a mídia de outro usuário. Tenha cuidado."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Você adicionou o anexo %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Você só pode editar o seu próprio perfil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Você está editando um perfil do usuário. Tenha cuidado."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "As mudanças no perfil foram salvas"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "As mudanças na conta foram salvas"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr "Aplicação de sconhecida, não foi possível desautorizar"
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr "Aplicação foi desautorizada"
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Você precisa confirmar a exclusão da sua conta."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Você já tem uma coleção chamada \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Já existe uma coleção com este arquivo para este usuário."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Você está editando a coleção de um outro usuário. Prossiga com cuidado."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Seu endereço de email foi verificado."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Senha errada"
 
@@ -297,7 +413,7 @@ msgstr "Pulando \"%s\"; já configurado.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Link antigo encontrado para \"%s\"; removendo.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -305,58 +421,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr "Para mais informação sobre como executar esse script\nde forma adequada (e como formatar o arquivo csv de\nmetadados), leia a página de documentação sobre envio\npela linha de comando\n<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr "Nome do usuário a quem essas mídias pertence"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr "Caminho do arquivo csv contendo informação de metadados."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr "Não processar avidamente, passar para celeridade"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr "Desculpe, não há usuário com nome de usuário '{username}'"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr "Arquivo em {path} não encontrado, use a opção -h para ajuda"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr "Erro com a mídia '{media_id}' valor '{error_path}': {error_msg}\nMetadados não foram enviados."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr "FALHA: Arquivo local {filename} não pôde ser acessado.\n{filename} não será enviado."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr "Enviado com sucesso o {filename}!\nCertifique-se de olhar no Painel de Processamento de Mídia no seu site para\nter certeza que ele foi enviado com sucesso."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr "FALHA: Esse arquivo é maior do que os limites de envio para este site."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr "FALHA: Esse arquivo vai deixar este usuário acima do seu limite de envio."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr "FALHA: Este usuário já está além do seu limite de envio."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr "{files_uploaded} de {files_attempted} arquivos enviados com sucesso"
 
@@ -382,28 +498,28 @@ msgstr "Descrição"
 msgid "I am sure I want to delete this"
 msgstr "Eu tenho certeza de que quero excluir isso"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Eba! Enviado!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr "Uhull! O Blogspot editado foi enviado"
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr "Você excluiu o Blog."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "A mídia não foi excluída porque você não marcou que tinha certeza."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr "Você irá excluir o Blog de outro usuário. Tenha cuidado."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr "O blog não foi excluído porque você não tem permissões."
 
@@ -423,7 +539,7 @@ msgstr "Excluir Blog"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Editar"
 
@@ -433,7 +549,7 @@ msgstr "Editar"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Excluir"
 
@@ -550,56 +666,66 @@ msgstr "Que privilégios você vai retirar?"
 
 #: mediagoblin/moderation/forms.py:122
 msgid "Why user was banned:"
-msgstr ""
+msgstr "Por que o usuário foi banido:"
 
 #: mediagoblin/moderation/forms.py:125
 msgid "Message to user:"
-msgstr ""
+msgstr "Mensagem para o usuário:"
 
 #: mediagoblin/moderation/forms.py:128
 msgid "Resolution content:"
-msgstr ""
+msgstr "Conteúdo da resolução:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
+"\n"
+"{mod} removeu os privilégios {privilege} de {user}"
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
+"\n"
+"{mod} baniu o usuário {user} {expiration_date}"
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
-msgstr ""
+msgstr "até {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "indefinidamente"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
+"\n"
+"{mod} enviou um email de alerta para o usuário {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
+"\n"
+"{mod} excluíu o comentário."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
+"\n"
+"{mod} excluíu a entrada de mídia."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Aviso de"
 
@@ -617,26 +743,26 @@ msgstr "Você se inscreveu nos comentários de %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Você não irá receber notificações de comentários em %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Deve fornecer um oauth_token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Nenhum token de requisição encontrado."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Desculpe, o tamanho arquivo é grande demais."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "Desculpe, o envio desse arquivo vai deixar você acima do seu limita de envio."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Desculpe, você atingiu seu limite de envios."
 
@@ -666,7 +792,7 @@ msgstr "Como isso funciona?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
 msgid "How to feature media?"
-msgstr ""
+msgstr "Como destacar as mídias?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
 msgid ""
@@ -683,7 +809,7 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
 msgid "Is there another way to manage featured media?"
-msgstr ""
+msgstr "Existe algum outro modo de gerencias as mídias destacadas?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
 msgid ""
@@ -709,7 +835,7 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
 msgid "What is a Primary Feature? What is a Secondary Feature?"
-msgstr ""
+msgstr "O que é um destaque primário? O que é um destaque secundário?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
 msgid ""
@@ -729,6 +855,8 @@ msgid ""
 "How to decide what information is displayed when a media entry is\n"
 "    featured?"
 msgstr ""
+"Como decidir qual informação é apresentada quando uma entrada de mídia é "
+"destacada?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
 msgid ""
@@ -744,7 +872,7 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
 msgid "How to unfeature a piece of media?"
-msgstr ""
+msgstr "Como tirar o destaque de uma peça de mídia?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
 msgid ""
@@ -756,7 +884,7 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
 msgid "CAUTION:"
-msgstr ""
+msgstr "CUIDADO:"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
 msgid ""
@@ -772,40 +900,48 @@ msgid ""
 "\n"
 "Feature Media "
 msgstr ""
+"\n"
+"Mídia em destaque"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
 msgid "Feature"
-msgstr ""
+msgstr "Destaque"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
 msgid ""
 "\n"
 "Unfeature Media "
 msgstr ""
+"\n"
+"Tirar destaque da mídia"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
 msgid "Unfeature"
-msgstr ""
+msgstr "Tirar destaque"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
 msgid ""
 "\n"
 "Promote Feature "
 msgstr ""
+"\n"
+"Promover destaque"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
 msgid "Promote"
-msgstr ""
+msgstr "Promover"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
 msgid ""
 "\n"
 "Demote Feature "
 msgstr ""
+"\n"
+"Rebaixar destaque"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
 msgid "Demote"
-msgstr ""
+msgstr "Rebaixar"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
 #: mediagoblin/templates/mediagoblin/root.html:32
@@ -814,7 +950,7 @@ msgstr "Mídias mais recentes"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
 msgid "Nothing is currently featured."
-msgstr ""
+msgstr "Nada em destaque no momento."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
 msgid ""
@@ -835,11 +971,11 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
 msgid "View most recent media"
-msgstr ""
+msgstr "Ver mídias mais recentes"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
 msgid "Feature management panel"
-msgstr ""
+msgstr "Painel de gerenciamento de destaques"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
 msgid ""
@@ -981,11 +1117,7 @@ msgstr "Enviar instruções"
 msgid "Forgot your password?"
 msgstr "Esqueceu sua senha?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Localização"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Ver no <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -996,7 +1128,7 @@ msgstr "Registre-se para criar uma conta!"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
 msgid "Metadata"
-msgstr ""
+msgstr "Metadados"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
 msgid "Edit Metadata"
@@ -1052,7 +1184,7 @@ msgstr "A URI de redirecionamento para os aplicativos,\nesse campo é <strong>ne
 msgid "This field is required for public clients"
 msgstr "Este campo é necessário para clientes públicos"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "O cliente {0} foi registrado!"
 
@@ -1065,8 +1197,8 @@ msgid "Your OAuth clients"
 msgstr "Seus clientes OAuth"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Desculpe, já existe uma conta associada a esse OpenID."
 
@@ -1074,39 +1206,39 @@ msgstr "Desculpe, já existe uma conta associada a esse OpenID."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Desculpe, o servidor OpenID não pôde ser encontrado"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Nenhum serviço OpenID encontrado para %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Verificação de %s falhou: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Verificação cancelada"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "O endereço do seu OpenID foi salvo com sucesso."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Você não pode excluir sua única URL do OpenID, a menos que você tenha uma senha definida"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Esse OpenID não está associado a esta conta."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID removido com sucesso."
 
@@ -1130,7 +1262,7 @@ msgstr "OpenID"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1162,26 +1294,26 @@ msgstr "Ou registre com OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Desculpe, uma conta já está registada a esse email Persona."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "O endereço de email Persona foi removido com sucesso."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Você não pode excluir seu único email Persona, a menos que tenha uma senha definida."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Esse endereço de email Persona não está associado a esta conta."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Desculpe, já existe uma conta associada a este endereço de email Persona."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Seu endereço de email Persona foi salvo com sucesso."
 
@@ -1205,15 +1337,15 @@ msgstr "Ou entre com Persona!"
 msgid "Or register with Persona!"
 msgstr "Ou registre com Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Arquivo inválido para esse tipo de mídia."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Falha ao copiar para armazenamento público."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "Um arquivo de processamento aceitável não foi encontrado"
 
@@ -1232,11 +1364,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Você pode usar\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> para formatação."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Você deve fornecer um arquivo."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Coleção \"%s\" adicionada!"
@@ -1259,26 +1391,26 @@ msgstr "Você foi banido"
 msgid "until %(until_when)s"
 msgstr "até %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Verifique seu email!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "sair"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Conta de <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Mudar configurações da conta"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1286,29 +1418,29 @@ msgstr "Mudar configurações da conta"
 msgid "Media processing panel"
 msgstr "Painel de processamento de mídia"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Sair"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Adicionar mídia"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Criar nova coleção"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Painel de gerenciamento de usuário"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Painel de gerenciamento de relatório"
 
@@ -1362,8 +1494,8 @@ msgid "Authorization Complete"
 msgstr "Autorização Concluída"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Copie e cole isto no seu cliente:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr "Copie e cole este <strong>código de verificação</strong> no seu cliente:"
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1433,7 +1565,7 @@ msgid ""
 "\n"
 "            >Create an account at this site</a>\n"
 "            or"
-msgstr ""
+msgstr "\n>Crie uma conta neste site</a>\nou"
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
 msgid ""
@@ -1453,13 +1585,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Editando os anexos de %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Anexos"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Adicionar anexo"
 
@@ -1477,6 +1609,47 @@ msgstr "Salvar mudanças"
 msgid "Changing %(username)s's email"
 msgstr "Alterando email de %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr "Desautorizar aplicações"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr "Desautorizar aplicações"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr "Não existem aplicações autorizadas."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr "Tipo:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr "Autorizado:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1502,7 +1675,7 @@ msgstr "Alterando as configurações da conta de %(username)s"
 msgid "Delete my account"
 msgstr "Excluir minha conta"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Email"
 
@@ -1520,23 +1693,23 @@ msgstr "Editando perfil de %(username)s"
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:67
 #, python-format
 msgid "Metadata for \"%(media_name)s\""
-msgstr ""
+msgstr "Metadados de \"%(media_name)s\""
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:72
 msgid "MetaData"
-msgstr ""
+msgstr "MetaDados"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:80
 msgid "Add new Row"
-msgstr ""
+msgstr "Adicionar nova linha"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:83
 msgid "Update Metadata"
-msgstr ""
+msgstr "Atualizar metadados"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:87
 msgid "Clear empty Rows"
-msgstr ""
+msgstr "Limpar linhas vazias"
 
 #: mediagoblin/templates/mediagoblin/edit/verification.txt:19
 #, python-format
@@ -1556,19 +1729,6 @@ msgstr "Olá,\n\nNós queríamos verificar que você é %(username)s. Se for ess
 msgid "New comments"
 msgstr "Novos comentários"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Marcar tudo como lido"
@@ -1581,38 +1741,38 @@ msgstr "Marcar tudo como lido"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Etiquetas desta mídia: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Baixar"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Desculpe, este áudio não será reproduzido porque \n »seu navegador não oferece suporte a áudio \n »HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Você pode obter um navegador moderno\n »capaz de reproduzir o áudio em <a href=\"http://getfirefox.com\">\n »  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Arquivo original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "Arquivo WebM (codec Vorbis)"
 
@@ -1620,70 +1780,70 @@ msgstr "Arquivo WebM (codec Vorbis)"
 msgid "Created"
 msgstr "Criado"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Imagem para %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Arquivo PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspectiva"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Frente"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Cima"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Lado"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Baixar o modelo"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Formato de Arquivo"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Altura do Objeto"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Desculpe, este vídeo não irá reproduzir porque\n seu navegador não oferece suporte a vídeo\n HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Você pode obter um navegador moderno\n capaz de reproduzir este vídeo em <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "Arquivo WebM (VP8/Vorbis)"
 
@@ -1708,20 +1868,20 @@ msgstr "ID"
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
 msgid "When submitted"
-msgstr ""
+msgstr "Quando submetido"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
 msgid "Transcoding progress"
-msgstr ""
+msgstr "Progresso da transcodificação"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
 msgid "Unknown"
-msgstr ""
+msgstr "Desconhecido"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
@@ -1735,11 +1895,11 @@ msgstr "Esses envios não foram processados:"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
 msgid "Reason for failure"
-msgstr ""
+msgstr "Motivo da falha"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
 msgid "Failure metadata"
-msgstr ""
+msgstr "Metadados da falha"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
@@ -1752,7 +1912,7 @@ msgstr "Últimos 10 envios bem sucedidos"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
 msgid "Submitted"
-msgstr ""
+msgstr "Enviado"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
@@ -1768,7 +1928,7 @@ msgid "Return to Reports Panel"
 msgstr "Retornar para o painel de relatórios"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Relatar"
 
@@ -1796,7 +1956,7 @@ msgstr "\n          CONTEÚDO DE\n            <a href=\"%(user_url)s\"> %(user_n
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:102
 msgid "Reason for report:"
-msgstr ""
+msgstr "Motivo para relatar:"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:133
 #: mediagoblin/templates/mediagoblin/moderation/user.html:136
@@ -1902,15 +2062,15 @@ msgstr "Nenhum relatório fechado encontrado."
 #: mediagoblin/templates/mediagoblin/moderation/user.html:23
 #, python-format
 msgid "User: %(username)s"
-msgstr ""
+msgstr "Usuário: %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:42
 msgid "Return to Users Panel"
-msgstr ""
+msgstr "Voltar para o painel de usuários"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:49
 msgid "Sorry, no such user found."
-msgstr ""
+msgstr "Desculpe, o usuário não foi encontrado."
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:53
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
@@ -1922,7 +2082,7 @@ msgstr "Verificação de email necessária"
 msgid ""
 "Someone has registered an account with this username, but it still has\n"
 "        to be activated."
-msgstr ""
+msgstr "Alguém já registrou uma conta com este nome de usuário, mas ela ainda precisa\nser ativada."
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:66
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:34
@@ -1935,11 +2095,11 @@ msgstr "Perfil de  %(username)s"
 #: mediagoblin/templates/mediagoblin/moderation/user.html:68
 #, python-format
 msgid "BANNED until %(expiration_date)s"
-msgstr ""
+msgstr "BANIDO até %(expiration_dates)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:72
 msgid "Banned Indefinitely"
-msgstr ""
+msgstr "Banido indefinidamente"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:78
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:62
@@ -1960,76 +2120,76 @@ msgstr "Ver coleções"
 #: mediagoblin/templates/mediagoblin/moderation/user.html:105
 #, python-format
 msgid "Active Reports on %(username)s"
-msgstr ""
+msgstr "Relatos ativos para %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:112
 msgid "Report ID"
-msgstr ""
+msgstr "ID do relato"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:113
 msgid "Reported Content"
-msgstr ""
+msgstr "Conteúdo relatado"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:114
 msgid "Description of Report"
-msgstr ""
+msgstr "Descrição do relato"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:122
 #, python-format
 msgid "Report #%(report_number)s"
-msgstr ""
+msgstr "Relato #%(report_number)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:129
 msgid "Reported Comment"
-msgstr ""
+msgstr "Comentário relatado"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:131
 msgid "Reported Media Entry"
-msgstr ""
+msgstr "Entrada de mídia relatada"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:142
 #, python-format
 msgid "No active reports filed on %(username)s"
-msgstr ""
+msgstr "Nenhum relato ativo para %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:150
 #, python-format
 msgid "All reports on %(username)s"
-msgstr ""
+msgstr "Todos os relatos para %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:155
 #, python-format
 msgid "All reports that %(username)s has filed"
-msgstr ""
+msgstr "Todos os relatos que %(username)s preencheu"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:164
 #, python-format
 msgid "%(username)s's Privileges"
-msgstr ""
+msgstr "Privilégios de %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:172
 msgid "Privilege"
-msgstr ""
+msgstr "Privilégio"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:173
 msgid "Granted"
-msgstr ""
+msgstr "Concedido"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:180
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:182
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:213
 msgid "Ban User"
-msgstr ""
+msgstr "Banir usuário"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:218
 msgid "UnBan User"
-msgstr ""
+msgstr "Retirar banimento de usuário"
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
@@ -2071,20 +2231,20 @@ msgstr "Adicionar sua mídia"
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
 #, python-format
 msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
+msgstr "� Blog post por <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Adicionar um comentário"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Adicionar este comentário"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Adicionado há"
 
@@ -2106,12 +2266,12 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
 #, python-format
 msgid "Really delete collection: %(title)s?"
-msgstr ""
+msgstr "Realmente excluir coleção: %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
 #, python-format
 msgid "Remove %(media_title)s from %(collection_title)s"
-msgstr ""
+msgstr "Remover %(media_title)s de %(collection_title)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
 #, python-format
@@ -2156,12 +2316,12 @@ msgstr "Mídias de <a href=\"%(user_url)s\">%(username)s</a> com a etiqueta <a h
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Mídia de <a href=\"%(user_url)s\"> %(username)s </a>  "
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Vendo mídia de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Pré-visualização do comentário"
 
@@ -2320,6 +2480,10 @@ msgstr "mais recente"
 msgid "older"
 msgstr "mais antiga"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Localização"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Relatar mídia"
@@ -2328,38 +2492,38 @@ msgstr "Relatar mídia"
 msgid "Tagged with"
 msgstr "Etiquetas"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Não foi possível ler o arquivo de imagem."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Ops!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Um erro ocorreu"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Requisição inválida"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "A requisição enviada para o servidor é inválida, por favor verifique novamente"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Operação não permitida"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Me desculpe Dave, não posso deixar você fazer isso!</p><p>Você tentou  executar uma função sem autorização. Por acaso estava novamente tentando excluir todas as contas de usuários?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2427,69 +2591,69 @@ msgstr "Você pode usar\n<a href=\"http://daringfireball.net/projects/markdown/b
 msgid "Reason for Reporting"
 msgstr "Motivo para o relatório"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Desculpe, os comentários estão desabilitados."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Ops, seu comentário estava vazio."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Seu comentário foi publicado!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Por favor, verifique suas entradas e tente novamente."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Você deve selecionar ou adicionar uma coleção"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" já está na coleção \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" adicionado à coleção \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Você excluiu a mídia."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Você vai excluir uma mídia de outro usuário. Tenha cuidado."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Você excluiu o item da coleção."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "O item não foi removido porque você não marcou que tinha certeza."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Você está prestes a excluir um item da coleção de um outro usuário. Tenha cuidado."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Você excluiu a coleção \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "A coleção não foi excluída porque você não marcou que tinha certeza."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Você está prestes a excluir a coleção de um outro usuário. Tenha cuidado."
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 607fbc40..00000000
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/mediagoblin.po
index 310e2af5..cac4f0bb 100644
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ro/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -20,67 +20,167 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Ne pare rău, dar înscrierile sunt dezactivate pe acest server."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Nume de utilizator sau adresă de e-mail nevalidă."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Această rubrică nu este pentru adrese de e-mail."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Această rubrică trebuie completată cu o adresă de e-mail."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Ne pare rău, există deja un utilizator cu același nume."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Există deja un utilizator înregistrat cu această adresă de e-mail."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Adresa ta de e-mail a fost verificată. Poți să te autentifici, să îți completezi profilul și să trimiți imagini!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Cheie de verificare sau user ID incorect."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Trebuie să fii autentificat ca să știm cui să trimitem mesajul!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Adresa ta de e-mail a fost deja verificată!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "E-mail-ul de verificare a fost retrimis."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -96,7 +196,7 @@ msgid "Description of this work"
 msgstr "Descrierea acestui fișier"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -112,11 +212,11 @@ msgstr "Cuvinte-cheie"
 msgid "Separate tags by commas."
 msgstr "Desparte cuvintele-cheie prin virgulă."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Identificator"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Identificatorul nu poate să lipsească"
 
@@ -144,125 +244,137 @@ msgstr "Sit Web"
 msgid "This address contains errors"
 msgstr "Această adresă prezintă erori"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Trimite-mi un e-mail când alții comentează fișierele mele"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Licența preferată"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Aceasta va fi licența implicită pe formularele de upload."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Titlul nu poate să fie gol"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Descriere pentru această colecție"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Partea din adresa acestei colecții care corespunde titlului. De regulă nu e necesar să faci o modificare."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Vechea parolă"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Introdu vechea parolă pentru a demonstra că ești titularul acestui cont."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Noua parolă"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Parolă"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Există deja un entry cu același identificator pentru acest utilizator."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Editezi fișierul unui alt utilizator. Se recomandă prudență."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Ai anexat %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Nu poți modifica decât propriul tău profil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Editezi profilul unui utilizator. Se recomandă prudență."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Modificările profilului au fost salvate"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Setările pentru acest cont au fost salvate"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Trebuie să confirmi ștergerea contului tău."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Ai deja o colecție numită \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "O colecție cu același slug există deja pentru acest utilizator."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Lucrezi pe colecția unui alt utilizator. Se recomandă prudență."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Parolă incorectă"
 
@@ -293,7 +405,7 @@ msgstr "S-a omis \"%s\"; configurat deja.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Există deja un link pentru \"%s\"; va fi șters.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -301,58 +413,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -378,28 +490,28 @@ msgstr "Descriere"
 msgid "I am sure I want to delete this"
 msgstr "Sunt sigur că doresc să șterg"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Ura! Trimis!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Fișierul nu a fost șters deoarece nu ai confirmat că ești sigur."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -419,7 +531,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Editare"
 
@@ -429,7 +541,7 @@ msgstr "Editare"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Șterge"
 
@@ -556,46 +668,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -613,26 +725,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -977,11 +1089,7 @@ msgstr "Trimite instrucțiuni"
 msgid "Forgot your password?"
 msgstr "Ai uitat parola?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Locul"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Vezi pe <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1048,7 +1156,7 @@ msgstr "URI-ul de redirectare pentru aplicații, această rubrică\n
 msgid "This field is required for public clients"
 msgstr "Această rubrică este obligatorie pentru clienții publici"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Clientul {0} a fost înregistrat!"
 
@@ -1061,8 +1169,8 @@ msgid "Your OAuth clients"
 msgstr "Clienții tăi OAuth"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1070,39 +1178,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1126,7 +1234,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1158,26 +1266,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1201,15 +1309,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Formatul fișierului nu corespunde cu tipul de media selectat."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1228,11 +1336,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Trebuie să selectezi un fișier."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Colecția \"%s\" a fost creată!"
@@ -1255,26 +1363,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Verifică adresa de e-mail!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "Ieșire"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Contul lui <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Modifică setările contului"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1282,29 +1390,29 @@ msgstr "Modifică setările contului"
 msgid "Media processing panel"
 msgstr "Panou de procesare media"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Ieșire"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Trimite fișier"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Creează colecție nouă"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1358,7 +1466,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1449,13 +1557,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Editare anexe la %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Anexe"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Atașează"
 
@@ -1473,6 +1581,47 @@ msgstr "Salvează modificările"
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "în urmă cu %(formatted_time)s"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1498,7 +1647,7 @@ msgstr "Se modifică setările contului pentru userul %(username)s"
 msgid "Delete my account"
 msgstr "Șterge contul meu"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1552,19 +1701,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "în urmă cu %(formatted_time)s"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1577,38 +1713,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Fișier etichetat cu cuvintele-cheie: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Download"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Ne pare rău, această înregistrare audio nu poate fi redată, deoarece \n\tbrowserul tău nu este compatibil cu funcția audio din HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Poți lua un browser modern \n\tcapabil să redea această înregistrare de la <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Fișierul original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "Fișier WebM (codec Vorbis)"
 
@@ -1616,70 +1752,70 @@ msgstr "Fișier WebM (codec Vorbis)"
 msgid "Created"
 msgstr "Creat"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Imagine pentru %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Fișier PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspectivă"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Din față"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "De sus"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Lateral"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Descarcă modelul"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Formatul fișierului"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Înălțimea obiectului"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Ne pare rău, dar această înregistrare video nu va funcționa deoarece browser-ul dvs. nu este compatibil cu HTML5 video."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Puteți obține un browser Web modern care poate reda această înregistrare de la <a href=\"http://getfirefox.com\">http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1764,7 +1900,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2070,17 +2206,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Adaugă un comentariu"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Trimite acest comentariu"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Adăugat"
 
@@ -2152,12 +2288,12 @@ msgstr "Fișierele lui <a href=\"%(user_url)s\">%(username)s</a> cu cuvântul-ch
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "<p>� Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a></p>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2316,6 +2452,10 @@ msgstr "mai noi"
 msgid "older"
 msgstr "mai vechi"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Locul"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2324,38 +2464,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "Etichetat cu cuvintele-cheie"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Fișierul cu imaginea nu a putut fi citit."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Hopa!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "S-a produs o eroare"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Operația nu este permisă"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Îmi pare rău, Dave, nu te pot lăsa să faci asta!</p><p>Ai încercat să faci o operație nepermisă. Ai încercat iar să ștergi toate conturile utilizatorilor?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2423,69 +2563,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Comentariile sunt dezactivate."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Hopa, ai uitat să scrii comentariul."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Comentariul tău a fost trimis!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Verifică datele și încearcă din nou."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Trebuie să alegi sau să creezi o colecție"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" este deja în colecția \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" a fost adăugat la colecția \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Ai șters acest fișier"
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Urmează să ștergi fișierele media ale unui alt utilizator. Se recomandă prudență."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Ai șters acest articol din colecție."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Articolul nu a fost șters pentru că nu ai confirmat că ești sigur(ă)."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Urmează să ștergi un articol din colecția unui alt utilizator. Se recomandă prudență."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Ai șters colecția \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Colecția nu a fost ștearsă pentru că nu ai confirmat că ești sigur(ă)."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Urmează să ștergi colecția unui alt utilizator. Se recomandă prudență."
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 49769476..00000000
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/mediagoblin.po
index 8693f43f..08011123 100644
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ru/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mediagoblin/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,67 +21,167 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Извините, на �том �айте реги�траци� запрещена."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Извините, аутентификаци� на �том �айте отключена."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "�еправильное им� пользовател� или адре� �лектронной почты."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Это поле не дл� адре�а �лектронной почты."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Это поле — дл� адре�а �лектронной почты."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Извините, пользователь � �тим именем уже зареги�трирован."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Сожалеем, но на �тот адре� �лектронной почты уже зареги�трирована друга� учётна� запи�ь."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Ваш адре� �лектронной почты потвержден. Вы теперь можете войти и начать редактировать �вой профиль и загружать новые изображени�!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "�еверный ключ проверки или идентификатор пользовател�"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Вам надо пред�тавить��, чтобы мы знали, кому отправл�ть �ообщение!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Вы уже потвердили �вой адре� �лектронной почты!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Отправить заново запро� на подтверждение по е-м�йл."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -97,7 +197,7 @@ msgid "Description of this work"
 msgstr "Опи�ание �того произведени�"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -113,11 +213,11 @@ msgstr "Метки"
 msgid "Separate tags by commas."
 msgstr "(через зап�тую)"
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Отличительна� ча�ть адре�а"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Отличительна� ча�ть адре�а необходима"
 
@@ -145,125 +245,137 @@ msgstr "Сайт"
 msgid "This address contains errors"
 msgstr "Этот адре� �одержит ошибки"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Уведомл�ть мен� по e-mail о комментари�х к моим файлам"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Предпочитаема� лицензи�"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Она будет лицензией по умолчанию дл� ваших загрузок"
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "�азвание не может быть пу�тым"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Опи�ание �той коллекции"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Отличительна� ча�ть адре�а �той коллекции, о�нованна� на названии.  Обычно не нужно её измен�ть."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Введите �вой �тарый пароль в каче�тве доказатель�тва, что �то ваша учётна� запи�ь."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "�овый пароль"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "�овый адре� �лектронной почты"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Пароль"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Введите �вой пароль в каче�тве доказатель�тва, что �то ваша учётна� запи�ь."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "У �того пользовател� уже е�ть файл � такой отличительной ча�тью адре�а."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Вы редактируете файлы другого пользовател�. Будьте о�торожны."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Вы добавили �опут�твующий файл %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Вы можете редактировать только �вой �об�твенный профиль."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Вы редактируете профиль пользовател�. Будьте о�торожны."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Изменени� профил� �охранены"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "�а�тройки учётной запи�и запи�аны"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Вам нужно подтвердить, что вы хотите удалить �вою учётную запи�ь."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "У ва� уже е�ть коллекци� � названием «%s»!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "У �того пользовател� уже е�ть коллекци� � такой отличительной ча�тью адре�а."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Вы редактируете коллекцию другого пользовател�.  Будьте о�торожны."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Ваш адре� �лектронной почты удо�товерен."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "�еправильный пароль"
 
@@ -294,7 +406,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -302,58 +414,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -379,28 +491,28 @@ msgstr "Опи�ание"
 msgid "I am sure I want to delete this"
 msgstr "Я уверен, что хочу удалить �то"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Ура! Файл загружен!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Файл не удалён, так как вы не подтвердили �вою уверенно�ть галочкой."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -420,7 +532,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Изменить"
 
@@ -430,7 +542,7 @@ msgstr "Изменить"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Удалить"
 
@@ -557,46 +669,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "на неопределённый �рок"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Предупреждение от"
 
@@ -614,26 +726,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -978,11 +1090,7 @@ msgstr "Отправить ин�трукцию"
 msgid "Forgot your password?"
 msgstr "Забыли �вой пароль?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "�а карте"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "По�мотреть на <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1049,7 +1157,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Клиент {0} зареги�трирован!"
 
@@ -1062,8 +1170,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1071,39 +1179,39 @@ msgstr ""
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1127,7 +1235,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1159,26 +1267,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Сожалеем, но у на� уже е�ть учётна� запи�ь � �тим email-адре�ом Persona ."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1202,15 +1310,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "�еправильный формат файла."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1229,11 +1337,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "Дл� разметки можете и�пользовать �зык\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a>."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Вы должны загрузить файл."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Коллекци� «%s» добавлена!"
@@ -1256,26 +1364,26 @@ msgstr "Ва� заблокировали"
 msgid "until %(until_when)s"
 msgstr "до %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Подтвердите ваш адре� �лектронной почты!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "завершение �еан�а"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Учётна� запи�ь <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Изменить на�тройки учётной запи�и"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1283,29 +1391,29 @@ msgstr "Изменить на�тройки учётной запи�и"
 msgid "Media processing panel"
 msgstr "Панель обработки файлов"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Завершение �еан�а"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Добавить файлы"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Создать новую коллекцию"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1359,7 +1467,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1450,13 +1558,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Добавление �опут�твующего файла дл� %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Сопут�твующие файлы"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Добавить �опут�твующий файл"
 
@@ -1474,6 +1582,47 @@ msgstr "Сохранить изменени�"
 msgid "Changing %(username)s's email"
 msgstr "Изменение email-адре�а %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s назад"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1499,7 +1648,7 @@ msgstr "�а�тройка учётной запи�и %(username)s"
 msgid "Delete my account"
 msgstr "Удалить мою учётную запи�ь"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Е-майл "
 
@@ -1553,19 +1702,6 @@ msgstr "Привет,\n\nМы хотели удо�товерить��, что
 msgid "New comments"
 msgstr "�овые комментарии"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s назад"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Отметить в�е, как прочтенные"
@@ -1578,38 +1714,38 @@ msgstr "Отметить в�е, как прочтенные"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Файлы � меткой: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Скачать"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Оригинал"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Сожалеем, �тот аудиоролик не проиграет��, �\n» потому что ваш браузер не поддерживает �\n» аудио в �оответ�твии �о �тандартом HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Вы можете �качать �овременный браузер, \n\t�по�обный проиграть �то аудио, � <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "И�ходный файл"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM�файл (кодек — Vorbis)"
 
@@ -1617,70 +1753,70 @@ msgstr "WebM�файл (кодек — Vorbis)"
 msgid "Created"
 msgstr "Создан"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Изображение «%(media_title)s»"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF-файл"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Пер�пектива"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Спереди"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Сверху"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Сбоку"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Скачать модель"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Формат файла"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Вы�ота объекта"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Сожалеем, �тот ролик не проиграет��, �\nпотому что ваш браузер не поддерживает �\nвидео в �оответ�твии �о �тандартом HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Вы можете �качать �овременный браузер, �по�обный во�производить �то видео, � <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "WebM файл (VP8/Vorbis)"
 
@@ -1765,7 +1901,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2071,17 +2207,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Добавить комментарий"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Добавить �тот комментарий"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Добавлен"
 
@@ -2153,12 +2289,12 @@ msgstr "Файлы <a href=\"%(user_url)s\">%(username)s</a> � меткой <a
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Файлы пользовател� <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Про�мотр файлов пользовател� <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Предварительный про�мотр комментари�"
 
@@ -2317,6 +2453,10 @@ msgstr "более новые"
 msgid "older"
 msgstr "более �тарые"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "�а карте"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2325,38 +2465,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "Метки"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "�е удало�ь прочитать файл � изображением."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Ой!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Произошла ошибка"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "�еверный запро�"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Операци� не позвол�ет��"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2424,69 +2564,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Сожалеем: возможно�ть комментировани� отключена."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Ой, ваш комментарий был пу�т."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Ваш комментарий размещён!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Пожалуй�та, проверьте введённое и попробуйте ещё раз."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "�еобходимо выбрать или добавить коллекцию"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "«%s» — уже в коллекции «%s»"
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "«%s» добавлено в коллекцию «%s»"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Вы удалили файл."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Вы на пороге удалени� файла другого пользовател�. Будьте о�торожны."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Вы и�ключили файл из коллекции."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Файл не и�ключён из коллекции, так как вы не подтвердили �воё намерение отметкой."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Вы на пороге и�ключени� файла из коллекции другого пользовател�.  Будьте о�торожны."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Вы удалили коллекцию «%s»"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Коллекци� не удалена, так как вы не подтвердили �воё намерение отметкой."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Вы на пороге удалени� коллекции другого пользовател�.  Будьте о�торожны."
diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 1796a054..00000000
--- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/mediagoblin.po
index ef28b171..0b5992e9 100644
--- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sk/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/mediagoblin/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -24,67 +24,167 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Prepá�, registrácia na danej inštancii nie je povolená."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "Prepá�, reportovanie je na tejto inštancii vypnuté."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Prepá�, autentifikácia je vypnutá pre túto inštanciu."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Nesprávne používateľské meno alebo e-mailová adresa."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Toto pole neakceptuje e-mailové adresy."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Toto pole vyžaduje e-mailovú adresu."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Prepá�, rovnaké používateľské meno už existuje."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Prepá�, rovnaká e-mailová adresa už bola použitá na vytvorenie ú�tu."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "Verifika�ný kľú� alebo používateľské ID nie je správne."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Tvoja e-mailová adresa bola overená. Teraz sa môžeš prihlásiť, upravovať profil a vkladať výtvory!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Overovací kľú�, prípadne používateľské meno je nesprávne."
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Je potrebné prihlásiť sa, aby sme vedeli kam máme e-mail zaslať!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Už máš overenú e-mailovú adresu!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Opätovne zaslať overovací e-mail."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -100,7 +200,7 @@ msgid "Description of this work"
 msgstr "Popis výtvoru"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -116,11 +216,11 @@ msgstr "Štítky"
 msgid "Separate tags by commas."
 msgstr "Oddeľ štítky pomocou �iarky."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Unikátna �asť adresy"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Unikátna �asť adresy nesmie byť prázdna"
 
@@ -148,125 +248,137 @@ msgstr "Webstránka"
 msgid "This address contains errors"
 msgstr "Daná adresa obsahuje chybu"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Zašli mi e-mail ke� ostatní okomentujú môj výtvor"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Povoliť notifikácie ohľadom udalostí na stránke."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Preferencia licencie"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Nasledovná licencia bude použitá ako východzia pre všetky tvoje výtvory."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "Titulok nesmie byť prázdny."
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Popis danej kolekcie"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "Titulná �asť adresy danej kolekcie. Zmena poľa nepovinná."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Staré heslo"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Vlož svoje staré heslo na dôkaz toho, že vlastníš daný ú�et."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nové heslo"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Nová e-mailová adresa"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Heslo"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Vlož svoje heslo pre overenie pravosti ú�tu."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Položku s rovnakou unikátnou �asťou adresy už niekde máš."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Upravuješ výtvory iného používateľa. Pristupuj zodpovedne. "
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Príloha %s pridaná!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Môžeš upravovať iba svoj vlastný profil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Upravuješ profil iného používateľa. Pristupuj zodpovedne. "
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Zmeny v profile uložené"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Nastavenia ú�tu uložené"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Potrebuješ potvrdiť odstránenie svojho ú�tu."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Už máš kolekciu nazvanú ako \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Kolekcia s týmto štítkom už máš."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Upravuješ kolekciu iného používateľa. Pristupuj zodpovedne. "
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Tvoja e-mailová adresa bola verifikovaná."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Nesprávne heslo"
 
@@ -297,7 +409,7 @@ msgstr "Preskakujem \"%s\"; opakovane nastavené.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "Nájdený starý odkaz pre \"%s\"; odstraňujem.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -305,58 +417,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -382,28 +494,28 @@ msgstr "Popis"
 msgid "I am sure I want to delete this"
 msgstr "Jednozna�ne to chcem odstrániť"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Skvelé! Pridané!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Výtvor nebol odstránený, nakoľko chýbalo tvoje potvrdenie."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -423,7 +535,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Upraviť"
 
@@ -433,7 +545,7 @@ msgstr "Upraviť"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -560,46 +672,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "nekone�ne"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -617,26 +729,26 @@ msgstr "Úspešný zápis odberu komentárov pre %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Nebudeš dostávať notifikácie ohľadom komentárov pre %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Nutnosť poskytnúť OAuth token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "Požadovaný token nenájdený."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -981,11 +1093,7 @@ msgstr "Zaslať inštrukcie"
 msgid "Forgot your password?"
 msgstr "Zabudnuté heslo?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Poloha"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Zobraziť na <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -1052,7 +1160,7 @@ msgstr "Presmerovacie URI pre aplikácie, toto pole\nje <strong>požadované</st
 msgid "This field is required for public clients"
 msgstr "Dané pole je požadované pre verejných klientov."
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Klient {0} bol registrovaný!"
 
@@ -1065,8 +1173,8 @@ msgid "Your OAuth clients"
 msgstr "Tvoji autorizovaní OAuth klienti"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Prepá�, ú�et pre dané OpenID už existuje."
 
@@ -1074,39 +1182,39 @@ msgstr "Prepá�, ú�et pre dané OpenID už existuje."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Prepá�, OpenID server nebol nájdený"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Nenájdená žiadna OpenID služba pre %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Verifikácia %s zlyhala: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Verifikácia zrušená"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "URL k tvojmu OpenID úpešne zaznamenaný."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "Nesmieš odstániť svoj jediný OpenID URL, pokým nemáš nastavené heslo"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "OpenID nie je registrované k tomuto ú�tu."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID úspešne odstránené."
 
@@ -1130,7 +1238,7 @@ msgstr "OpenID"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1162,26 +1270,26 @@ msgstr "Alebo sa registruj z OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Prepá�, ú�et na daný Persona e-mail už existuje."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "E-mailová adresa Persona úspešne odstránená."
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "Nesmieš odstrániť svoj jediný Persona e-mail, pokým nie je nastavené heslo."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Persona e-mail nie je registrovaný k tomuto ú�tu."
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "Prepá�, ú�et z danou Persona e-mailovou adresou už existuje."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Tvoj Persona e-mail úspešne uložený."
 
@@ -1205,15 +1313,15 @@ msgstr "Alebo sa prihlás z Persona!"
 msgid "Or register with Persona!"
 msgstr "Alebo sa registruj z Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Nesprávny typ súboru pre dané médium."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Kopírovanie na verejný úložný priestor zlyhalo."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "Prijateľný spracúvavaný súbor nenájdený"
 
@@ -1232,11 +1340,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Musíš poskytnúť súbor."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "Kolekcia \"%s\" pridaná!"
@@ -1259,26 +1367,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Over si e-mailovú adresu!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "odhlásiť sa"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Ú�et používateľa <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Zmeniť nastavenia ú�tu"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1286,29 +1394,29 @@ msgstr "Zmeniť nastavenia ú�tu"
 msgid "Media processing panel"
 msgstr "Sekcia spracovania výtvorov"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Odhlásiť sa"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Pridať výtvor"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Vytvoriť novú kolekciu"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1362,8 +1470,8 @@ msgid "Authorization Complete"
 msgstr "Autorizácia kompletná"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Toto kopíruj a vlož do svojho klienta:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1453,13 +1561,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Úprava príloh pre %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Prílohy"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Pridať prílohu"
 
@@ -1477,6 +1585,47 @@ msgstr "Uložiť zmeny"
 msgid "Changing %(username)s's email"
 msgstr "Zmena e-mailu používateľa %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "pred %(formatted_time)s "
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1502,7 +1651,7 @@ msgstr "Mením nastavenia ú�tu používateľa %(username)s"
 msgid "Delete my account"
 msgstr "Odstrániť môj ú�et"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "E-mail"
 
@@ -1556,19 +1705,6 @@ msgstr "Ahoj,\n\nChceli sme sa uisiť, že práve ty si %(username)s. Pokiaľ je
 msgid "New comments"
 msgstr "Nové komentáre"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "pred %(formatted_time)s "
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Ozna�iť ako pre�ítané"
@@ -1581,38 +1717,38 @@ msgstr "Ozna�iť ako pre�ítané"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Výtvory ozna�ené ako: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Originál"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Prepá�, tento zvukový súbor nepôjde prehrať, \n\tnakoľko tvoj prehliada� nepodporuje HTML5 \n\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Môžeš získať moderný prehliada�, ktorý\n\ttento zvuk hravo prehrá <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Originálny súbor"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM súbor (Vorbis kodek)"
 
@@ -1620,70 +1756,70 @@ msgstr "WebM súbor (Vorbis kodek)"
 msgid "Created"
 msgstr "Vytvorené"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Obrázok pre %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF súbor"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspektíva"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "ÄŒelo"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Vrch"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Strana"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Stiahnuť model"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Súborový formát"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Výška objektu"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Prepá�, tento video súbor nepôjde prehrať, \n\tnakoľko tvoj prehliada� nepodporuje HTML5 \n\tvideo."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "Môžeš získať moderný prehliada�, ktorý\n\ttento video súbor hravo prehrá na <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "WebM súbor (VP8/Vorbis)"
 
@@ -1768,7 +1904,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2074,17 +2210,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Pridať komentár"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Pridať tento komentár"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Pridané"
 
@@ -2156,12 +2292,12 @@ msgstr "Výtvory používateľa <a href=\"%(user_url)s\">%(username)s</a> zo št
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Výtvory, ktoré vlastní <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Prehliadanie výtvorov od <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Náhľad komentára"
 
@@ -2320,6 +2456,10 @@ msgstr "novšie"
 msgid "older"
 msgstr "staršie"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Poloha"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2328,38 +2468,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "Ozna�ené ako"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Nemožno pre�ítať súbor obrázka."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Hopla!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Vyskytla sa chyba"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Zlá požiadavka"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "Požiadavka zaslaná na server nie správna, prosím opätovne ju skontroluj"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Nepovolená operácia"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Prepá� Člove�e, toto nesmieš!</p><p>Práve si chcel vykonať funkciu, na ktorú nemáš oprávnenie. Opäť si sa pokúšal odstrániť všetky používateľské ú�ty?"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2427,69 +2567,69 @@ msgstr "Smieš použiť\n<a href=\"http://daringfireball.net/projects/markdown/b
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Prepá�, komentovanie je vypnuté."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Hopla, tvoj komentár bol prázdny."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Tvoj komentár bol pridaný!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Prosím skontroluj svoje položky a skús znova."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Musíš vybrať, prípadne pridať kolekciu"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" sa už nachádza v kolekcii \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s pridané do kolekcie \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Výtvor bol tebou odstránený."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Chystáš sa odstrániť výtvory niekoho iného. Pristupuj zodpovedne. "
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "Položka bola z kolekcie odstránená."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Položka nebola odstránená, nakoľko polí�ko potvrdenia nebolo ozna�né."
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Chystáš sa odstrániť položku z kolekcie iného používateľa. Pristupuj zodpovedne. "
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Kolekcia \"%s\"  bola úspešne odstránená."
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "Kolekcia nebola odstránená, nakoľko polí�ko potrvdenia nebolo ozna�ené."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Chystáš sa odstrániť kolekciu iného používateľa. Pristupuj zodpovedne. "
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index bcdc0f68..00000000
--- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
deleted file mode 100644
index cded9d0a..00000000
--- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
+++ /dev/null
@@ -1,2490 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# 
-# Translators:
-# Jure Repinc <jlp@holodeck1.com>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU MediaGoblin\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
-"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Slovenian (http://www.transifex.com/projects/p/mediagoblin/language/sl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
-msgid "Sorry, registration is disabled on this instance."
-msgstr "Oprostite, prijava za ta izvod ni omogo�ena."
-
-#: mediagoblin/decorators.py:318
-msgid "Sorry, reporting is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
-msgid "Sorry, authentication is disabled on this instance."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:43
-msgid "Invalid User name or email address."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:44
-msgid "This field does not take email addresses."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:45
-msgid "This field requires an email address."
-msgstr ""
-
-#: mediagoblin/auth/tools.py:116
-msgid "Sorry, a user with that name already exists."
-msgstr "Oprostite, uporabnik s tem imenom že obstaja."
-
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
-msgid "Sorry, a user with that email address already exists."
-msgstr ""
-
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
-msgid "The verification key or user id is incorrect."
-msgstr ""
-
-#: mediagoblin/auth/views.py:161
-msgid ""
-"Your email address has been verified. You may now login, edit your profile, "
-"and submit images!"
-msgstr "Vaš e-poštni naslov je bil potrjen. Sedaj se lahko prijavite, uredite svoj profil in pošljete slike."
-
-#: mediagoblin/auth/views.py:167
-msgid "The verification key or user id is incorrect"
-msgstr "Potrditveni klju� ali uporabniška identifikacija je napa�na"
-
-#: mediagoblin/auth/views.py:185
-msgid "You must be logged in so we know who to send the email to!"
-msgstr ""
-
-#: mediagoblin/auth/views.py:193
-msgid "You've already verified your email address!"
-msgstr ""
-
-#: mediagoblin/auth/views.py:203
-msgid "Resent your verification email."
-msgstr "Ponovno pošiljanje potrditvene e-pošte."
-
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
-#: mediagoblin/media_types/blog/forms.py:24
-#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
-#: mediagoblin/submit/forms.py:61
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
-#: mediagoblin/user_pages/forms.py:45
-msgid "Title"
-msgstr "Naslov"
-
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
-msgid "Description of this work"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
-msgid ""
-"You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"                      Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
-#: mediagoblin/submit/forms.py:45
-msgid "Tags"
-msgstr "Oznake"
-
-#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
-msgid "Separate tags by commas."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
-msgid "Slug"
-msgstr "Oznaka"
-
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
-msgid "The slug can't be empty"
-msgstr "Oznaka ne sme biti prazna"
-
-#: mediagoblin/edit/forms.py:44
-msgid ""
-"The title part of this media's address. You usually don't need to change "
-"this."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
-#: mediagoblin/submit/forms.py:50
-#: mediagoblin/templates/mediagoblin/utils/license.html:20
-msgid "License"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:54
-msgid "Bio"
-msgstr "Biografija"
-
-#: mediagoblin/edit/forms.py:60
-msgid "Website"
-msgstr "Spletna stran"
-
-#: mediagoblin/edit/forms.py:62
-msgid "This address contains errors"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:67
-msgid "Email me when others comment on my media"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:69
-msgid "Enable insite notifications about events."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:71
-msgid "License preference"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:77
-msgid "This will be your default license on upload forms."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:90
-msgid "The title can't be empty"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
-#: mediagoblin/user_pages/forms.py:48
-msgid "Description of this collection"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:99
-msgid ""
-"The title part of this collection's address. You usually don't need to "
-"change this."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
-msgid "Old password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
-msgid "Enter your old password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
-msgid "New password"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:119
-msgid "New email address"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
-#: mediagoblin/plugins/basic_auth/forms.py:43
-#: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
-msgid "Password"
-msgstr "Geslo"
-
-#: mediagoblin/edit/forms.py:125
-msgid "Enter your password to prove you own this account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:155
-msgid "Identifier"
-msgstr ""
-
-#: mediagoblin/edit/forms.py:156
-msgid "Value"
-msgstr ""
-
-#: mediagoblin/edit/views.py:78
-msgid "An entry with that slug already exists for this user."
-msgstr "Vnos s to oznako za tega uporabnika že obstaja."
-
-#: mediagoblin/edit/views.py:96
-msgid "You are editing another user's media. Proceed with caution."
-msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo."
-
-#: mediagoblin/edit/views.py:166
-#, python-format
-msgid "You added the attachment %s!"
-msgstr ""
-
-#: mediagoblin/edit/views.py:193
-msgid "You can only edit your own profile."
-msgstr ""
-
-#: mediagoblin/edit/views.py:199
-msgid "You are editing a user's profile. Proceed with caution."
-msgstr "Urejate uporabniški profil. Nadaljujte pazljivo."
-
-#: mediagoblin/edit/views.py:215
-msgid "Profile changes saved"
-msgstr ""
-
-#: mediagoblin/edit/views.py:248
-msgid "Account settings saved"
-msgstr ""
-
-#: mediagoblin/edit/views.py:282
-msgid "You need to confirm the deletion of your account."
-msgstr ""
-
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
-#, python-format
-msgid "You already have a collection called \"%s\"!"
-msgstr ""
-
-#: mediagoblin/edit/views.py:322
-msgid "A collection with that slug already exists for this user."
-msgstr ""
-
-#: mediagoblin/edit/views.py:337
-msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/edit/views.py:378
-msgid "Your email address has been verified."
-msgstr ""
-
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
-msgid "Wrong password"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:60
-msgid "Cannot link theme... no theme set\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:73
-msgid "No asset directory for this theme\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:76
-msgid "However, old link directory symlink found; removed.\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:112
-#, python-format
-msgid "Could not link \"%s\": %s exists and is not a symlink\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:119
-#, python-format
-msgid "Skipping \"%s\"; already set up.\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/assetlink.py:124
-#, python-format
-msgid "Old link found for \"%s\"; removing.\n"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
-msgid ""
-"For more information about how to properly run this\n"
-"script (and how to format the metadata csv file), read the MediaGoblin\n"
-"documentation page on command line uploading\n"
-"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
-msgid "Name of user these media entries belong to"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
-msgid "Path to the csv file containing metadata information."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
-msgid "Don't process eagerly, pass off to celery"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
-msgid "Sorry, no user by username '{username}' exists"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
-msgid "File at {path} not found, use -h flag for help"
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
-msgid ""
-"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
-"Metadata was not uploaded."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
-msgid ""
-"FAIL: Local file {filename} could not be accessed.\n"
-"{filename} will not be uploaded."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
-msgid ""
-"Successfully submitted {filename}!\n"
-"Be sure to look at the Media Processing Panel on your website to be sure it\n"
-"uploaded successfully."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
-msgid "FAIL: This file is larger than the upload limits for this site."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
-msgid "FAIL: This file will put this user past their upload limits."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
-msgid "FAIL: This user is already past their upload limits."
-msgstr ""
-
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
-msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
-msgstr ""
-
-#: mediagoblin/meddleware/csrf.py:134
-msgid ""
-"CSRF cookie not present. This is most likely the result of a cookie blocker "
-"or somesuch.<br/>Make sure to permit the settings of cookies for this "
-"domain."
-msgstr ""
-
-#: mediagoblin/media_types/__init__.py:79
-#: mediagoblin/media_types/__init__.py:101
-msgid "Sorry, I don't support that file type :("
-msgstr ""
-
-#: mediagoblin/media_types/blog/forms.py:26
-#: mediagoblin/media_types/blog/forms.py:35
-#: mediagoblin/plugins/oauth/forms.py:36
-msgid "Description"
-msgstr ""
-
-#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
-msgid "I am sure I want to delete this"
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
-msgid "Woohoo! Submitted!"
-msgstr "Juhej! Poslano."
-
-#: mediagoblin/media_types/blog/views.py:198
-msgid "Woohoo! edited blogpost is submitted"
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:320
-msgid "You deleted the Blog."
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
-msgid "The media was not deleted because you didn't check that you were sure."
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:333
-msgid "You are about to delete another user's Blog. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/media_types/blog/views.py:344
-msgid "The blog was not deleted because you have no rights."
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
-msgid "Add Blog Post"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
-msgid "Edit Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
-msgid "Delete Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
-msgid "Edit"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
-msgid "Delete"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
-msgid "<em> Go to list view </em>"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
-msgid " No blog post yet. "
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
-#, python-format
-msgid "Really delete %(title)s?"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit.html:41
-#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
-msgid "Cancel"
-msgstr "Prekli�i"
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
-msgid "Delete permanently"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
-msgid "Create/Edit a Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
-#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
-#: mediagoblin/templates/mediagoblin/submit/collection.html:30
-#: mediagoblin/templates/mediagoblin/submit/start.html:39
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
-msgid "Add"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
-msgid "Create/Edit a blog post."
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
-msgid "Create/Edit a Blog Post."
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
-#, python-format
-msgid "%(blog_owner_name)s's Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
-msgid "View"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
-msgid "Create a Blog"
-msgstr ""
-
-#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
-msgid " Blog Dashboard "
-msgstr ""
-
-#: mediagoblin/media_types/pdf/processing.py:142
-msgid "unoconv failing to run, check log file"
-msgstr ""
-
-#: mediagoblin/media_types/video/processing.py:44
-msgid "Video transcoding failed"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:21
-msgid "Take away privilege"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:22
-msgid "Ban the user"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:23
-msgid "Send the user a message"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:24
-msgid "Delete the content"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
-msgid "User will be banned until:"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:57
-msgid "Why are you banning this User?"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:109
-msgid "What action will you take to resolve the report?"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:115
-msgid "What privileges will you take away?"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:122
-msgid "Why user was banned:"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:125
-msgid "Message to user:"
-msgstr ""
-
-#: mediagoblin/moderation/forms.py:128
-msgid "Resolution content:"
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:34
-msgid ""
-"\n"
-"{mod} took away {user}'s {privilege} privileges."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:47
-msgid ""
-"\n"
-"{mod} banned user {user} {expiration_date}."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:51
-msgid "until {date}"
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:53
-#: mediagoblin/templates/mediagoblin/banned.html:30
-msgid "indefinitely"
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:62
-msgid ""
-"\n"
-"{mod} sent a warning email to the {user}."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:71
-msgid ""
-"\n"
-"{mod} deleted the comment."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:78
-msgid ""
-"\n"
-"{mod} deleted the media entry."
-msgstr ""
-
-#: mediagoblin/moderation/tools.py:91
-msgid "Warning from"
-msgstr ""
-
-#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
-msgid "commented on your post"
-msgstr ""
-
-#: mediagoblin/notifications/views.py:35
-#, python-format
-msgid "Subscribed to comments on %s!"
-msgstr ""
-
-#: mediagoblin/notifications/views.py:48
-#, python-format
-msgid "You will not receive notifications for comments on %s."
-msgstr ""
-
-#: mediagoblin/oauth/views.py:242
-msgid "Must provide an oauth_token."
-msgstr ""
-
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
-msgid "No request token found."
-msgstr ""
-
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
-msgid "Sorry, the file size is too big."
-msgstr ""
-
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
-msgid "Sorry, uploading this file will put you over your upload limit."
-msgstr ""
-
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
-msgid "Sorry, you have reached your upload limit."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/forms.py:21
-msgid "Enter the URL for the media to be featured"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:132
-msgid "Primary"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:133
-msgid "Secondary"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:134
-msgid "Tertiary"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/tools.py:135
-msgid "-----------{display_type}-Features---------------------------\n"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
-msgid "How does this work?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
-msgid "How to feature media?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
-msgid ""
-"\n"
-"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
-"      then paste it into a new line in the text box above. There should be only\n"
-"      one url per line. The url that you paste into the text box should be under\n"
-"      the header describing how prominent a feature it will be (whether Primary,\n"
-"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
-"      inside the text box, click the Submit Query button, and your media should be\n"
-"      displayed on the front page.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
-msgid "Is there another way to manage featured media?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
-msgid ""
-"\n"
-"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
-"        of media you would like to feature or unfeature and look at the bar to\n"
-"        the side of the media entry. If the piece of media has not been featured\n"
-"        yet you should see a button that says \"Feature\". Press that button and\n"
-"        the media will be featured as a Primary Feature at the top of the page.\n"
-"        All other featured media entries will remain as features, but will be\n"
-"        pushed further down the page.<br /><br />\n"
-"\n"
-"        If you go to the media homepage of a piece of media that is currently\n"
-"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
-"        where previously there was the button which said \"Feature\". Click\n"
-"        Unfeature and that media entry will no longer be displayed on the\n"
-"        front page, although you can feature it again at any point. Promote\n"
-"        moves the featured media higher up on the page and makes it more\n"
-"        prominent and Demote moves the featured media lower down and makes it\n"
-"        less prominent.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
-msgid "What is a Primary Feature? What is a Secondary Feature?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
-msgid ""
-"\n"
-"      These categories just describe how prominent a feature will be on your\n"
-"      front page. Primary Features are placed at the top of the front page and are\n"
-"      much larger. Next are Secondary Features, which are slightly smaller.\n"
-"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
-"\n"
-"      Primary Features also can display longer descriptions than Secondary\n"
-"      Features, and Secondary Features can display longer descriptions than\n"
-"      Tertiary Features."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
-msgid ""
-"How to decide what information is displayed when a media entry is\n"
-"    featured?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
-msgid ""
-"\n"
-"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
-"      portion of its description will be displayed on your website's front page.\n"
-"      The number of characters displayed varies on the prominence of the feature.\n"
-"      Primary Features display the first 512 characters of their description,\n"
-"      Secondary Features display the first 256 characters of their description,\n"
-"      and Tertiary Features display the first 128 characters of their description.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
-msgid "How to unfeature a piece of media?"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
-msgid ""
-"\n"
-"      Unfeature a media by removing its line from the above textarea and then\n"
-"      pressing the Submit Query button.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
-msgid "CAUTION:"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
-msgid ""
-"\n"
-"      When copying and pasting urls into the above text box, be aware that if\n"
-"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
-"      featured. Make sure that all your intended Media Entries are featured.\n"
-"    "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
-msgid ""
-"\n"
-"Feature Media "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
-msgid "Feature"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
-msgid ""
-"\n"
-"Unfeature Media "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
-msgid "Unfeature"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
-msgid ""
-"\n"
-"Promote Feature "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
-msgid "Promote"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
-msgid ""
-"\n"
-"Demote Feature "
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
-msgid "Demote"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
-#: mediagoblin/templates/mediagoblin/root.html:32
-msgid "Most recent media"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
-msgid "Nothing is currently featured."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
-msgid ""
-"If you would like to feature a\n"
-"        piece of media, go to that media entry's homepage and click the button\n"
-"        that says <a class=\"button_action\">Feature</a>."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
-#, python-format
-msgid ""
-"You're seeing this page because you are a user capable of\n"
-"        featuring media, a regular user would see a blank page, so be sure to\n"
-"        have media featured as long as your instance has the 'archivalook'\n"
-"        plugin enabled. A more advanced tool to manage features can be found\n"
-"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
-msgid "View most recent media"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
-msgid "Feature management panel"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
-msgid ""
-"Sorry, this audio will not work because\n"
-"\tyour web browser does not support HTML5\n"
-"\taudio."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
-msgid ""
-"You can get a modern web browser that\n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
-msgid ""
-"Sorry, this video will not work because\n"
-"          your web browser does not support HTML5 \n"
-"          video."
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
-#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
-msgid ""
-"You can get a modern web browser that \n"
-"          can play this video at <a href=\"http://getfirefox.com\">\n"
-"          http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:24
-#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
-#: mediagoblin/plugins/persona/forms.py:24
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
-msgid "Username"
-msgstr "Uporabniško ime"
-
-#: mediagoblin/plugins/basic_auth/forms.py:32
-#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
-#: mediagoblin/plugins/persona/forms.py:28
-#: mediagoblin/plugins/persona/forms.py:39
-msgid "Email address"
-msgstr "E-poštni naslov"
-
-#: mediagoblin/plugins/basic_auth/forms.py:39
-msgid "Username or Email"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:46
-msgid "Stay logged in"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/forms.py:51
-msgid "Username or email"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:54
-msgid ""
-"If that email address (case sensitive!) is registered an email has been sent"
-" with instructions on how to change your password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:65
-msgid "Couldn't find someone with that username."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:68
-msgid ""
-"An email has been sent with instructions on how to change your password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:75
-msgid ""
-"Could not send password recovery email as your username is inactive or your "
-"account's email address has not been verified."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:123
-msgid "The user id is incorrect."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:139
-msgid "You can now log in using your new password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:163
-msgid ""
-"You are no longer an active user. Please contact the system admin to "
-"reactivate your account."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/views.py:215
-msgid "Your password was changed successfully"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
-msgid "Set your new password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
-msgid "Set password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
-#, python-format
-msgid "Changing %(username)s's password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
-msgid "Save"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
-msgid "Don't have an account yet?"
-msgstr "Še nimate ra�una?"
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
-msgid "Create one here!"
-msgstr "Ustvarite si ga."
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
-msgid "Change your password."
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
-msgid "Recover password"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
-msgid "Send instructions"
-msgstr ""
-
-#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
-msgid "Forgot your password?"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
-#, python-format
-msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
-msgstr ""
-
-#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
-msgid "Sign in to create an account!"
-msgstr ""
-
-#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
-msgid "Metadata"
-msgstr ""
-
-#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
-msgid "Edit Metadata"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:29
-msgid "Allow"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:30
-msgid "Deny"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:34
-msgid "Name"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:35
-msgid "The name of the OAuth client"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:38
-msgid ""
-"This will be visible to users allowing your\n"
-"                application to authenticate as them."
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:40
-msgid "Type"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:45
-msgid ""
-"<strong>Confidential</strong> - The client can\n"
-"                make requests to the GNU MediaGoblin instance that can not be\n"
-"                intercepted by the user agent (e.g. server-side client).<br />\n"
-"                <strong>Public</strong> - The client can't make confidential\n"
-"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
-"                JavaScript client)."
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:52
-msgid "Redirect URI"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:54
-msgid ""
-"The redirect URI for the applications, this field\n"
-"            is <strong>required</strong> for public clients."
-msgstr ""
-
-#: mediagoblin/plugins/oauth/forms.py:66
-msgid "This field is required for public clients"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/views.py:55
-msgid "The client {0} has been registered!"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
-msgid "OAuth client connections"
-msgstr ""
-
-#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
-msgid "Your OAuth clients"
-msgstr ""
-
-#: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
-msgid "Sorry, an account is already registered to that OpenID."
-msgstr ""
-
-#: mediagoblin/plugins/openid/forms.py:38
-msgid "OpenID"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:48
-msgid "Sorry, the OpenID server could not be found"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:61
-#, python-format
-msgid "No OpenID service was found for %s"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:106
-#, python-format
-msgid "Verification of %s failed: %s"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:117
-msgid "Verification cancelled"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:314
-msgid "Your OpenID url was saved successfully."
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
-msgid "You can't delete your only OpenID URL unless you have a password set"
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
-msgid "That OpenID is not registered to this account."
-msgstr ""
-
-#: mediagoblin/plugins/openid/views.py:385
-msgid "OpenID was successfully removed."
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
-msgid "Add an OpenID"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
-msgid "Delete an OpenID"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
-msgid "OpenID's"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
-#: mediagoblin/templates/mediagoblin/auth/login.html:28
-#: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:47
-msgid "Log in"
-msgstr "Prijava"
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
-#: mediagoblin/templates/mediagoblin/auth/login.html:39
-msgid "Logging in failed!"
-msgstr "Prijava ni uspela."
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
-msgid "Log in to create an account!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
-msgid "Or login with a password!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
-msgid "Or login with OpenID!"
-msgstr ""
-
-#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
-msgid "Or register with OpenID!"
-msgstr ""
-
-#: mediagoblin/plugins/persona/__init__.py:90
-msgid "Sorry, an account is already registered to that Persona email."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:138
-msgid "The Persona email address was successfully removed."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:144
-msgid ""
-"You can't delete your only Persona email address unless you have a password "
-"set."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:149
-msgid "That Persona email address is not registered to this account."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:176
-msgid ""
-"Sorry, an account is already registered with that Persona email address."
-msgstr ""
-
-#: mediagoblin/plugins/persona/views.py:192
-msgid "Your Persona email address was saved successfully."
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
-msgid "Delete a Persona email address"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
-msgid "Add a Persona email address"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
-msgid "Persona's"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
-msgid "Or login with Persona!"
-msgstr ""
-
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
-msgid "Or register with Persona!"
-msgstr ""
-
-#: mediagoblin/processing/__init__.py:420
-msgid "Invalid file given for media type."
-msgstr "Za vrsto vsebine je bila podana napa�na datoteka."
-
-#: mediagoblin/processing/__init__.py:427
-msgid "Copying to public storage failed."
-msgstr ""
-
-#: mediagoblin/processing/__init__.py:435
-msgid "An acceptable processing file was not found"
-msgstr ""
-
-#: mediagoblin/submit/forms.py:30
-msgid "Max file size: {0} mb"
-msgstr ""
-
-#: mediagoblin/submit/forms.py:34
-msgid "File"
-msgstr "Datoteka"
-
-#: mediagoblin/submit/forms.py:41
-msgid ""
-"You can use\n"
-"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"                        Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/submit/views.py:55
-msgid "You must provide a file."
-msgstr "Podati morate datoteko."
-
-#: mediagoblin/submit/views.py:138
-#, python-format
-msgid "Collection \"%s\" added!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:20
-msgid "You are Banned."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:24
-#: mediagoblin/templates/mediagoblin/error.html:24
-msgid "Image of goblin stressing out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:26
-msgid "You have been banned"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/banned.html:28
-#, python-format
-msgid "until %(until_when)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:97
-msgid "Verify your email!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
-msgid "log out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:131
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:138
-msgid "Change account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
-msgid "Media processing panel"
-msgstr "Podokno obdelovanja vsebine"
-
-#: mediagoblin/templates/mediagoblin/base.html:152
-msgid "Log out"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:155
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
-msgid "Add media"
-msgstr "Dodaj vsebino"
-
-#: mediagoblin/templates/mediagoblin/base.html:158
-#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
-msgid "Create new collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:163
-msgid "Moderation powers:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:169
-msgid "User management panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/base.html:173
-msgid "Report management panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:21
-msgid "Authorization"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:26
-#: mediagoblin/templates/mediagoblin/api/authorize.html:53
-msgid "Authorize"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:29
-msgid "You are logged in as"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:33
-msgid "Do you want to authorize "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:37
-msgid "an unknown application"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:39
-msgid " to access your account? "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:41
-msgid "Applications with access to your account can: "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:43
-msgid "Post new media as you"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:44
-msgid "See your information (e.g profile, media, etc...)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/authorize.html:45
-msgid "Change your information"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/oob.html:21
-msgid "Authorization Finished"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/oob.html:26
-msgid "Authorization Complete"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/auth/register.html:28
-#: mediagoblin/templates/mediagoblin/auth/register.html:36
-msgid "Create an account!"
-msgstr "Ustvarite ra�un."
-
-#: mediagoblin/templates/mediagoblin/auth/register.html:41
-msgid "Create"
-msgstr "Ustvari"
-
-#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
-#, python-format
-msgid ""
-"Hi %(username)s,\n"
-"\n"
-"to activate your GNU MediaGoblin account, open the following URL in\n"
-"your web browser:\n"
-"\n"
-"%(verification_url)s"
-msgstr "Pozdravljeni, %(username)s\n\nZa aktivacijo svojega ra�una GNU MediaGoblin odprite\nnaslednji URL v svojem spletnem brskalniku:\n\n%(verification_url)s"
-
-#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
-#, python-format
-msgid ""
-"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
-"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
-#, python-format
-msgid ""
-"Released under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
-"href=\"%(source_link)s\">Source code</a> available."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
-msgid "Terms of Service"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
-msgid "Explore"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
-msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
-msgid ""
-"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
-"extraordinarily great piece of media hosting software."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
-msgid "Don't have one yet? It's easy!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
-msgid ""
-"\n"
-"            >Create an account at this site</a>\n"
-"            or"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
-msgid ""
-"\n"
-"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/bits/logo.html:23
-#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
-msgid "MediaGoblin logo"
-msgstr "Logotip MediaGoblin"
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
-#, python-format
-msgid "Editing attachments for %(media_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
-msgid "Attachments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
-msgid "Add attachment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
-#: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
-#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
-msgid "Save changes"
-msgstr "Shrani spremembe"
-
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
-#, python-format
-msgid "Changing %(username)s's email"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
-#, python-format
-msgid "Really delete user '%(user_name)s' and all related media/comments?"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
-msgid "Yes, really delete my account"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit.html:23
-#: mediagoblin/templates/mediagoblin/edit/edit.html:35
-#, python-format
-msgid "Editing %(media_title)s"
-msgstr "Urejanje %(media_title)s"
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
-#, python-format
-msgid "Changing %(username)s's account settings"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
-msgid "Delete my account"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
-msgid "Email"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
-#, python-format
-msgid "Editing %(collection_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
-#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
-#, python-format
-msgid "Editing %(username)s's profile"
-msgstr "Urejanje profila – %(username)s"
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
-#, python-format
-msgid "Metadata for \"%(media_name)s\""
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
-msgid "MetaData"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
-msgid "Add new Row"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
-msgid "Update Metadata"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
-msgid "Clear empty Rows"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
-#, python-format
-msgid ""
-"Hi,\n"
-"\n"
-"We wanted to verify that you are %(username)s. If this is the case, then \n"
-"please follow the link below to verify your new email address.\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"If you are not %(username)s or didn't request an email change, you can ignore\n"
-"this email."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
-msgid "New comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
-msgid "Mark all read"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/listings/collection.html:30
-#: mediagoblin/templates/mediagoblin/listings/collection.html:35
-#: mediagoblin/templates/mediagoblin/listings/tag.html:30
-#: mediagoblin/templates/mediagoblin/listings/tag.html:35
-#, python-format
-msgid "Media tagged with: %(tag_name)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
-msgid "Download"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
-msgid "Original"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
-msgid ""
-"Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
-msgid ""
-"You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
-msgid "Original file"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
-msgid "WebM file (Vorbis codec)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
-msgid "Created"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
-#, python-format
-msgid "Image for %(media_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
-msgid "PDF file"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
-msgid "Perspective"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
-msgid "Front"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
-msgid "Top"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
-msgid "Side"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
-msgid "WebGL"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
-msgid "Download model"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
-msgid "File Format"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
-msgid "Object Height"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
-msgid ""
-"Sorry, this video will not work because\n"
-"      your web browser does not support HTML5 \n"
-"      video."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
-msgid ""
-"You can get a modern web browser that \n"
-"      can play this video at <a href=\"http://getfirefox.com\">\n"
-"      http://getfirefox.com</a>!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
-msgid "WebM file (VP8/Vorbis)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
-msgid ""
-"Here you can track the state of media being processed on this instance."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
-msgid "Media in-processing"
-msgstr "Vsebina v obdelavi"
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
-msgid "ID"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
-msgid "User"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
-msgid "When submitted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
-msgid "Transcoding progress"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
-msgid "Unknown"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
-msgid "No media in-processing"
-msgstr "V obdelavi ni nobene vsebine"
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
-msgid "These uploads failed to process:"
-msgstr "Teh vsebin ni bilo mo� obdelati:"
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
-msgid "Reason for failure"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
-msgid "Failure metadata"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
-msgid "No failed entries!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
-msgid "Last 10 successful uploads"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
-msgid "Submitted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
-msgid "No processed entries, yet!"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:27
-msgid "Sorry, no such report found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:33
-msgid "Return to Reports Panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
-msgid "Report"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:38
-msgid "Reported comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:83
-#, python-format
-msgid ""
-"\n"
-"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
-"    "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:92
-#, python-format
-msgid ""
-"\n"
-"          CONTENT BY\n"
-"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
-"          HAS BEEN DELETED\n"
-"        "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:102
-msgid "Reason for report:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:133
-#: mediagoblin/templates/mediagoblin/moderation/user.html:136
-msgid "Resolve"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:137
-#: mediagoblin/templates/mediagoblin/moderation/report.html:157
-msgid "Resolve This Report"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:149
-msgid "Status"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:151
-msgid "RESOLVED"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report.html:159
-msgid "You cannot take action against an administrator"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
-msgid "Report panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
-msgid ""
-"\n"
-"    Here you can look up open reports that have been filed by users.\n"
-"  "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
-msgid "Active Reports Filed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
-msgid "Offender"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
-msgid "When Reported"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
-msgid "Reported By"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
-msgid "Reason"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
-#, python-format
-msgid ""
-"\n"
-"                Comment Report #%(report_id)s\n"
-"              "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
-#, python-format
-msgid ""
-"\n"
-"                Media Report #%(report_id)s\n"
-"              "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
-msgid "No open reports found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
-msgid "Closed Reports"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
-msgid "Resolved"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
-msgid "Action Taken"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
-#, python-format
-msgid ""
-"\n"
-"              Closed Report #%(report_id)s\n"
-"            "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
-msgid "No closed reports found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:23
-#, python-format
-msgid "User: %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:42
-msgid "Return to Users Panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:49
-msgid "Sorry, no such user found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:53
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
-msgid "Email verification needed"
-msgstr "Potrebna je potrditev prek e-pošte"
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:55
-msgid ""
-"Someone has registered an account with this username, but it still has\n"
-"        to be activated."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:66
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
-#, python-format
-msgid "%(username)s's profile"
-msgstr "Profil – %(username)s"
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:68
-#, python-format
-msgid "BANNED until %(expiration_date)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:72
-msgid "Banned Indefinitely"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:78
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
-msgid "This user hasn't filled in their profile (yet)."
-msgstr "Ta uporabnik Å¡e ni izpolnil svojega profila."
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:89
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
-msgid "Edit profile"
-msgstr "Uredi profil"
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:96
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
-msgid "Browse collections"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:105
-#, python-format
-msgid "Active Reports on %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:112
-msgid "Report ID"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:113
-msgid "Reported Content"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:114
-msgid "Description of Report"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:122
-#, python-format
-msgid "Report #%(report_number)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:129
-msgid "Reported Comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:131
-msgid "Reported Media Entry"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:142
-#, python-format
-msgid "No active reports filed on %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:150
-#, python-format
-msgid "All reports on %(username)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:155
-#, python-format
-msgid "All reports that %(username)s has filed"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:164
-#, python-format
-msgid "%(username)s's Privileges"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:172
-msgid "Privilege"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:173
-msgid "Granted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:180
-msgid "Yes"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:182
-msgid "No"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:213
-msgid "Ban User"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user.html:218
-msgid "UnBan User"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
-msgid "User panel"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
-msgid ""
-"\n"
-"    Here you can look up users in order to take punitive actions on them.\n"
-"  "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
-msgid "Active Users"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
-msgid "When Joined"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
-msgid "# of Comments Posted"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
-msgid "No users found."
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/submit/collection.html:26
-msgid "Add a collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/submit/start.html:28
-#: mediagoblin/templates/mediagoblin/submit/start.html:35
-msgid "Add your media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
-#, python-format
-msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
-msgid "Add a comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
-msgid "Add this comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
-msgid "Added"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
-#, python-format
-msgid "%(collection_title)s (%(username)s's collection)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
-#, python-format
-msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
-#, python-format
-msgid "Delete collection %(collection_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
-#, python-format
-msgid "Really delete collection: %(title)s?"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
-#, python-format
-msgid "Remove %(media_title)s from %(collection_title)s"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
-#, python-format
-msgid "Really remove %(media_title)s from %(collection_title)s?"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
-msgid "Remove"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
-#, python-format
-msgid "%(username)s's collections"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
-#, python-format
-msgid ""
-"Hi %(username)s,\n"
-"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
-#, python-format
-msgid "%(username)s's media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
-#, python-format
-msgid ""
-"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
-"href=\"%(tag_url)s\">%(tag)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
-#, python-format
-msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
-msgstr "Vsebina uporabnika <a href=\"%(user_url)s\">%(username)s</a>"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
-#, python-format
-msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
-msgid "Comment Preview"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
-#, python-format
-msgid "Add “%(media_title)s� to a collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
-msgid "+"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
-msgid "Add a new collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
-msgid ""
-"You can track the state of media being processed for your gallery here."
-msgstr "Tu lahko spremljate stanje vsebin, ki so v obdelavi za vašo galerijo."
-
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
-msgid "Your last 10 successful uploads"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
-msgid "<h2>File a Report</h2>"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
-msgid "Reporting this Comment"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
-msgid "Reporting this Media Entry"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
-#, python-format
-msgid ""
-"\n"
-"            � Published by <a href=\"%(user_url)s\"\n"
-"                          class=\"comment_authorlink\">%(username)s</a>\n"
-"      "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
-msgid "File Report "
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
-msgid "Here's a spot to tell others about yourself."
-msgstr "Na tem mestu lahko drugim poveste nekaj o sebi."
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
-#, python-format
-msgid "View all of %(username)s's media"
-msgstr "Prikaži vso vsebino uporabnika %(username)s"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
-msgid ""
-"This is where your media will appear, but you don't seem to have added "
-"anything yet."
-msgstr "Tu bo prikazana vaša vsebina, a trenutno še niste dodali ni�."
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
-#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
-msgid "There doesn't seem to be any media here yet..."
-msgstr "Videti je, da tu Å¡e ni nobene vsebine ..."
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
-msgid "Almost done! Your account still needs to be activated."
-msgstr "Skoraj ste zaklju�ili. Svoj ra�un morate le še aktivirati."
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
-msgid ""
-"An email should arrive in a few moments with instructions on how to do so."
-msgstr "V kratkem bi morali prejeti e-pošto z navodili, kako to storiti."
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
-msgid "In case it doesn't:"
-msgstr "ÄŒe je ne prejmete:"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
-msgid "Resend verification email"
-msgstr "Ponovno pošlji potrditveno e-pošto"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
-msgid ""
-"Someone has registered an account with this username, but it still has to be"
-" activated."
-msgstr "Nekdo je s tem uporabniškim imenom že registriral ra�un, vendar mora biti še aktiviran."
-
-#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
-#, python-format
-msgid ""
-"If you are that person but you've lost your verification email, you can <a "
-"href=\"%(login_url)s\">log in</a> and resend it."
-msgstr "Če ste ta oseba vi, a ste izgubili potrditveno e-pošto, se lahko <a href=\"%(login_url)s\">prijavite</a> in jo ponovno pošljete."
-
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
-msgid "(remove)"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collections.html:21
-msgid "Collected in"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/collections.html:40
-msgid "Add to a collection"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
-msgid "Subscribe to comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
-msgid "Silence comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
-#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
-msgid "feed icon"
-msgstr "Ikona vira"
-
-#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
-#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
-msgid "Atom feed"
-msgstr "Ikona Atom"
-
-#: mediagoblin/templates/mediagoblin/utils/license.html:25
-msgid "All rights reserved"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
-msgid "� Newer"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
-msgid "Older →"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
-msgid "Go to page:"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
-msgid "newer"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
-msgid "older"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/report.html:25
-msgid "Report media"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "Tagged with"
-msgstr ""
-
-#: mediagoblin/tools/exif.py:81
-msgid "Could not read the image file."
-msgstr ""
-
-#: mediagoblin/tools/response.py:38
-msgid "Oops!"
-msgstr "Opa!"
-
-#: mediagoblin/tools/response.py:39
-msgid "An error occured"
-msgstr ""
-
-#: mediagoblin/tools/response.py:53
-msgid "Bad Request"
-msgstr ""
-
-#: mediagoblin/tools/response.py:55
-msgid "The request sent to the server is invalid, please double check it"
-msgstr ""
-
-#: mediagoblin/tools/response.py:63
-msgid "Operation not allowed"
-msgstr ""
-
-#: mediagoblin/tools/response.py:64
-msgid ""
-"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
-"function that you are not allowed to. Have you been trying to delete all "
-"user accounts again?"
-msgstr ""
-
-#: mediagoblin/tools/response.py:72
-msgid ""
-"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
-" the address is correct, maybe the page you're looking for has been moved or"
-" deleted."
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:62
-msgid "year"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:63
-msgid "month"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:64
-msgid "week"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:65
-msgid "day"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:66
-msgid "hour"
-msgstr ""
-
-#: mediagoblin/tools/timesince.py:67
-msgid "minute"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:23
-msgid "Comment"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:25
-msgid ""
-"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
-"target=\"_blank\">Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:35
-msgid "I am sure I want to remove this item from the collection"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:39
-msgid "Collection"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:40
-msgid "-- Select --"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:42
-msgid "Include a note"
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:49
-msgid ""
-"You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
-"                      Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
-msgid "Reason for Reporting"
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:188
-msgid "Sorry, comments are disabled."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:193
-msgid "Oops, your comment was empty."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:199
-msgid "Your comment has been posted!"
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:235
-msgid "Please check your entries and try again."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:275
-msgid "You have to select or add a collection"
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:286
-#, python-format
-msgid "\"%s\" already in collection \"%s\""
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:292
-#, python-format
-msgid "\"%s\" added to collection \"%s\""
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:317
-msgid "You deleted the media."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:336
-msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:409
-msgid "You deleted the item from the collection."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:413
-msgid "The item was not removed because you didn't check that you were sure."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:421
-msgid ""
-"You are about to delete an item from another user's collection. Proceed with"
-" caution."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:453
-#, python-format
-msgid "You deleted the collection \"%s\""
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:460
-msgid ""
-"The collection was not deleted because you didn't check that you were sure."
-msgstr ""
-
-#: mediagoblin/user_pages/views.py:468
-msgid ""
-"You are about to delete another user's collection. Proceed with caution."
-msgstr ""
diff --git a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/mediagoblin.po
index cb9b2849..84918610 100644
--- a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sl/mediagoblin.po
@@ -1,22 +1,22 @@
 # Translations template for PROJECT.
 # Copyright (C) 2014 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# 
-# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU MediaGoblin\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
-"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/mediagoblin/language/vi/)\n"
+"POT-Creation-Date: 2014-09-21 11:08-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.10.0\n"
 "Generated-By: Babel 1.3\n"
-"Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
 msgid "Sorry, registration is disabled on this instance."
@@ -58,8 +58,8 @@ msgstr ""
 
 #: mediagoblin/auth/views.py:161
 msgid ""
-"Your email address has been verified. You may now login, edit your profile, "
-"and submit images!"
+"Your email address has been verified. You may now login, edit your "
+"profile, and submit images!"
 msgstr ""
 
 #: mediagoblin/auth/views.py:167
@@ -97,7 +97,8 @@ msgstr ""
 #: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
@@ -193,7 +194,7 @@ msgstr ""
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/tests/test_util.py:143
 msgid "Password"
 msgstr ""
 
@@ -334,7 +335,8 @@ msgstr ""
 #: mediagoblin/gmg_commands/batchaddmedia.py:157
 msgid ""
 "Successfully submitted {filename}!\n"
-"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"Be sure to look at the Media Processing Panel on your website to be sure "
+"it\n"
 "uploaded successfully."
 msgstr ""
 
@@ -356,9 +358,9 @@ msgstr ""
 
 #: mediagoblin/meddleware/csrf.py:134
 msgid ""
-"CSRF cookie not present. This is most likely the result of a cookie blocker "
-"or somesuch.<br/>Make sure to permit the settings of cookies for this "
-"domain."
+"CSRF cookie not present. This is most likely the result of a cookie "
+"blocker or somesuch.<br/>Make sure to permit the settings of cookies for "
+"this domain."
 msgstr ""
 
 #: mediagoblin/media_types/__init__.py:79
@@ -611,11 +613,11 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:241
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:246 mediagoblin/oauth/views.py:297
 msgid "No request token found."
 msgstr ""
 
@@ -665,12 +667,18 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
 msgid ""
 "\n"
-"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
-"      then paste it into a new line in the text box above. There should be only\n"
-"      one url per line. The url that you paste into the text box should be under\n"
-"      the header describing how prominent a feature it will be (whether Primary,\n"
-"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
-"      inside the text box, click the Submit Query button, and your media should be\n"
+"      Go to the page of the media entry you want to feature. Copy it's "
+"URL and\n"
+"      then paste it into a new line in the text box above. There should "
+"be only\n"
+"      one url per line. The url that you paste into the text box should "
+"be under\n"
+"      the header describing how prominent a feature it will be (whether "
+"Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to "
+"feature are\n"
+"      inside the text box, click the Submit Query button, and your media "
+"should be\n"
 "      displayed on the front page.\n"
 "    "
 msgstr ""
@@ -682,21 +690,33 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
 msgid ""
 "\n"
-"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
-"        of media you would like to feature or unfeature and look at the bar to\n"
-"        the side of the media entry. If the piece of media has not been featured\n"
-"        yet you should see a button that says \"Feature\". Press that button and\n"
-"        the media will be featured as a Primary Feature at the top of the page.\n"
-"        All other featured media entries will remain as features, but will be\n"
+"        Yes. If you would prefer, you may go to the media homepage of the"
+" piece\n"
+"        of media you would like to feature or unfeature and look at the "
+"bar to\n"
+"        the side of the media entry. If the piece of media has not been "
+"featured\n"
+"        yet you should see a button that says \"Feature\". Press that "
+"button and\n"
+"        the media will be featured as a Primary Feature at the top of the"
+" page.\n"
+"        All other featured media entries will remain as features, but "
+"will be\n"
 "        pushed further down the page.<br /><br />\n"
 "\n"
-"        If you go to the media homepage of a piece of media that is currently\n"
-"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
-"        where previously there was the button which said \"Feature\". Click\n"
-"        Unfeature and that media entry will no longer be displayed on the\n"
-"        front page, although you can feature it again at any point. Promote\n"
+"        If you go to the media homepage of a piece of media that is "
+"currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and"
+" \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". "
+"Click\n"
+"        Unfeature and that media entry will no longer be displayed on the"
+"\n"
+"        front page, although you can feature it again at any point. "
+"Promote\n"
 "        moves the featured media higher up on the page and makes it more\n"
-"        prominent and Demote moves the featured media lower down and makes it\n"
+"        prominent and Demote moves the featured media lower down and "
+"makes it\n"
 "        less prominent.\n"
 "    "
 msgstr ""
@@ -708,13 +728,19 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
 msgid ""
 "\n"
-"      These categories just describe how prominent a feature will be on your\n"
-"      front page. Primary Features are placed at the top of the front page and are\n"
-"      much larger. Next are Secondary Features, which are slightly smaller.\n"
-"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"      These categories just describe how prominent a feature will be on "
+"your\n"
+"      front page. Primary Features are placed at the top of the front "
+"page and are\n"
+"      much larger. Next are Secondary Features, which are slightly "
+"smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br "
+"/><br />\n"
 "\n"
-"      Primary Features also can display longer descriptions than Secondary\n"
-"      Features, and Secondary Features can display longer descriptions than\n"
+"      Primary Features also can display longer descriptions than "
+"Secondary\n"
+"      Features, and Secondary Features can display longer descriptions "
+"than\n"
 "      Tertiary Features."
 msgstr ""
 
@@ -727,12 +753,18 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
 msgid ""
 "\n"
-"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
-"      portion of its description will be displayed on your website's front page.\n"
-"      The number of characters displayed varies on the prominence of the feature.\n"
-"      Primary Features display the first 512 characters of their description,\n"
-"      Secondary Features display the first 256 characters of their description,\n"
-"      and Tertiary Features display the first 128 characters of their description.\n"
+"      When a media entry is featured, the entry's title, it's thumbnail "
+"and a\n"
+"      portion of its description will be displayed on your website's "
+"front page.\n"
+"      The number of characters displayed varies on the prominence of the "
+"feature.\n"
+"      Primary Features display the first 512 characters of their "
+"description,\n"
+"      Secondary Features display the first 256 characters of their "
+"description,\n"
+"      and Tertiary Features display the first 128 characters of their "
+"description.\n"
 "    "
 msgstr ""
 
@@ -743,7 +775,8 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
 msgid ""
 "\n"
-"      Unfeature a media by removing its line from the above textarea and then\n"
+"      Unfeature a media by removing its line from the above textarea and "
+"then\n"
 "      pressing the Submit Query button.\n"
 "    "
 msgstr ""
@@ -755,9 +788,12 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
 msgid ""
 "\n"
-"      When copying and pasting urls into the above text box, be aware that if\n"
-"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
-"      featured. Make sure that all your intended Media Entries are featured.\n"
+"      When copying and pasting urls into the above text box, be aware "
+"that if\n"
+"      you make a typo, once you press Submit Query, your media entry will"
+" NOT be\n"
+"      featured. Make sure that all your intended Media Entries are "
+"featured.\n"
 "    "
 msgstr ""
 
@@ -813,7 +849,8 @@ msgstr ""
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
 msgid ""
 "If you would like to feature a\n"
-"        piece of media, go to that media entry's homepage and click the button\n"
+"        piece of media, go to that media entry's homepage and click the "
+"button\n"
 "        that says <a class=\"button_action\">Feature</a>."
 msgstr ""
 
@@ -821,10 +858,14 @@ msgstr ""
 #, python-format
 msgid ""
 "You're seeing this page because you are a user capable of\n"
-"        featuring media, a regular user would see a blank page, so be sure to\n"
-"        have media featured as long as your instance has the 'archivalook'\n"
-"        plugin enabled. A more advanced tool to manage features can be found\n"
-"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+"        featuring media, a regular user would see a blank page, so be "
+"sure to\n"
+"        have media featured as long as your instance has the "
+"'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be "
+"found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management "
+"panel.</a>"
 msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
@@ -893,8 +934,8 @@ msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:54
 msgid ""
-"If that email address (case sensitive!) is registered an email has been sent"
-" with instructions on how to change your password."
+"If that email address (case sensitive!) is registered an email has been "
+"sent with instructions on how to change your password."
 msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:65
@@ -902,14 +943,13 @@ msgid "Couldn't find someone with that username."
 msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:68
-msgid ""
-"An email has been sent with instructions on how to change your password."
+msgid "An email has been sent with instructions on how to change your password."
 msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:75
 msgid ""
-"Could not send password recovery email as your username is inactive or your "
-"account's email address has not been verified."
+"Could not send password recovery email as your username is inactive or "
+"your account's email address has not been verified."
 msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:123
@@ -1025,10 +1065,14 @@ msgstr ""
 #: mediagoblin/plugins/oauth/forms.py:45
 msgid ""
 "<strong>Confidential</strong> - The client can\n"
-"                make requests to the GNU MediaGoblin instance that can not be\n"
-"                intercepted by the user agent (e.g. server-side client).<br />\n"
-"                <strong>Public</strong> - The client can't make confidential\n"
-"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                make requests to the GNU MediaGoblin instance that can "
+"not be\n"
+"                intercepted by the user agent (e.g. server-side "
+"client).<br />\n"
+"                <strong>Public</strong> - The client can't make "
+"confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-"
+"side\n"
 "                JavaScript client)."
 msgstr ""
 
@@ -1162,8 +1206,8 @@ msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:144
 msgid ""
-"You can't delete your only Persona email address unless you have a password "
-"set."
+"You can't delete your only Persona email address unless you have a "
+"password set."
 msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:149
@@ -1171,8 +1215,7 @@ msgid "That Persona email address is not registered to this account."
 msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:176
-msgid ""
-"Sorry, an account is already registered with that Persona email address."
+msgid "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
 #: mediagoblin/plugins/persona/views.py:192
@@ -1222,7 +1265,8 @@ msgstr ""
 #: mediagoblin/submit/forms.py:41
 msgid ""
 "You can use\n"
-"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                        Markdown</a> for formatting."
 msgstr ""
 
@@ -1383,15 +1427,16 @@ msgstr ""
 #, python-format
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org/\" title='Version "
-"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> "
+"project."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
 #, python-format
 msgid ""
 "Released under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
-"href=\"%(source_link)s\">Source code</a> available."
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a"
+" href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
@@ -1408,14 +1453,14 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
 msgid ""
-"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
-"extraordinarily great piece of media hosting software."
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, "
+"an extraordinarily great piece of media hosting software."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
 msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
+"To add your own media, place comments, and more, you can log in with your"
+" MediaGoblin account."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
@@ -1432,7 +1477,9 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
 msgid ""
 "\n"
-"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+"            <a class=\"button_action\" "
+"href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your "
+"own server</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/logo.html:23
@@ -1537,12 +1584,14 @@ msgstr ""
 msgid ""
 "Hi,\n"
 "\n"
-"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"We wanted to verify that you are %(username)s. If this is the case, then"
+" \n"
 "please follow the link below to verify your new email address.\n"
 "\n"
 "%(verification_url)s\n"
 "\n"
-"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"If you are not %(username)s or didn't request an email change, you can "
+"ignore\n"
 "this email."
 msgstr ""
 
@@ -1682,8 +1731,7 @@ msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
-msgid ""
-"Here you can track the state of media being processed on this instance."
+msgid "Here you can track the state of media being processed on this instance."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
@@ -2033,7 +2081,8 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
 msgid ""
 "\n"
-"    Here you can look up users in order to take punitive actions on them.\n"
+"    Here you can look up users in order to take punitive actions on them."
+"\n"
 "  "
 msgstr ""
 
@@ -2130,7 +2179,8 @@ msgstr ""
 #, python-format
 msgid ""
 "Hi %(username)s,\n"
-"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at "
+"%(instance_name)s\n"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
@@ -2174,8 +2224,7 @@ msgid "Add a new collection"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
-msgid ""
-"You can track the state of media being processed for your gallery here."
+msgid "You can track the state of media being processed for your gallery here."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
@@ -2233,8 +2282,7 @@ msgid "Almost done! Your account still needs to be activated."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
-msgid ""
-"An email should arrive in a few moments with instructions on how to do so."
+msgid "An email should arrive in a few moments with instructions on how to do so."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
@@ -2247,15 +2295,15 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
 msgid ""
-"Someone has registered an account with this username, but it still has to be"
-" activated."
+"Someone has registered an account with this username, but it still has to"
+" be activated."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
 #, python-format
 msgid ""
-"If you are that person but you've lost your verification email, you can <a "
-"href=\"%(login_url)s\">log in</a> and resend it."
+"If you are that person but you've lost your verification email, you can "
+"<a href=\"%(login_url)s\">log in</a> and resend it."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
@@ -2326,38 +2374,38 @@ msgstr ""
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:39
 msgid "Oops!"
 msgstr ""
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:40
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:54
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:56
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:64
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:65
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:73
 msgid ""
-"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
-" the address is correct, maybe the page you're looking for has been moved or"
-" deleted."
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're "
+"sure the address is correct, maybe the page you're looking for has been "
+"moved or deleted."
 msgstr ""
 
 #: mediagoblin/tools/timesince.py:62
@@ -2390,7 +2438,8 @@ msgstr ""
 
 #: mediagoblin/user_pages/forms.py:25
 msgid ""
-"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
 "target=\"_blank\">Markdown</a> for formatting."
 msgstr ""
 
@@ -2413,7 +2462,9 @@ msgstr ""
 #: mediagoblin/user_pages/forms.py:49
 msgid ""
 "You can use\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
@@ -2469,8 +2520,8 @@ msgstr ""
 
 #: mediagoblin/user_pages/views.py:421
 msgid ""
-"You are about to delete an item from another user's collection. Proceed with"
-" caution."
+"You are about to delete an item from another user's collection. Proceed "
+"with caution."
 msgstr ""
 
 #: mediagoblin/user_pages/views.py:453
@@ -2480,10 +2531,10 @@ msgstr ""
 
 #: mediagoblin/user_pages/views.py:460
 msgid ""
-"The collection was not deleted because you didn't check that you were sure."
+"The collection was not deleted because you didn't check that you were "
+"sure."
 msgstr ""
 
 #: mediagoblin/user_pages/views.py:468
-msgid ""
-"You are about to delete another user's collection. Proceed with caution."
+msgid "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 0056d6f5..00000000
--- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/mediagoblin.po
index 1277b899..ebcd6e16 100644
--- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sq/mediagoblin.po
@@ -1,88 +1,197 @@
 # Translations template for PROJECT.
 # Copyright (C) 2014 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# 
 # Translators:
 # Besnik <besnik@programeshqip.org>, 2012-2013
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012
+# Besnik Bleta <besnik@programeshqip.org>, 2015.
+# Besnik_b <besnik@programeshqip.org>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
-"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n"
+"POT-Creation-Date: 2015-01-18 16:03-0600\n"
+"PO-Revision-Date: 2015-02-26 10:21+0000\n"
+"Last-Translator: Besnik_b <besnik@programeshqip.org>\n"
+"Language-Team: sq\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"Generated-By: Babel 1.3\n"
+"X-POOTLE-MTIME: 1424946063.0\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304
+#: mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Na ndjeni, regjistrimi në këtë instancë të shërbimit është i çaktivizuar."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
-msgstr "Na ndjeni, në këtë instancë raportimi është i çaktivizuar"
+msgstr "Na ndjeni, raportimi është i çaktivizuar në këtë instancë."
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362
+#: mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Na ndjeni, mirëfilltësimi është i çaktivizuar për këtë instancë."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Emër përdoruesi ose adresë email e pavlefshme."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "Kjo fushë nuk është për adresa email."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "Kjo fushë lyp një adresë email."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Na ndjeni, ka tashmë një përdorues me këtë emër."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122
+#: mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Na ndjeni, ka tashmë një përdorues me këtë adresë email."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145
+#: mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429
+#: mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "Kyçi i verifikimit ose id-ja e përdoruesit është e pasaktë."
 
-#: mediagoblin/auth/views.py:161
-msgid ""
-"Your email address has been verified. You may now login, edit your profile, "
-"and submit images!"
+#: mediagoblin/auth/views.py:164
+msgid "Your email address has been verified. You may now login, edit your profile, and submit images!"
 msgstr "Adresa juaj email u verifikua. Tani mund të bëni hyrjen, të përpunoni profilin tuaj, dhe të parashtroni figura!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Kyçi i verifikimit ose id-ja e përdoruesit është e pasaktë"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
-msgstr "Duhet të jeni i futur, që ta dimë kujt t'ia çojmë email-in!"
+msgstr "Duhet të jeni i futur, që ta dimë kujt t’ia çojmë email-in!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Thuajse e keni verifikuar adresën tuaj email!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Ridërgoni email-in tuaj të verifikimit."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr "{username} shtoi {object}"
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr "{username} shtoi {object} te {target}"
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr "{username} punoi {object}"
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr "{username} krijoi {object}"
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr "{username} fshiu {object}"
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr "{username} shprehu mospëlqim për {object}"
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr "{username} e caktoi {object} si të parapëlqyer"
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr "{username} ndoqi {object}"
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr "{username} pëlqeu {object}"
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr "{username} postoi {object}"
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr "{username} postoi {object} te {target}"
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr "{username} ndau me të tjerët {object}"
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr "{username} e hoqi {object} nga të parapëlqyerat"
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr "{username} ndali ndjekjen e {object}"
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr "{username} e shpëlqeu {object}"
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr "{username} e hoqi {object} nga të ndarat me të tjerët"
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr "{username} përditësoi {object}"
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr "{username} etiketoi {object}"
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr "një figurë"
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr "një koment"
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr "një koleksion"
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr "një video"
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr "audio"
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr "një person"
+
+#: mediagoblin/db/mixin.py:450
+#: mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr "një objekt"
+
+#: mediagoblin/edit/forms.py:29
+#: mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
-#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/media_types/blog/forms.py:33
+#: mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
@@ -91,46 +200,55 @@ msgstr "Ridërgoni email-in tuaj të verifikimit."
 msgid "Title"
 msgstr "Titull"
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+#: mediagoblin/edit/forms.py:32
+#: mediagoblin/submit/forms.py:40
 msgid "Description of this work"
 msgstr "Përshkrim i kësaj pune"
 
-#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:33
+#: mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94
+#: mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
-msgstr "Mund të përdorni\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                      Markdown</a> për formatim."
+msgstr ""
+"Mund të përdorni\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> për formatim."
 
-#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/edit/forms.py:37
+#: mediagoblin/media_types/blog/forms.py:27
 #: mediagoblin/submit/forms.py:45
 msgid "Tags"
 msgstr "Etiketa"
 
-#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+#: mediagoblin/edit/forms.py:39
+#: mediagoblin/submit/forms.py:47
 msgid "Separate tags by commas."
 msgstr "Ndajini etiketat me presje."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42
+#: mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Identifikues"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43
+#: mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
-msgstr "Identifikuesi s'mund të jetë i zbrazët"
+msgstr "Identifikuesi s’mund të jetë i zbrazët"
 
 #: mediagoblin/edit/forms.py:44
-msgid ""
-"The title part of this media's address. You usually don't need to change "
-"this."
+msgid "The title part of this media's address. You usually don't need to change this."
 msgstr "Titulli i adresës së kësaj medie. Zakonisht nuk keni nevojë ta ndryshoni këtë."
 
-#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/edit/forms.py:48
+#: mediagoblin/media_types/blog/forms.py:29
 #: mediagoblin/submit/forms.py:50
 #: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
-msgstr "Leje"
+msgstr "Licencë"
 
 #: mediagoblin/edit/forms.py:54
 msgid "Bio"
@@ -138,131 +256,148 @@ msgstr "Jetëshkrim"
 
 #: mediagoblin/edit/forms.py:60
 msgid "Website"
-msgstr "Site Web"
+msgstr "Sajt"
 
 #: mediagoblin/edit/forms.py:62
 msgid "This address contains errors"
 msgstr "Kjo adresë përmban gabime"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr "Vendlindja"
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Dërgomë email kur të tjerët komentojnë te media ime"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "Aktivizoni njoftime të brendshme për veprimtari."
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Parapëlqime licence"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "Kjo do të jetë licenca juaj parazgjedhje për forma ngarkimesh."
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
-msgstr "Titulli s'mund të jetë i zbrazët"
+msgstr "Titulli s’mund të jetë i zbrazët"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93
+#: mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Përshkrim i këtij koleksioni"
 
-#: mediagoblin/edit/forms.py:99
-msgid ""
-"The title part of this collection's address. You usually don't need to "
-"change this."
+#: mediagoblin/edit/forms.py:100
+msgid "The title part of this collection's address. You usually don't need to change this."
 msgstr "Pjesa titull e adresës së këtij koleksioni. Zakonisht nuk keni pse e ndryshoni këtë."
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107
+#: mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Fjalëkalimi i vjetër"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109
+#: mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Jepni fjalëkalimin tuaj të vjetër që të provohet se këtë llogari e zotëroni ju."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112
+#: mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Fjalëkalimi i ri"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Adresë email e re"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124
+#: mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Fjalëkalim"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "Jepni fjalëkalimin tuaj që të provohet se jeni i zoti i kësaj llogarie."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
-msgstr ""
+msgstr "Identifikues"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
-msgstr ""
+msgstr "Vlerë"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Ka tashmë një zë me atë identifikues për këtë përdorues."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Po përpunoni media të një tjetër përdoruesi. Hapni sytë."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "Shtuat bashkangjitjen %s!"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Mund të përpunoni vetëm profilin tuaj."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Po përpunoni profilin e një përdoruesi. Hapni sytë."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Ndryshimet e profilit u ruajtën"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Rregullimet e llogarisë u ruajtën"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr "Aplikacion i panjohur, nuk është në gjendje ta çautorizojë"
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr "Aplikacioni u çautorizua"
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "Lypset të ripohoni fshirjen e llogarisë suaj."
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363
+#: mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "Keni tashmë një koleksion të quajtur \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "Ka tashmë një koleksion me atë identifikues për këtë përdorues."
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Po përpunoni koleksionin e një tjetër përdoruesi. Hapni sytë."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Adresa juaj email u verifikua."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458
+#: mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Fjalëkalim i gabuar"
 
@@ -293,74 +428,82 @@ msgstr "Po anashkalohet \"%s\"; e rregulluar tashmë.\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "U gjet lidhje e vjetër për \"%s\"; po hiqet.\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
 "documentation page on command line uploading\n"
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
+"Për më tepër të dhëna se si të xhirohet si duhet ky programth\n"
+"(dhe se si të formatohet kartela cvs e tejtëdhënave), lexoni faqen\n"
+"e dokumentimit të MediaGoblin-it mbi ngarkime që nga rresht\n"
+"urdhrash <http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
-msgstr ""
+msgstr "Emri i përdoruesit të cilit i përkasin këto zëra media"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
-msgstr ""
+msgstr "Shteg për te kartela csv që përmban informacion tejtëdhënash."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
-msgstr ""
+msgstr "Mos e përpuno me padurim, kaloja celery-t"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
-msgstr ""
+msgstr "Na ndjeni, nuk ka përdorues me emër përdoruesi '{username}'"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
-msgstr ""
+msgstr "Nuk u gjet kartelë te {path}, përdorni parametrin -h për ndihmë"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
+"Gabim me vlerën '{error_path}' të medias '{media_id}' : {error_msg}\n"
+"Nuk u ngarkuan tejtëdhëna."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
+"DËSHTIM: Nuk hyhet dot te kartela vendore {filename}.\n"
+"{filename} nuk do të ngarkohet."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
+"U parashtrua me sukses {filename}!\n"
+"Mos harroni të shihni te Paneli i Përpunimit të Media-s i sajtit tuaj, që të siguroheni\n"
+"se u ngarkua me sukses."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
-msgstr ""
+msgstr "DËSHTIM: Kjo kartelë është më e madhe se kufijtë për ngarkime te ky sajt."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
-msgstr ""
+msgstr "DËSHTIM: Kjo kartelë do ta kalojë përdoruesin tej kufijve të përditësimit për të."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
-msgstr ""
+msgstr "DËSHTIM: Ky përdorues i ka tejkaluar tashmë kufijtë për ngarkime."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
-msgstr ""
+msgstr "U parashtruan me sukses {files_uploaded} nga {files_attempted} gjithsej"
 
 #: mediagoblin/meddleware/csrf.py:134
-msgid ""
-"CSRF cookie not present. This is most likely the result of a cookie blocker "
-"or somesuch.<br/>Make sure to permit the settings of cookies for this "
-"domain."
+msgid "CSRF cookie not present. This is most likely the result of a cookie blocker or somesuch.<br/>Make sure to permit the settings of cookies for this domain."
 msgstr "Pa cookie CSRF të pranishme. Ka shumë të ngjarë që të jetë punë e një bllokuesi cookie-sh ose të tillë.<br/>Sigurohuni që të lejoni depozitim cookie-sh për këtë përkatësi."
 
 #: mediagoblin/media_types/__init__.py:79
@@ -374,52 +517,54 @@ msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :("
 msgid "Description"
 msgstr "Përshkrim"
 
-#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+#: mediagoblin/media_types/blog/forms.py:40
+#: mediagoblin/user_pages/forms.py:31
 msgid "I am sure I want to delete this"
 msgstr "Jam i sigurt që dua të fshihet kjo"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158
+#: mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Yhaaaaaa! U parashtrua!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
-msgstr ""
+msgstr "Urraaaa! Postimi i përpunuar u parashtrua"
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
-msgstr ""
+msgstr "E fshitë Blogun."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Media nuk u fshi ngaqë nuk i vutë shenjë pohimit se jeni i sigurt."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
-msgstr ""
+msgstr "Ju ndan një hap nga fshirja e blogut të një përdoruesi tjetër. Bëni kujdes."
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
-msgstr ""
+msgstr "Blogu nuk fshi, ngaqë nuk keni të drejta."
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
 msgid "Add Blog Post"
-msgstr ""
+msgstr "Shtoni Postim Blogu"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
 msgid "Edit Blog"
-msgstr ""
+msgstr "Përpunoni Blogun"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
 msgid "Delete Blog"
-msgstr ""
+msgstr "Fshijeni Blogun"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Përpunoni"
 
@@ -429,17 +574,17 @@ msgstr "Përpunoni"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Fshije"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
 msgid "<em> Go to list view </em>"
-msgstr ""
+msgstr "<em> Shko te pamja si listë </em>"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
 msgid " No blog post yet. "
-msgstr ""
+msgstr " Ende pa postime blogu. "
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -468,7 +613,7 @@ msgstr "Fshije përgjithmonë"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
 msgid "Create/Edit a Blog"
-msgstr ""
+msgstr "Krijoni/Përpunoni një Blog"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
 #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
@@ -481,28 +626,28 @@ msgstr "Shtoni"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
 msgid "Create/Edit a blog post."
-msgstr ""
+msgstr "Krijoni/Përpunoni një postim blogu."
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
 msgid "Create/Edit a Blog Post."
-msgstr ""
+msgstr "Krijoni/Përpunoni një Postim Blogu."
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
 #, python-format
 msgid "%(blog_owner_name)s's Blog"
-msgstr ""
+msgstr "Blog nga %(blog_owner_name)s"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
 msgid "View"
-msgstr ""
+msgstr "Shihni"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
 msgid "Create a Blog"
-msgstr ""
+msgstr "Krijoni një Blog"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
 msgid " Blog Dashboard "
-msgstr ""
+msgstr " Pult Blogu "
 
 #: mediagoblin/media_types/pdf/processing.py:142
 msgid "unoconv failing to run, check log file"
@@ -528,7 +673,8 @@ msgstr "Dërgojini përdoruesit një mesazh"
 msgid "Delete the content"
 msgstr "Fshije lëndën"
 
-#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+#: mediagoblin/moderation/forms.py:53
+#: mediagoblin/moderation/forms.py:118
 msgid "User will be banned until:"
 msgstr "Përdoruesi do të dëbohet deri më:"
 
@@ -546,60 +692,69 @@ msgstr "Cilat privilegje do të hiqni?"
 
 #: mediagoblin/moderation/forms.py:122
 msgid "Why user was banned:"
-msgstr ""
+msgstr "Pse u dëbua përdoruesi:"
 
 #: mediagoblin/moderation/forms.py:125
 msgid "Message to user:"
-msgstr ""
+msgstr "Mesazh përdoruesit:"
 
 #: mediagoblin/moderation/forms.py:128
 msgid "Resolution content:"
-msgstr ""
+msgstr "Përmbajtja e vendimit:"
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
-msgstr ""
+msgstr "Përmbajtja e vendimit:"
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
+"\n"
+"{mod} dëboi përdoruesin {user} {expiration_date}."
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
-msgstr ""
+msgstr "deri mëuntil {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "pafundësisht"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
+"\n"
+"{mod} dërgoi një email sinjalizimi për {user}."
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
+"\n"
+"{mod} fshiu komentin."
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
+"\n"
+"{mod} fshiu zërin media."
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "Sinjalizim prej"
 
-#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+#: mediagoblin/notifications/tools.py:54
+#: mediagoblin/user_pages/lib.py:60
 msgid "commented on your post"
 msgstr "komentoi te postimi juaj"
 
@@ -613,56 +768,60 @@ msgstr "U pajtua te komentet në %s!"
 msgid "You will not receive notifications for comments on %s."
 msgstr "Nuk do të merrni njoftime për komente te %s."
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "Duhet dhënë një oauth_token."
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244
+#: mediagoblin/oauth/views.py:295
 msgid "No request token found."
-msgstr "S'u gjet token kërkese."
+msgstr "S’u gjet token kërkese."
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78
+#: mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "Na ndjeni, madhësia e kartelës është shumë e madhe."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81
+#: mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
-msgstr "Na ndjeni, ngarkimi i kësaj kartele do t'ju kalonte tej kufirit tuaj për ngarkime."
+msgstr "Na ndjeni, ngarkimi i kësaj kartele do t’ju kalonte tej kufirit tuaj për ngarkime."
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85
+#: mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "Na ndjeni, keni arritur kufirin tuaj për ngarkimet."
 
 #: mediagoblin/plugins/archivalook/forms.py:21
 msgid "Enter the URL for the media to be featured"
-msgstr ""
+msgstr "Jepni URL-në për median që do të paraqitet"
 
 #: mediagoblin/plugins/archivalook/tools.py:132
 msgid "Primary"
-msgstr ""
+msgstr "Parësore"
 
 #: mediagoblin/plugins/archivalook/tools.py:133
 msgid "Secondary"
-msgstr ""
+msgstr "Dytësore"
 
 #: mediagoblin/plugins/archivalook/tools.py:134
 msgid "Tertiary"
-msgstr ""
+msgstr "Terciare"
 
 #: mediagoblin/plugins/archivalook/tools.py:135
 msgid "-----------{display_type}-Features---------------------------\n"
-msgstr ""
+msgstr "-----------{display_type}-Të zgjedhura---------------------------\n"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
 msgid "How does this work?"
-msgstr ""
+msgstr "Si funksionon kjo?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
 msgid "How to feature media?"
-msgstr ""
+msgstr "Si të caktohet një media si e zgjedhur?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
 msgid ""
@@ -676,10 +835,18 @@ msgid ""
 "      displayed on the front page.\n"
 "    "
 msgstr ""
+"\n"
+"      Shkoni te faqja e zërit media që doni të jetë e zgjedhur. Kopjoni URL-në e tij\n"
+"      dhe mandej hidheni te një rresht i ri në kutinë e teksteve më sipër. Duhet të ketë\n"
+"      vetëm një url për rresht. Url-ja që hidhni te kutia e teksteve duhet të jetë nën\n"
+"      vendin ku përshkruhet se sa e dukshme do të jetë një veçori (Parësore, Dytësore, ose\n"
+"      Terciare). Pasi t’i keni të gjithë zërat që doni të jenë të zgjedhur brenda kutisë\n"
+"      së teksteve, klikoni mbi butonin Parashtro Kërkesë, dhe media juaj duhet të shfaqet\n"
+"      te ballina.\n"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
 msgid "Is there another way to manage featured media?"
-msgstr ""
+msgstr "Ka rrugë tjetër për të administruar media të zgjedhur?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
 msgid ""
@@ -702,10 +869,25 @@ msgid ""
 "        less prominent.\n"
 "    "
 msgstr ""
+"\n"
+"        Po. Nëse do të donit, mund të shkoni te faqja media e zërit që dëshironi\n"
+"        ta keni të zgjedhur ose jo dhe shihni te shtylla në krah të zërit media.\n"
+"        Nëse zëri media nuk është ende i zgjedhur, do të duhej të shihni një buton\n"
+"        ku lexohet \"Caktojeni të Zgjedhur\". Shtypeni atë buton dhe media do kalohet\n"
+"        në e zgjedhur, si E zgjedhur Parësore, në krye të faqes. Krejt zërat media\n"
+"        të zgjedhur do të mbesin të zgjedhur, por do të shtyhen më poshtë në faqe.<br /><br />\n"
+"\n"
+"        Nëse shkoni te faqja hyrëse e medias për një zë media që tani e keni\n"
+"        të zgjedhur, do të shihni mundësitë \"Hiqeni Si të Zgjedhur\", \"Promovojeni\"\n"
+"        dhe \"Shpromovojeni\" atje ku më parë qe butoni \"Caktojeni të Zgjedhur\".\n"
+"        Klikoni mbi Hiqeni Si të Zgjedhur dhe ai zë media nuk do të shfaqet më te\n"
+"        ballina, por mund ta caktoni sërish të zgjedhur, kur të doni. Promovojeni\n"
+"        e kalon median e zgjedhur më sipër në faqe dhe e bën më të dukshme, ndërsa\n"
+"        Shpromovojeni e ul më poshtë dhe e bën më pak të dukshëm.\n"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
 msgid "What is a Primary Feature? What is a Secondary Feature?"
-msgstr ""
+msgstr "Ç’është e Zgjedhura Parësore? Po e Zgjedhura Dytësore?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
 msgid ""
@@ -719,12 +901,23 @@ msgid ""
 "      Features, and Secondary Features can display longer descriptions than\n"
 "      Tertiary Features."
 msgstr ""
+"\n"
+"      Këto kategori thjesht përshkruajnë se sa e dukshme do të jetë në ballinën\n"
+"      tuaj një e zgjedhur. Të Zgjedhurat Parësore vendosen në krye të ballinës dhe\n"
+"      shumë më gjerë. Më pas vijnë të Zgjedhurat Dytësore, që janë pak më të vogla.\n"
+"      Të Zgjedhurat Terciare krijojnë një rrjetë në fund të faqes.<br /><br />\n"
+"\n"
+"      Të Zgjedhurat Parësore, veç kësaj, mund të shfaqin përshkrime më të gjata se\n"
+"      sa ato Dytësore, dhe Dytësoret mund të shfaqin përshkrime më të gjata se sa\n"
+"      ato Terciaret."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
 msgid ""
 "How to decide what information is displayed when a media entry is\n"
 "    featured?"
 msgstr ""
+"Si të caktoni se çfarë të dhënash shfaqen kur një zë media kalohet si\n"
+"    i zgjedhur?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
 msgid ""
@@ -737,10 +930,17 @@ msgid ""
 "      and Tertiary Features display the first 128 characters of their description.\n"
 "    "
 msgstr ""
+"\n"
+"      Kur një zë media kalohet si i zgjedhur, titulli i zërit, miniatura e tij dhe\n"
+"      një pjesë e përshkrimit do të shfaqen bë ballinën e sajtit tuaj. Numri i shenjave\n"
+"      të shfaqura varet nga shkalla e dukjes së zgjedhur për të. Për të Zgjedhurat\n"
+"      Parësore shfaqen 512 shenjat e para të përshkrimeve të tyre, për Dytësoret\n"
+"      shfaqen 256 shenjat e para të përshkrimeve përkatëse, dhe për ato Terciare\n"
+"      shfaqen 128 shenjat e para të përshkrimeve.\n"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
 msgid "How to unfeature a piece of media?"
-msgstr ""
+msgstr "Si të hiqet nga e zgjedhur një media?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
 msgid ""
@@ -749,10 +949,14 @@ msgid ""
 "      pressing the Submit Query button.\n"
 "    "
 msgstr ""
+"\n"
+"      Hiqeni një media nga e zgjedhur duke hequr rreshtin e saj prej fushës së\n"
+"      teksteve më sipër dhe mandej duke shtypur butonin Parashtroje Kërkesën.\n"
+"    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
 msgid "CAUTION:"
-msgstr ""
+msgstr "KUJDES:"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
 msgid ""
@@ -762,46 +966,59 @@ msgid ""
 "      featured. Make sure that all your intended Media Entries are featured.\n"
 "    "
 msgstr ""
+"\n"
+"      Kur kopjoni dhe ngjitni url-ra te kutia e teksteve më sipër, kini parasysh se, po\n"
+"      bëni një gabim shkrimi, pasi të shtypni butonin Parashtro Kërkesën, zëri juaj media\n"
+"      NUK do të kalohet i zgjedhur. Sigurohuni që janë të zgjedhura krejt Zërat Media që doni.\n"
+"    "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
 msgid ""
 "\n"
 "Feature Media "
 msgstr ""
+"\n"
+"Caktoni Media Si të Zgjedhur "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
 msgid "Feature"
-msgstr ""
+msgstr "Caktojeni të Zgjedhur"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
 msgid ""
 "\n"
 "Unfeature Media "
 msgstr ""
+"\n"
+"Hiqni Media Si të Zgjedhur "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
 msgid "Unfeature"
-msgstr ""
+msgstr "Hiqeni Si të Zgjedhur"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
 msgid ""
 "\n"
 "Promote Feature "
 msgstr ""
+"\n"
+"Promovoni të Zgjedhur "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
 msgid "Promote"
-msgstr ""
+msgstr "Promovojeni"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
 msgid ""
 "\n"
 "Demote Feature "
 msgstr ""
+"\n"
+"Shpromovoni të Zgjedhur "
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
 msgid "Demote"
-msgstr ""
+msgstr "Shpromovojeni"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
 #: mediagoblin/templates/mediagoblin/root.html:32
@@ -810,7 +1027,7 @@ msgstr "Mediat më të reja"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
 msgid "Nothing is currently featured."
-msgstr ""
+msgstr "Hëpërhë nuk ka asgjë të zgjedhur."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
 msgid ""
@@ -818,6 +1035,9 @@ msgid ""
 "        piece of media, go to that media entry's homepage and click the button\n"
 "        that says <a class=\"button_action\">Feature</a>."
 msgstr ""
+"Nëse doni ta kaloni një media si të zgjedhur,\n"
+"        shkoni te faqja hyrëse e atij zëri dhe klikoni mbi\n"
+"        butonin <a class=\"button_action\">Caktojeni Si të Zgjedhur</a>."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
 #, python-format
@@ -828,14 +1048,20 @@ msgid ""
 "        plugin enabled. A more advanced tool to manage features can be found\n"
 "        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
 msgstr ""
+"Këtë faqe po e shihni ngaqë jeni përdorues me të drejta caktimi mediash si\n"
+"        të zgjedhura; një përdorues i zakonshëm do të shihte një faqe të zbrazët,\n"
+"        ndaj sigurohuni që kalimi si e zgjedhur të bëhet sa kohë që keni\n"
+"        të aktivizuar shtojcën 'archivalook'. Një mjet më i përparuar për\n"
+"        administrim të zgjedhurash mund të gjendet te <a href=\"%(featured_media_url)s\">paneli i administrimit\n"
+"        të të zgjedhurave.</a>"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
 msgid "View most recent media"
-msgstr ""
+msgstr "Shihni mediat më të reja"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
 msgid "Feature management panel"
-msgstr ""
+msgstr "Panel administrimi të zgjedhurash"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
 msgid ""
@@ -843,6 +1069,9 @@ msgid ""
 "\tyour web browser does not support HTML5\n"
 "\taudio."
 msgstr ""
+"Na ndjeni, kjo audio nuk do të funksionojë,\n"
+"\tngaqë shfletuesi juaj nuk i mbulon videot\n"
+"\tHTML5."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
 msgid ""
@@ -850,6 +1079,9 @@ msgid ""
 "\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
 "\t  http://getfirefox.com</a>!"
 msgstr ""
+"Një shfletues modern që mund ta luajë\n"
+"\taudion mund ta merrni te <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
@@ -858,6 +1090,9 @@ msgid ""
 "          your web browser does not support HTML5 \n"
 "          video."
 msgstr ""
+"Na ndjeni, kjo video nuk do të funksionojë,\n"
+"          ngaqë shfletuesi juaj nuk i mbulon videot\n"
+"         HTML5."
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
@@ -866,16 +1101,21 @@ msgid ""
 "          can play this video at <a href=\"http://getfirefox.com\">\n"
 "          http://getfirefox.com</a>!"
 msgstr ""
+"Një shfletues modern që mund ta luajë \n"
+"          këtë video mund ta merrni te <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
 
 #: mediagoblin/plugins/basic_auth/forms.py:24
-#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/ldap/forms.py:35
+#: mediagoblin/plugins/openid/forms.py:27
 #: mediagoblin/plugins/persona/forms.py:24
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
 msgid "Username"
 msgstr "Emër përdoruesi"
 
 #: mediagoblin/plugins/basic_auth/forms.py:32
-#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/ldap/forms.py:28
+#: mediagoblin/plugins/openid/forms.py:31
 #: mediagoblin/plugins/persona/forms.py:28
 #: mediagoblin/plugins/persona/forms.py:39
 msgid "Email address"
@@ -894,24 +1134,19 @@ msgid "Username or email"
 msgstr "Emër përdoruesi ose email"
 
 #: mediagoblin/plugins/basic_auth/views.py:54
-msgid ""
-"If that email address (case sensitive!) is registered an email has been sent"
-" with instructions on how to change your password."
-msgstr "Nëse ajo adresë email (siç është shkruajtur!) është e regjistruar, është dërguar një email me udhëzime se si të ndryshoni fjalëkalimin tuaj."
+msgid "If that email address (case sensitive!) is registered an email has been sent with instructions on how to change your password."
+msgstr "Nëse ajo adresë email (siç është shkruar!) është e regjistruar, është dërguar një email me udhëzime se si të ndryshoni fjalëkalimin tuaj."
 
 #: mediagoblin/plugins/basic_auth/views.py:65
 msgid "Couldn't find someone with that username."
-msgstr "S'u gjet dot dikush me atë emër përdoruesi."
+msgstr "S’u gjet dot dikush me atë emër përdoruesi."
 
 #: mediagoblin/plugins/basic_auth/views.py:68
-msgid ""
-"An email has been sent with instructions on how to change your password."
+msgid "An email has been sent with instructions on how to change your password."
 msgstr "Është dërguar një email me udhëzime se si të ndryshoni fjalëkalimin tuaj."
 
 #: mediagoblin/plugins/basic_auth/views.py:75
-msgid ""
-"Could not send password recovery email as your username is inactive or your "
-"account's email address has not been verified."
+msgid "Could not send password recovery email as your username is inactive or your account's email address has not been verified."
 msgstr "Email-i i ricaktimit të fjalëkalimit nuk u dërgua dot, ngaqë emri juaj i përdoruesit nuk është aktivizuar ose adresa email e llogarisë suaj nuk është verifikuar."
 
 #: mediagoblin/plugins/basic_auth/views.py:123
@@ -923,9 +1158,7 @@ msgid "You can now log in using your new password."
 msgstr "Tani mun të hyni duke përdorur fjalëkalimin tuaj të ri."
 
 #: mediagoblin/plugins/basic_auth/views.py:163
-msgid ""
-"You are no longer an active user. Please contact the system admin to "
-"reactivate your account."
+msgid "You are no longer an active user. Please contact the system admin to reactivate your account."
 msgstr "Nuk jeni më një përdorues aktiv. Ju lutemi, lidhuni me përgjegjësin e sistemit që të aktivizoni llogarinë tuaj."
 
 #: mediagoblin/plugins/basic_auth/views.py:215
@@ -977,11 +1210,7 @@ msgstr "Dërgo udhëzime"
 msgid "Forgot your password?"
 msgstr "Harruat fjalëkalimin tuaj?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Vend"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Shiheni te <a href=\"%(osm_url)s\">OpenStreetMap</a>"
@@ -992,11 +1221,11 @@ msgstr "Për të krijuar një llogari, hyni!"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
 msgid "Metadata"
-msgstr ""
+msgstr "Tejtëdhëna"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
 msgid "Edit Metadata"
-msgstr ""
+msgstr "Përpunoni Tejtëdhëna"
 
 #: mediagoblin/plugins/oauth/forms.py:29
 msgid "Allow"
@@ -1018,7 +1247,11 @@ msgstr "Emri i klientit OAuth"
 msgid ""
 "This will be visible to users allowing your\n"
 "                application to authenticate as them."
-msgstr "Kjo do të jetë e dukshme për përdoruesit,\n                duke i lejuar kështu zbatimit tuaj\n                të kryejë mirëfilltësim si të qe njëri prej tyre."
+msgstr ""
+"Kjo do të jetë e dukshme për përdoruesit,\n"
+"                duke i lejuar kështu aplikacionit\n"
+"                tuaj të kryejë mirëfilltësim si të qe\n"
+"                njëri prej tyre."
 
 #: mediagoblin/plugins/oauth/forms.py:40
 msgid "Type"
@@ -1032,7 +1265,13 @@ msgid ""
 "                <strong>Public</strong> - The client can't make confidential\n"
 "                requests to the GNU MediaGoblin instance (e.g. client-side\n"
 "                JavaScript client)."
-msgstr "<strong>Konfidenciale</strong> - Kklienti mund\n                të bëjë kërkesa te instanca GNU MediaGoblin që nuk mund\n                të përgjohen nga agjenti i përdoruesit (p.sh. klient te shërbyesi).<br />\n                <strong>Publike</strong> - Klienti nuk mund të bëjë kërkesa\n                konfidenciale te instanca GNU MediaGoblin (p.sh. klient\n                JavaScript i vetë klientit)."
+msgstr ""
+"<strong>Konfidenciale</strong> - Kklienti mund\n"
+"                të bëjë kërkesa te instanca GNU MediaGoblin që nuk mund\n"
+"                të përgjohen nga agjenti i përdoruesit (p.sh. klient te shërbyesi).<br />\n"
+"                <strong>Publike</strong> - Klienti nuk mund të bëjë kërkesa\n"
+"                konfidenciale te instanca GNU MediaGoblin (p.sh. klient\n"
+"                JavaScript i vetë klientit)."
 
 #: mediagoblin/plugins/oauth/forms.py:52
 msgid "Redirect URI"
@@ -1042,13 +1281,15 @@ msgstr "URI Ridrejtimi"
 msgid ""
 "The redirect URI for the applications, this field\n"
 "            is <strong>required</strong> for public clients."
-msgstr "URI ridrejtimi për zbatimin, kjo fushë\n            është <strong>e domosdoshme</strong> për klientë publikë."
+msgstr ""
+"URI ridrejtimi për aplikacionin, kjo fushë\n"
+"            është <strong>e domosdoshme</strong> për klientë publikë."
 
 #: mediagoblin/plugins/oauth/forms.py:66
 msgid "This field is required for public clients"
 msgstr "Kjo fushë është e domosdoshme për klientë publikë"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "Klienti {0} u regjistrua!"
 
@@ -1061,8 +1302,8 @@ msgid "Your OAuth clients"
 msgstr "Klientët tuaj OAuth"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "Na ndjeni, ka tashmë një llogari të regjistruar për atë OpenID."
 
@@ -1070,39 +1311,39 @@ msgstr "Na ndjeni, ka tashmë një llogari të regjistruar për atë OpenID."
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "Na ndjeni, nuk u gjet dot shërbyesi i OpenID-ve"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "Nuk u gjet shërbim OpenID për %s"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "Verifikimi i %s dështoi: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "Verifikimi u anulua"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "Url-ja e OpenID-së suaj u ruajt me sukses."
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
-msgstr "Nuk mundeni të fshini URL-në  e të vetmes OpenID tuajës, veç në paçi të caktuar një fjalëkalim"
+msgstr "Nuk mundeni të fshini URL-në e të vetmes OpenID tuajës, veç në paçi të caktuar një fjalëkalim"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "Kjo OpenID nuk është e regjistruar për këtë llogari."
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID u hoq me sukses."
 
@@ -1121,12 +1362,12 @@ msgstr "Fshini një OpenID"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
 msgid "OpenID's"
-msgstr ""
+msgstr "OpenID-je"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1158,26 +1399,23 @@ msgstr "Ose regjistrohuni me OpenID!"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "Na ndjeni, ka tashmë një llogari të regjistruar për këtë email Persona-je."
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "Adresa email e Persona-s u hoq me sukses."
 
-#: mediagoblin/plugins/persona/views.py:144
-msgid ""
-"You can't delete your only Persona email address unless you have a password "
-"set."
+#: mediagoblin/plugins/persona/views.py:146
+msgid "You can't delete your only Persona email address unless you have a password set."
 msgstr "Nuk mund të fshini adresën tuaj të vetme email Persona-je pa caktuar fjalëkalimin tuaj."
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "Ajo adresë email-i Persona-je nuk është e regjistruar për këtë llogari."
 
-#: mediagoblin/plugins/persona/views.py:176
-msgid ""
-"Sorry, an account is already registered with that Persona email address."
+#: mediagoblin/plugins/persona/views.py:178
+msgid "Sorry, an account is already registered with that Persona email address."
 msgstr "Na ndjeni, ka tashmë të regjistruar një llogari me atë adresë email Persona-je."
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "Adresa email e Persona-s suaj u ruajt me sukses."
 
@@ -1191,7 +1429,7 @@ msgstr "Shtoni një adresë email Persona"
 
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
 msgid "Persona's"
-msgstr ""
+msgstr "Persona-je"
 
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
 msgid "Or login with Persona!"
@@ -1201,15 +1439,15 @@ msgstr "Ose bëni hyrjen me Persona!"
 msgid "Or register with Persona!"
 msgstr "Ose regjistrohuni me Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Kartelë e gabuar e dhënë për llojin e medias."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "Kopjimi te një depozitim publik dështoi."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "Nuk u gjet një kartelë e pranueshme përpunimi"
 
@@ -1226,13 +1464,16 @@ msgid ""
 "You can use\n"
 "                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                        Markdown</a> for formatting."
-msgstr "Për formatim teksti mund të përdorni\n                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                        Markdown</a>."
+msgstr ""
+"Për formatim teksti mund të përdorni\n"
+"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a>."
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Duhet të jepni një kartelë."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "U shtua koleksioni \"%s\"!"
@@ -1255,26 +1496,26 @@ msgstr "Jeni dëbuar"
 msgid "until %(until_when)s"
 msgstr "deri më %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "Verifikoni email-in tuaj!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "dilni"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Llogaria e <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Ndryshoni rregullime llogarie"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1282,29 +1523,29 @@ msgstr "Ndryshoni rregullime llogarie"
 msgid "Media processing panel"
 msgstr "Paneli i përpunimit të medias"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Dilni"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Shtoni media"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Krijoni koleksion të ri"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
-msgstr ""
+msgstr "Të drejta Moderimi:"
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "Paneli i administrimit të përdoruesve"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "Paneli i administrimit të raporteve"
 
@@ -1323,11 +1564,11 @@ msgstr "Keni hyrë si"
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:33
 msgid "Do you want to authorize "
-msgstr "Doni të autorizoni"
+msgstr "Doni të autorizoni "
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:37
 msgid "an unknown application"
-msgstr "një zbatim të panjohur"
+msgstr "një aplikacion të panjohur"
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:39
 msgid " to access your account? "
@@ -1335,7 +1576,7 @@ msgstr " të hyjë dhe përdorë llogarinë tuaj? "
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:41
 msgid "Applications with access to your account can: "
-msgstr "Zbatimet me hyrje në llogarinë tuaj munden të:"
+msgstr "Aplikacionet me hyrje në llogarinë tuaj munden të: "
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:43
 msgid "Post new media as you"
@@ -1358,8 +1599,8 @@ msgid "Authorization Complete"
 msgstr "Autorizim i Plotësuar"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "Këtë kopjojeni dhe ngjiteni te klienti juaj:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr "Kopjojeni dhe ngjiteni këtë <strong>kod verifikuesi</strong> te klienti juaj:"
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1379,21 +1620,22 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr "Njatjeta %(username)s,\n\nqë të aktivizoni llogarinë tuaj te GNU MediaGoblin hapeni URL-në vijuese te\nshfletuesi juaj web:\n\n%(verification_url)s"
+msgstr ""
+"Njatjeta %(username)s,\n"
+"\n"
+"që të aktivizoni llogarinë tuaj te GNU MediaGoblin hapeni URL-në vijuese te\n"
+"shfletuesi juaj web:\n"
+"\n"
+"%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
 #, python-format
-msgid ""
-"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
-"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+msgid "Powered by <a href=\"http://mediagoblin.org/\" title='Version %(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
 msgstr "Bazuar në <a href=\"http://mediagoblin.org/\" title='Version %(version)s'>MediaGoblin</a>, një projekt <a href=\"http://gnu.org/\">GNU</a>."
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
 #, python-format
-msgid ""
-"Released under the <a "
-"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
-"href=\"%(source_link)s\">Source code</a> available."
+msgid "Released under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Source code</a> available."
 msgstr "Hedhur në qarkullim sipas <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL-së</a>. <a href=\"%(source_link)s\">Kodi burim</a> është i passhëm."
 
 #: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
@@ -1406,18 +1648,14 @@ msgstr "Eksploroni"
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
 msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr "Tungjatjeta juaj, mirë se vini te ky site MediaGoblin!"
+msgstr "Tungjatjeta juaj, mirë se vini te ky sajt MediaGoblin!"
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
-msgid ""
-"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
-"extraordinarily great piece of media hosting software."
-msgstr "Ky site përdor <a href=\"http://mediagoblin.org\">MediaGoblin</a>, një program jashtëzakonisht i shkëlqyer për strehim mediash."
+msgid "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an extraordinarily great piece of media hosting software."
+msgstr "Ky sajt përdor <a href=\"http://mediagoblin.org\">MediaGoblin</a>, një program jashtëzakonisht i shkëlqyer për strehim mediash."
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
-msgid ""
-"To add your own media, place comments, and more, you can log in with your "
-"MediaGoblin account."
+msgid "To add your own media, place comments, and more, you can log in with your MediaGoblin account."
 msgstr "Për të shtuar media tuajën, për të bërë komente, dhe të tjera, mund të hyni përmes llogarisë suaj MediaGoblin."
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
@@ -1430,12 +1668,17 @@ msgid ""
 "            >Create an account at this site</a>\n"
 "            or"
 msgstr ""
+"\n"
+"            >Krijoni një llogari në këtë sajt</a>\n"
+"            ose"
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
 msgid ""
 "\n"
 "            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
 msgstr ""
+"\n"
+"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Rregulloni një instancë MediaGoblin në shërbyesin tuaj</a>"
 
 #: mediagoblin/templates/mediagoblin/bits/logo.html:23
 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
@@ -1449,13 +1692,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Po përpunohen bashkangjitjet për %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Bashkangjitje"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "Shtoni bashkangjitje"
 
@@ -1473,6 +1716,49 @@ msgstr "Ruaji ndryshimet"
 msgid "Changing %(username)s's email"
 msgstr "Ndryshim i email-it për %(username)s"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr "Çautorizoni aplikacione"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr "Autorizoni Aplikacione"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+"Këto aplikacione munden të hyjnë te llogaria juaj GNU MediaGoblin. Çautorizimi\n"
+"    i aplikacionit do t’ia parandalojë atij hyrjen në llogarinë tuaj."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr "Nuk ka aplikacione të autorizuara."
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr "Lloj:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr "Autorizuar Më:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s më parë"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1498,7 +1784,7 @@ msgstr "Po ndryshohen rregullimet e llogarisë %(username)s"
 msgid "Delete my account"
 msgstr "Fshije llogarinë time"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Email"
 
@@ -1516,23 +1802,23 @@ msgstr "Po përpunohet profili i %(username)s"
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:67
 #, python-format
 msgid "Metadata for \"%(media_name)s\""
-msgstr ""
+msgstr "Tejtëdhëna për \"%(media_name)s\""
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:72
 msgid "MetaData"
-msgstr ""
+msgstr "Tejtëdhëna"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:80
 msgid "Add new Row"
-msgstr ""
+msgstr "Shtoni Rresht të ri"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:83
 msgid "Update Metadata"
-msgstr ""
+msgstr "Përditësoni Tejtëdhëna"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:87
 msgid "Clear empty Rows"
-msgstr ""
+msgstr "Hiqi Rreshtat e zbrazët"
 
 #: mediagoblin/templates/mediagoblin/edit/verification.txt:19
 #, python-format
@@ -1546,25 +1832,21 @@ msgid ""
 "\n"
 "If you are not %(username)s or didn't request an email change, you can ignore\n"
 "this email."
-msgstr "Njatjeta,\n\nDonim të verifikonim që jeni %(username)s. Nëse është kështu, atëherë, \nju lutemi, ndiqni lidhjen më poshtë që të verifikohet adresa juaj email e re.\n\n%(verification_url)s\n\nNëse nuk jeni %(username)s ose nuk kërkuat ndryshim email-i, mund\nta shpërfillni këtë email."
+msgstr ""
+"Njatjeta,\n"
+"\n"
+"Donim të verifikonim që jeni %(username)s. Nëse është kështu, atëherë, \n"
+"ju lutemi, ndiqni lidhjen më poshtë që të verifikohet adresa juaj email e re.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"Nëse nuk jeni %(username)s ose nuk kërkuat ndryshim email-i, mund\n"
+"ta shpërfillni këtë email."
 
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
 msgid "New comments"
 msgstr "Komente të reja"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s më parë"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "Shënoji të tëra si të lexuara"
@@ -1577,38 +1859,43 @@ msgstr "Shënoji të tëra si të lexuara"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Media e etiketuar me:: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Shkarkojeni"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Origjinal"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "Na ndjeni, zëri s'do të funksionojë, ngaqë \n\tshfletuesi juaj s'mbulon audio HTML5."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+"Na ndjeni, kjo audio s’do të funksionojë, ngaqë \n"
+"\t  shfletuesi juaj s’mbulon audio HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "Një shfletues web modern që mund të luajë \n\taudion mund ta merrni te <a href=\"http://getfirefox.com\">\n\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+"Një shfletues modern që mund të luajë \n"
+"\t  audion mund ta merrni te <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Kartela origjinale"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "Kartelë WebM (kodek Vorbis)"
 
@@ -1616,76 +1903,81 @@ msgstr "Kartelë WebM (kodek Vorbis)"
 msgid "Created"
 msgstr "U krijua"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "Figurë për %(media_title)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "Kartelë PDF"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "Perspektivë"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "Ball"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "Krye"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "Anë"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "Shkarkojeni modelin"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Format Kartele"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "Lartësi Objekti"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
-msgstr "Na ndjeni, kjo video nuk do të punojë ngaqë\n      shfletuesi juaj web nuk mbulon videot\n      HTML5."
+msgstr ""
+"Na ndjeni, kjo video nuk do të punojë ngaqë\n"
+"      shfletuesi juaj web nuk mbulon videot\n"
+"      HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
-msgstr "Mund të merrni një shfletues web modern që \n      është në gjendje ta shfaqë këtë video, te <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
+msgstr ""
+"Mund të merrni një shfletues web modern që \n"
+"      është në gjendje ta shfaqë këtë video, te <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "Kartelë WebM (VP8/Vorbis)"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
-msgid ""
-"Here you can track the state of media being processed on this instance."
+msgid "Here you can track the state of media being processed on this instance."
 msgstr "Këtu mund të ndiqni gjendjen e medias që po përpunohet në këtë instancë."
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
@@ -1704,20 +1996,20 @@ msgstr "ID"
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
 msgid "User"
-msgstr ""
+msgstr "Përdorues"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
 msgid "When submitted"
-msgstr ""
+msgstr "Parashtruar më"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
 msgid "Transcoding progress"
-msgstr ""
+msgstr "Ecuri ndërkodimi"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
 msgid "Unknown"
-msgstr ""
+msgstr "E panjohur"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
@@ -1731,11 +2023,11 @@ msgstr "Nuk arritën të kryheshin këto ngarkime:"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
 msgid "Reason for failure"
-msgstr ""
+msgstr "Arsye dështimi"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
 msgid "Failure metadata"
-msgstr ""
+msgstr "Tejtëdhëna dështimi"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
@@ -1748,7 +2040,7 @@ msgstr "10 ngarkimet e fundit të suksesshme"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
 msgid "Submitted"
-msgstr ""
+msgstr "U parashtrua"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
@@ -1764,7 +2056,7 @@ msgid "Return to Reports Panel"
 msgstr "Kthehuni te Paneli i Raportimeve"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "Raport"
 
@@ -1778,7 +2070,10 @@ msgid ""
 "\n"
 "        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
 "    "
-msgstr "\n        � Media e raportuar nga <a href=\"%(user_url)s\">%(user_name)s</a>\n    "
+msgstr ""
+"\n"
+"        � Media e raportuar nga <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:92
 #, python-format
@@ -1788,11 +2083,16 @@ msgid ""
 "            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
 "          HAS BEEN DELETED\n"
 "        "
-msgstr "\n          LËNDË NGA\n            <a href=\"%(user_url)s\"> %(user_name)s</a>\n          ËSHTË FSHIRË\n        "
+msgstr ""
+"\n"
+"          LËNDË E\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          ËSHTË FSHIRË\n"
+"        "
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:102
 msgid "Reason for report:"
-msgstr ""
+msgstr "Arsye raportimi:"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:133
 #: mediagoblin/templates/mediagoblin/moderation/user.html:136
@@ -1810,7 +2110,7 @@ msgstr "Gjendje"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:151
 msgid "RESOLVED"
-msgstr "ZGJIDHUR"
+msgstr "I ZGJIDHUR"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:159
 msgid "You cannot take action against an administrator"
@@ -1826,11 +2126,14 @@ msgid ""
 "\n"
 "    Here you can look up open reports that have been filed by users.\n"
 "  "
-msgstr "\n    Këtu mund të kërkoni nëpër raportet që janë depozituar nga përdoruesit.\n  "
+msgstr ""
+"\n"
+"    Këtu mund të kërkoni nëpër raportet që janë depozituar nga përdoruesit.\n"
+"  "
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
 msgid "Active Reports Filed"
-msgstr "Raportime Aktive të Depozituar"
+msgstr "Raportime Aktive të Depozituara"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
@@ -1857,7 +2160,10 @@ msgid ""
 "\n"
 "                Comment Report #%(report_id)s\n"
 "              "
-msgstr "\n                Raport Komenti #%(report_id)s\n              "
+msgstr ""
+"\n"
+"                Raportim Komenti #%(report_id)s\n"
+"              "
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
 #, python-format
@@ -1865,11 +2171,14 @@ msgid ""
 "\n"
 "                Media Report #%(report_id)s\n"
 "              "
-msgstr "\n                Raportim Media #%(report_id)s\n              "
+msgstr ""
+"\n"
+"                Raportim Media #%(report_id)s\n"
+"              "
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
 msgid "No open reports found."
-msgstr "S'u gjetën raportime të hapur."
+msgstr "S’u gjetën raportime të hapur."
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
 msgid "Closed Reports"
@@ -1877,7 +2186,7 @@ msgstr "Raportime të Mbyllur"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
 msgid "Resolved"
-msgstr "Zgjidhur"
+msgstr "I zgjidhur"
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
 msgid "Action Taken"
@@ -1889,24 +2198,27 @@ msgid ""
 "\n"
 "              Closed Report #%(report_id)s\n"
 "            "
-msgstr "\n              Raportim i Mbyllur #%(report_id)s\n            "
+msgstr ""
+"\n"
+"              Raportim i Mbyllur #%(report_id)s\n"
+"            "
 
 #: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
 msgid "No closed reports found."
-msgstr "S'u gjetën raportime të mbyllur."
+msgstr "S’u gjetën raportime të mbyllur."
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:23
 #, python-format
 msgid "User: %(username)s"
-msgstr ""
+msgstr "Përdoruesi: %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:42
 msgid "Return to Users Panel"
-msgstr ""
+msgstr "Kthehuni te Panel Përdoruesish"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:49
 msgid "Sorry, no such user found."
-msgstr ""
+msgstr "Na ndjeni, nuk u gjet përdorues i tillë."
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:53
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
@@ -1919,6 +2231,8 @@ msgid ""
 "Someone has registered an account with this username, but it still has\n"
 "        to be activated."
 msgstr ""
+"Dikush ka regjistruar një llogari me këtë emër përdoruesi, por ajo\n"
+"        lypset të aktivizohet."
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:66
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:34
@@ -1931,11 +2245,11 @@ msgstr "Profili i %(username)s"
 #: mediagoblin/templates/mediagoblin/moderation/user.html:68
 #, python-format
 msgid "BANNED until %(expiration_date)s"
-msgstr ""
+msgstr "DËBUAR deri më %(expiration_date)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:72
 msgid "Banned Indefinitely"
-msgstr ""
+msgstr "Dëbuar Pafundësisht"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:78
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:62
@@ -1946,7 +2260,7 @@ msgstr "Ky përdorues nuk e ka plotësuar (ende) profilin e vet."
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:57
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:74
 msgid "Edit profile"
-msgstr "Përpunoni profil"
+msgstr "Përpunoni profilin"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:96
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:81
@@ -1956,76 +2270,76 @@ msgstr "Shfletoni koleksionet"
 #: mediagoblin/templates/mediagoblin/moderation/user.html:105
 #, python-format
 msgid "Active Reports on %(username)s"
-msgstr ""
+msgstr "Raportime Aktive mbi %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:112
 msgid "Report ID"
-msgstr ""
+msgstr "ID Raportimi"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:113
 msgid "Reported Content"
-msgstr ""
+msgstr "Lëndë e Raportuar"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:114
 msgid "Description of Report"
-msgstr ""
+msgstr "Përshkrim Raportimi"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:122
 #, python-format
 msgid "Report #%(report_number)s"
-msgstr ""
+msgstr "Raporti #%(report_number)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:129
 msgid "Reported Comment"
-msgstr ""
+msgstr "Koment i Raportuar"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:131
 msgid "Reported Media Entry"
-msgstr ""
+msgstr "Zë Media i Raportuar"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:142
 #, python-format
 msgid "No active reports filed on %(username)s"
-msgstr ""
+msgstr "Pa raportime aktive të depozituara mbi %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:150
 #, python-format
 msgid "All reports on %(username)s"
-msgstr ""
+msgstr "Krejt raportimet mbi %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:155
 #, python-format
 msgid "All reports that %(username)s has filed"
-msgstr ""
+msgstr "Krejt raportimet që ka depozituar %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:164
 #, python-format
 msgid "%(username)s's Privileges"
-msgstr ""
+msgstr "Privilegje për %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:172
 msgid "Privilege"
-msgstr ""
+msgstr "Privilegj"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:173
 msgid "Granted"
-msgstr ""
+msgstr "U dha"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:180
 msgid "Yes"
-msgstr ""
+msgstr "Po"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:182
 msgid "No"
-msgstr ""
+msgstr "Jo"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:213
 msgid "Ban User"
-msgstr ""
+msgstr "Dëboni Përdorues"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:218
 msgid "UnBan User"
-msgstr ""
+msgstr "Zhdëbojeni Përdoruesin"
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
@@ -2037,7 +2351,10 @@ msgid ""
 "\n"
 "    Here you can look up users in order to take punitive actions on them.\n"
 "  "
-msgstr "\n    Këtu mund të kërkoni për përdorues, me qëllim marrjen e masave ndëshkuese për ta.\n  "
+msgstr ""
+"\n"
+"    Këtu mund të kërkoni për përdorues, me qëllim marrjen e masave ndëshkuese për ta.\n"
+"  "
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
 msgid "Active Users"
@@ -2053,7 +2370,7 @@ msgstr "# i Komenteve të Postuara"
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
 msgid "No users found."
-msgstr "S'u gjetën përdorues."
+msgstr "S’u gjetën përdorues."
 
 #: mediagoblin/templates/mediagoblin/submit/collection.html:26
 msgid "Add a collection"
@@ -2067,20 +2384,20 @@ msgstr "Shtoni media tuajën"
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
 #, python-format
 msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
-msgstr ""
+msgstr "� Postim blogu nga <a href=\"%(user_url)s\">%(username)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Shtoni një koment"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Shtoje këtë koment"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "U shtua"
 
@@ -2097,17 +2414,17 @@ msgstr "%(collection_title)s nga <a href=\"%(user_url)s\">%(username)s</a>"
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
 #, python-format
 msgid "Delete collection %(collection_title)s"
-msgstr ""
+msgstr "Fshije koleksionin %(collection_title)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
 #, python-format
 msgid "Really delete collection: %(title)s?"
-msgstr ""
+msgstr "Të fshihet vërtet koleksioni: %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
 #, python-format
 msgid "Remove %(media_title)s from %(collection_title)s"
-msgstr ""
+msgstr "Hiqe %(media_title)s nga %(collection_title)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
 #, python-format
@@ -2133,7 +2450,9 @@ msgstr "Koleksione të <a href=\"%(user_url)s\">%(username)s</a>"
 msgid ""
 "Hi %(username)s,\n"
 "%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
-msgstr "Tungjatjeta %(username)s,\n%(comment_author)s ka komentuar te postimi juaj (%(comment_url)s) në %(instance_name)s\n"
+msgstr ""
+"Tungjatjeta %(username)s,\n"
+"%(comment_author)s ka komentuar te postimi juaj (%(comment_url)s) në %(instance_name)s\n"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -2142,9 +2461,7 @@ msgstr "Media nga %(username)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
 #, python-format
-msgid ""
-"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
-"href=\"%(tag_url)s\">%(tag)s</a>"
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a href=\"%(tag_url)s\">%(tag)s</a>"
 msgstr "Media të <a href=\"%(user_url)s\">%(username)s</a> me etiketën <a href=\"%(tag_url)s\">%(tag)s</a>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
@@ -2152,12 +2469,12 @@ msgstr "Media të <a href=\"%(user_url)s\">%(username)s</a> me etiketën <a href
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Media nga <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� Po shfletoni media nga <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Paraparje Komenti"
 
@@ -2176,8 +2493,7 @@ msgid "Add a new collection"
 msgstr "Shtoni një koleksion të ri"
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
-msgid ""
-"You can track the state of media being processed for your gallery here."
+msgid "You can track the state of media being processed for your gallery here."
 msgstr "Gjendjen e medias që po përpunohet për galerinë tuaj mund ta ndiqni nga këtu."
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
@@ -2203,15 +2519,19 @@ msgid ""
 "            � Published by <a href=\"%(user_url)s\"\n"
 "                          class=\"comment_authorlink\">%(username)s</a>\n"
 "      "
-msgstr "\n            � Botuar nga <a href=\"%(user_url)s\"\n                          class=\"comment_authorlink\">%(username)s</a>\n      "
+msgstr ""
+"\n"
+"            � Botuar nga <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
 
 #: mediagoblin/templates/mediagoblin/user_pages/report.html:81
 msgid "File Report "
-msgstr "Raportim Kartele"
+msgstr "Raportim Kartele "
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:53
 msgid "Here's a spot to tell others about yourself."
-msgstr "Ja një vend t'i tregoni botës mbi veten."
+msgstr "Ja një vend t’i tregoni botës mbi veten."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:94
 #, python-format
@@ -2219,9 +2539,7 @@ msgid "View all of %(username)s's media"
 msgstr "Shihni krejt mediat nga %(username)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:107
-msgid ""
-"This is where your media will appear, but you don't seem to have added "
-"anything yet."
+msgid "This is where your media will appear, but you don't seem to have added anything yet."
 msgstr "Media juaj do të shfaqet këtu, por nuk duket të keni shtuar gjë ende."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:119
@@ -2235,8 +2553,7 @@ msgid "Almost done! Your account still needs to be activated."
 msgstr "Pothuajse mbaruam! Llogaria juaj ende lyp aktivizimin."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
-msgid ""
-"An email should arrive in a few moments with instructions on how to do so."
+msgid "An email should arrive in a few moments with instructions on how to do so."
 msgstr "Brenda pak çastesh duhet t'ju mbërrijë një email me udhëzime se si të krhyet kjo."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
@@ -2248,16 +2565,12 @@ msgid "Resend verification email"
 msgstr "Ridërgo email-in e verifikimit"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
-msgid ""
-"Someone has registered an account with this username, but it still has to be"
-" activated."
+msgid "Someone has registered an account with this username, but it still has to be activated."
 msgstr "Dikush ka regjistruar një llogari me këtë emër përdoruesi, por ajo duhet aktivizuar."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
 #, python-format
-msgid ""
-"If you are that person but you've lost your verification email, you can <a "
-"href=\"%(login_url)s\">log in</a> and resend it."
+msgid "If you are that person but you've lost your verification email, you can <a href=\"%(login_url)s\">log in</a> and resend it."
 msgstr "Nëse jeni ju ai person, por keni humbur email-in tuaj të verifikimit, mund të <a href=\"%(login_url)s\">hyni</a> dhe ta ridërgoni."
 
 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
@@ -2274,11 +2587,11 @@ msgstr "Shtoje te një koleksion"
 
 #: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
 msgid "Subscribe to comments"
-msgstr ""
+msgstr "Pajtohuni te komentet"
 
 #: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
 msgid "Silence comments"
-msgstr ""
+msgstr "Heshtoji komentet"
 
 #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
@@ -2316,6 +2629,10 @@ msgstr "më të reja"
 msgid "older"
 msgstr "më të vjetra"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Vend"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "Raportoni media"
@@ -2324,42 +2641,36 @@ msgstr "Raportoni media"
 msgid "Tagged with"
 msgstr "Etiketuar me"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "Nuk lexoi dot kartelën e figurës."
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Oooh!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "Ndodhi një gabim"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "Kërkesë e Gabuar"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "Kërkesa e dërguar te shërbyesi është e mangët, ju lutemi, rikontrollojeni"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "Veprim i palejuar"
 
-#: mediagoblin/tools/response.py:64
-msgid ""
-"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
-"function that you are not allowed to. Have you been trying to delete all "
-"user accounts again?"
+#: mediagoblin/tools/response.py:66
+msgid "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a function that you are not allowed to. Have you been trying to delete all user accounts again?"
 msgstr "Më ndjeni or trim, nuk ju lë dot ta bëni këtë!</p><p>Provuat të kryeni një funksion që nuk lejohet. Keni provuar prapë të fshini krejt llogaritë e përdoruesve?"
 
-#: mediagoblin/tools/response.py:72
-msgid ""
-"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
-" the address is correct, maybe the page you're looking for has been moved or"
-" deleted."
+#: mediagoblin/tools/response.py:74
+msgid "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure the address is correct, maybe the page you're looking for has been moved or deleted."
 msgstr "Nuk duket se ka ndonjë faqe në këtë adresë. Na ndjeni!</p><p>Nëse jeni i sigurt se kjo adresë është e saktë, ndoshta faqja që po kërkoni është lëvizur ose fshirë."
 
 #: mediagoblin/tools/timesince.py:62
@@ -2391,10 +2702,8 @@ msgid "Comment"
 msgstr "Koment"
 
 #: mediagoblin/user_pages/forms.py:25
-msgid ""
-"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
-"target=\"_blank\">Markdown</a> for formatting."
-msgstr "Mund të përdorni <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> për formatime."
+msgid "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> for formatting."
+msgstr "Për formatime mund të përdorni <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a>."
 
 #: mediagoblin/user_pages/forms.py:35
 msgid "I am sure I want to remove this item from the collection"
@@ -2417,75 +2726,75 @@ msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
 "                      Markdown</a> for formatting."
-msgstr "Mund të përdorni\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n                      Markdown</a> për formatime."
+msgstr ""
+"Mund të përdorni\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> për formatime."
 
-#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+#: mediagoblin/user_pages/forms.py:55
+#: mediagoblin/user_pages/forms.py:61
 msgid "Reason for Reporting"
 msgstr "Arsye për Raportim"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Na ndjeni, komentimi është i çaktivizuar."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Hmmm, komenti juaj qe i zbrazët."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Komenti juaj u postua!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "Ju lutemi, kontrolloni zërat tuaj dhe riprovoni."
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "Duhet të përzgjidhni ose shtoni një koleksion"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "\"%s\" gjendet tashmë te koleksioni \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" u shtua te koleksioni \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "E fshitë median."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Ju ndan një hap nga fshirja e medias të një tjetër përdoruesi. Hapni sytë."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "E fshitë objektin prej koleksionit."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "Objekti nuk u fshi ngaqë, nuk pohuat se jeni të sigurt për këtë."
 
-#: mediagoblin/user_pages/views.py:421
-msgid ""
-"You are about to delete an item from another user's collection. Proceed with"
-" caution."
+#: mediagoblin/user_pages/views.py:424
+msgid "You are about to delete an item from another user's collection. Proceed with caution."
 msgstr "Ju ndan një hap nga fshirja e një objekti prej koleksionit të një përdoruesi tjetër. Hapni sytë."
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "E fshitë koleksionin \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
-msgid ""
-"The collection was not deleted because you didn't check that you were sure."
+#: mediagoblin/user_pages/views.py:463
+msgid "The collection was not deleted because you didn't check that you were sure."
 msgstr "Koleksioni nuk u fshi ngaqë, nuk pohuat se jeni të sigurt për këtë."
 
-#: mediagoblin/user_pages/views.py:468
-msgid ""
-"You are about to delete another user's collection. Proceed with caution."
+#: mediagoblin/user_pages/views.py:471
+msgid "You are about to delete another user's collection. Proceed with caution."
 msgstr "Ju ndan një hap nga fshirja e koleksionit të një përdoruesi tjetër. Hapni sytë."
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 62cb9cb0..00000000
--- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/mediagoblin.po
index 523db5a0..24e32ec3 100644
--- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sr/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,67 +18,167 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr ""
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -94,7 +194,7 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -110,11 +210,11 @@ msgstr ""
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -142,125 +242,137 @@ msgstr ""
 msgid "This address contains errors"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr ""
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr ""
 
@@ -291,7 +403,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -299,58 +411,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -376,28 +488,28 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -417,7 +529,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
@@ -427,7 +539,7 @@ msgstr ""
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
@@ -554,46 +666,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -611,26 +723,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -975,11 +1087,7 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr ""
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
@@ -1046,7 +1154,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1059,8 +1167,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1068,39 +1176,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1124,7 +1232,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1156,26 +1264,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1199,15 +1307,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1226,11 +1334,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr ""
@@ -1253,26 +1361,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1280,29 +1388,29 @@ msgstr ""
 msgid "Media processing panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1356,7 +1464,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1447,13 +1555,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr ""
 
@@ -1471,6 +1579,47 @@ msgstr ""
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1496,7 +1645,7 @@ msgstr ""
 msgid "Delete my account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1550,19 +1699,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1575,38 +1711,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1614,70 +1750,70 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1762,7 +1898,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2068,17 +2204,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr ""
 
@@ -2150,12 +2286,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2314,6 +2450,10 @@ msgstr ""
 msgid "older"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2322,38 +2462,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr ""
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr ""
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2421,69 +2561,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 439b5fc3..00000000
--- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/mediagoblin.po
index 7a5b8336..764d475e 100644
--- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sv/mediagoblin.po
@@ -1,87 +1,193 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
 # ersi <erik-transifex@simmesgard.se>, 2014
 # ingenman <simon@ingenmansland.se>, 2011
 # joar <transifex@wandborg.se>, 2011, 2012
+# ersi <erik-gnu@simmesgard.se>, 2015.
+# Erik <erik-gnu@simmesgard.se>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
-"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-02-18 19:29+0000\n"
+"Last-Translator: Erik <erik-gnu@simmesgard.se>\n"
+"Language-Team: Swedish "
+"(http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"Generated-By: Babel 1.3\n"
+"X-POOTLE-MTIME: 1424287788.0\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Vi beklagar, registreringen är avstängd på den här instansen."
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "Felaktigt användarnamn eller e-postadress."
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
-msgstr ""
+msgstr "Det här fältet tar inte e-postadresser."
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
-msgstr ""
+msgstr "Det här fältet kräver en e-postadress."
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "En användare med det användarnamnet finns redan."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Det finns redan en användare med den e-postadressen."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
-msgstr ""
+msgstr "Verifieringsnyckel eller användar-ID är felaktigt."
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Din e-postadress är verifierad. Du kan nu logga in, redigera din profil och ladda upp filer!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
-msgstr "Verifieringsnyckeln eller användar-IDt är fel."
+msgstr "Verifieringsnyckeln eller användar-IDt är fel"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
-msgstr "Du måste vara inloggad för att vi ska kunna skicka meddelandet till dig."
+msgstr ""
+"Du måste vara inloggad för att vi ska kunna skicka meddelandet till dig!"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Du har redan verifierat din e-postadress!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Skickade ett nytt verifierings-email."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr "{username} la till {object}"
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr "{username} la till {object} till {target}"
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr "{username} författade {object}"
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr "{username} skapade {object}"
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr "{username} tog bort {object}"
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr "{username} ogillade {object}"
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr "{username} favoritmarkerade {object}"
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr "{username} gillade {object}"
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr "{username} delade {object}"
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr "{username} uppdaterade {object}"
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr "{username} taggade {objekt}"
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr "en bild"
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr "en kommentar"
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr "en samling"
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr "en person"
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr "ett objekt"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -97,12 +203,16 @@ msgid "Description of this work"
 msgstr "Beskrivning av verket"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
+"Du kan använda\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> för att formattera texten."
 
 #: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
 #: mediagoblin/submit/forms.py:45
@@ -113,11 +223,11 @@ msgstr "Taggar"
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "Sökvägsnamn"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "Sökvägsnamnet kan inte vara tomt"
 
@@ -143,127 +253,139 @@ msgstr "Hemsida"
 
 #: mediagoblin/edit/forms.py:62
 msgid "This address contains errors"
-msgstr ""
+msgstr "Den här addressen innehåller felaktigheter"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr "Hemstad"
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
-msgstr ""
+msgstr "Titeln kan inte lämnas tom"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Tidigare lösenord"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
-msgstr ""
+msgstr "Ange ditt gamla lösenord för att bevisa att du äger kontot."
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
-msgstr ""
+msgstr "Nytt lösenord"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
-msgstr ""
+msgstr "Ny e-postadress"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Lösenord"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
-msgstr ""
+msgstr "Ange ditt lösenord för att bevisa att du äger kontot."
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
-msgstr ""
+msgstr "Identifierare"
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
-msgstr ""
+msgstr "Värde"
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "Ett inlägg med det sökvägsnamnet existerar redan."
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Var försiktig, du redigerar någon annans inlägg."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Du kan bara ändra din egna profil."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Var försiktig, du redigerar en annan användares profil."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Profilförändringar sparade"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Kontoinställningar sparade"
 
-#: mediagoblin/edit/views.py:282
-msgid "You need to confirm the deletion of your account."
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr "Du måste bekräfta borttagningen av ditt konto."
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
-msgstr ""
+msgstr "Du har redan en samling som heter \"%s\"!"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
-msgstr ""
+msgstr "Du ändrar en annan användares samling. Fortsätt med försiktighet."
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "Din e-postadress har blivit verifierad."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Fel lösenord"
 
@@ -294,7 +416,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -302,58 +424,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
-msgstr ""
+msgstr "Beklagar, ingen användare vid namn '{username}' finns"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -367,60 +489,60 @@ msgstr ""
 #: mediagoblin/media_types/__init__.py:79
 #: mediagoblin/media_types/__init__.py:101
 msgid "Sorry, I don't support that file type :("
-msgstr ""
+msgstr "Förlåt, jag stödjer inte den filtypen :("
 
 #: mediagoblin/media_types/blog/forms.py:26
 #: mediagoblin/media_types/blog/forms.py:35
 #: mediagoblin/plugins/oauth/forms.py:36
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
 msgid "I am sure I want to delete this"
 msgstr "Jag är säker på att jag vill radera detta"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Tjohoo! Upladdat!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
-msgstr ""
+msgstr "Du har tagit bort bloggen."
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
-msgstr ""
+msgstr "Bloggen togs inte bort eftersom du saknar rättigheter."
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
 msgid "Add Blog Post"
-msgstr ""
+msgstr "Lägg till blogginlägg"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
 msgid "Edit Blog"
-msgstr ""
+msgstr "Ändra blogg"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
 msgid "Delete Blog"
-msgstr ""
+msgstr "Ta bort blogg"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Ändra"
 
@@ -430,7 +552,7 @@ msgstr "Ändra"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -440,7 +562,7 @@ msgstr ""
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
 msgid " No blog post yet. "
-msgstr ""
+msgstr " Inga blogginlägg än. "
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -465,11 +587,11 @@ msgstr "Avbryt"
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
 msgid "Delete permanently"
-msgstr ""
+msgstr "Ta bort permanent"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
 msgid "Create/Edit a Blog"
-msgstr ""
+msgstr "Skapa/Ändra en blogg"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
 #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
@@ -478,20 +600,20 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/submit/start.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
 msgid "Add"
-msgstr ""
+msgstr "Lägg till"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
 msgid "Create/Edit a blog post."
-msgstr ""
+msgstr "Skapa/Ändra ett blogginlägg."
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
 msgid "Create/Edit a Blog Post."
-msgstr ""
+msgstr "Skapa/Ändra ett blogginlägg."
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
 #, python-format
 msgid "%(blog_owner_name)s's Blog"
-msgstr ""
+msgstr "%(blog_owner_name)s blogg"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
 msgid "View"
@@ -499,7 +621,7 @@ msgstr ""
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
 msgid "Create a Blog"
-msgstr ""
+msgstr "Skapa en blogg"
 
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
 msgid " Blog Dashboard "
@@ -515,27 +637,27 @@ msgstr ""
 
 #: mediagoblin/moderation/forms.py:21
 msgid "Take away privilege"
-msgstr ""
+msgstr "Ta bort rättighet"
 
 #: mediagoblin/moderation/forms.py:22
 msgid "Ban the user"
-msgstr ""
+msgstr "Bannlys användaren"
 
 #: mediagoblin/moderation/forms.py:23
 msgid "Send the user a message"
-msgstr ""
+msgstr "Skicka anvädaren ett meddelande"
 
 #: mediagoblin/moderation/forms.py:24
 msgid "Delete the content"
-msgstr ""
+msgstr "Ta bort innehållet"
 
 #: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
 msgid "User will be banned until:"
-msgstr ""
+msgstr "Användaren kommer vara bannlyst till och med:"
 
 #: mediagoblin/moderation/forms.py:57
 msgid "Why are you banning this User?"
-msgstr ""
+msgstr "Varför bannlyser du den här användaren?"
 
 #: mediagoblin/moderation/forms.py:109
 msgid "What action will you take to resolve the report?"
@@ -543,7 +665,7 @@ msgstr ""
 
 #: mediagoblin/moderation/forms.py:115
 msgid "What privileges will you take away?"
-msgstr ""
+msgstr "Vilka rättigheter vill du ta bort?"
 
 #: mediagoblin/moderation/forms.py:122
 msgid "Why user was banned:"
@@ -551,89 +673,89 @@ msgstr ""
 
 #: mediagoblin/moderation/forms.py:125
 msgid "Message to user:"
-msgstr ""
+msgstr "Meddelande till användaren:"
 
 #: mediagoblin/moderation/forms.py:128
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
-msgstr ""
+msgstr "till och med {date}"
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
-msgstr ""
+msgstr "Varning från"
 
 #: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
 msgid "commented on your post"
-msgstr ""
+msgstr "kommenterade ditt inlägg"
 
 #: mediagoblin/notifications/views.py:35
 #, python-format
 msgid "Subscribed to comments on %s!"
-msgstr ""
+msgstr "Prenumererar nu på kommentarer för %s!"
 
 #: mediagoblin/notifications/views.py:48
 #, python-format
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
-msgstr ""
+msgstr "Beklagar, filstorleken är för stor."
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -643,15 +765,15 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/tools.py:132
 msgid "Primary"
-msgstr ""
+msgstr "Primär"
 
 #: mediagoblin/plugins/archivalook/tools.py:133
 msgid "Secondary"
-msgstr ""
+msgstr "Sekundär"
 
 #: mediagoblin/plugins/archivalook/tools.py:134
 msgid "Tertiary"
-msgstr ""
+msgstr "Tertiär"
 
 #: mediagoblin/plugins/archivalook/tools.py:135
 msgid "-----------{display_type}-Features---------------------------\n"
@@ -659,7 +781,7 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
 msgid "How does this work?"
-msgstr ""
+msgstr "Hur fungerar det här?"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
 msgid "How to feature media?"
@@ -753,7 +875,7 @@ msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
 msgid "CAUTION:"
-msgstr ""
+msgstr "VARNING:"
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
 msgid ""
@@ -888,7 +1010,7 @@ msgstr "Användarnamn eller e-postadress"
 
 #: mediagoblin/plugins/basic_auth/forms.py:46
 msgid "Stay logged in"
-msgstr ""
+msgstr "Fortsätt vara inloggad"
 
 #: mediagoblin/plugins/basic_auth/forms.py:51
 msgid "Username or email"
@@ -902,7 +1024,7 @@ msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:65
 msgid "Couldn't find someone with that username."
-msgstr ""
+msgstr "Kunde inte hitta någon vid det användarnamnet."
 
 #: mediagoblin/plugins/basic_auth/views.py:68
 msgid ""
@@ -921,7 +1043,7 @@ msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:139
 msgid "You can now log in using your new password."
-msgstr ""
+msgstr "Du kan nu logga in med ditt nya lösenord."
 
 #: mediagoblin/plugins/basic_auth/views.py:163
 msgid ""
@@ -931,22 +1053,22 @@ msgstr ""
 
 #: mediagoblin/plugins/basic_auth/views.py:215
 msgid "Your password was changed successfully"
-msgstr ""
+msgstr "Ditt lösenord har nu ändrats"
 
 #: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
 #: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
 msgid "Set your new password"
-msgstr ""
+msgstr "Ange ditt nya lösenord"
 
 #: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
 msgid "Set password"
-msgstr ""
+msgstr "Ange lösenord"
 
 #: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
 #: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
 #, python-format
 msgid "Changing %(username)s's password"
-msgstr ""
+msgstr "Ändrar %(username)s's lösenord"
 
 #: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
 #: mediagoblin/templates/mediagoblin/edit/change_email.html:40
@@ -978,38 +1100,34 @@ msgstr "Skicka instruktioner"
 msgid "Forgot your password?"
 msgstr "Glömt ditt lösenord?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
 msgid "Sign in to create an account!"
-msgstr ""
+msgstr "Logga in för att skapa ett konto!"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
 msgid "Metadata"
-msgstr ""
+msgstr "Metadata"
 
 #: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
 msgid "Edit Metadata"
-msgstr ""
+msgstr "Ändra metadata"
 
 #: mediagoblin/plugins/oauth/forms.py:29
 msgid "Allow"
-msgstr ""
+msgstr "Tillåt"
 
 #: mediagoblin/plugins/oauth/forms.py:30
 msgid "Deny"
-msgstr ""
+msgstr "Neka"
 
 #: mediagoblin/plugins/oauth/forms.py:34
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
 #: mediagoblin/plugins/oauth/forms.py:35
 msgid "The name of the OAuth client"
@@ -1049,9 +1167,9 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
-msgstr ""
+msgstr "Klient {0] har registrerats!"
 
 #: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
 msgid "OAuth client connections"
@@ -1062,8 +1180,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1071,39 +1189,39 @@ msgstr ""
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
-msgstr ""
+msgstr "Verifiering av %s misslyckades: %s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
-msgstr ""
+msgstr "Verifiering misslyckades"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1112,13 +1230,13 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
 msgid "Add an OpenID"
-msgstr ""
+msgstr "Lägg till ett OpenID"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
 msgid "Delete an OpenID"
-msgstr ""
+msgstr "Ta bort ett OpenID"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
 msgid "OpenID's"
@@ -1127,7 +1245,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1141,44 +1259,44 @@ msgstr "Inloggning misslyckades!"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
 msgid "Log in to create an account!"
-msgstr ""
+msgstr "Logga in för att skapa ett konto!"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
 msgid "Or login with a password!"
-msgstr ""
+msgstr "Eller logga in med lösenord!"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
 msgid "Or login with OpenID!"
-msgstr ""
+msgstr "Eller logga in med OpenID!"
 
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
 msgid "Or register with OpenID!"
-msgstr ""
+msgstr "Eller registrera dig med OpenID!"
 
 #: mediagoblin/plugins/persona/__init__.py:90
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1196,21 +1314,21 @@ msgstr ""
 
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
 msgid "Or login with Persona!"
-msgstr ""
+msgstr "Eller logga in med Persona!"
 
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
 msgid "Or register with Persona!"
-msgstr ""
+msgstr "Eller registrera med Persona!"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Ogiltig fil för mediatypen."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
-msgstr ""
+msgstr "Kopiering till delat utrymme misslyckades."
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1229,18 +1347,18 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
-msgstr "Du måste ange en fil"
+msgstr "Du måste ange en fil."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
-msgstr ""
+msgstr "Samling \"%s\" tillagd!"
 
 #: mediagoblin/templates/mediagoblin/banned.html:20
 msgid "You are Banned."
-msgstr ""
+msgstr "Du är bannlyst."
 
 #: mediagoblin/templates/mediagoblin/banned.html:24
 #: mediagoblin/templates/mediagoblin/error.html:24
@@ -1249,33 +1367,33 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/banned.html:26
 msgid "You have been banned"
-msgstr ""
+msgstr "Du har blivit bannlyst"
 
 #: mediagoblin/templates/mediagoblin/banned.html:28
 #, python-format
 msgid "until %(until_when)s"
-msgstr ""
+msgstr "till och med %(until_when)s"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
-msgstr "Verifiera din e-postadress"
+msgstr "Verifiera din e-postadress!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
-msgstr ""
+msgstr "logga ut"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
-#, python-format
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, fuzzy, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
-msgstr ""
+msgstr "<a href=\"%(user_url)s\">%(user_name)s</a>'s konto"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
-msgstr ""
+msgstr "Ändra kontoinställningar"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1283,29 +1401,29 @@ msgstr ""
 msgid "Media processing panel"
 msgstr "Mediabehandlingspanel"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Logga ut"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Lägg till media"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
-msgstr ""
+msgstr "Skapa ny samling"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1320,7 +1438,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:29
 msgid "You are logged in as"
-msgstr ""
+msgstr "Du är inloggad som"
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:33
 msgid "Do you want to authorize "
@@ -1328,7 +1446,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:37
 msgid "an unknown application"
-msgstr ""
+msgstr "en okänd applikation"
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:39
 msgid " to access your account? "
@@ -1344,11 +1462,11 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:44
 msgid "See your information (e.g profile, media, etc...)"
-msgstr ""
+msgstr "Visa din information (t.ex. profil, uppladdad media, m.m...)"
 
 #: mediagoblin/templates/mediagoblin/api/authorize.html:45
 msgid "Change your information"
-msgstr ""
+msgstr "Ändra din information"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:21
 msgid "Authorization Finished"
@@ -1359,7 +1477,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1423,7 +1541,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
 msgid "Don't have one yet? It's easy!"
-msgstr "Har du inte ett redan?"
+msgstr "Har du inte ett redan? Det är lätt!"
 
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
 msgid ""
@@ -1450,15 +1568,15 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
-msgstr ""
+msgstr "Bilagor"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
-msgstr ""
+msgstr "Lägg till bilaga"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:63
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
@@ -1472,8 +1590,49 @@ msgstr "Spara ändringar"
 #: mediagoblin/templates/mediagoblin/edit/change_email.html:33
 #, python-format
 msgid "Changing %(username)s's email"
+msgstr "Ändra %(username)s e-postadress"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr "Typ:"
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s sedan"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1481,7 +1640,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
 msgid "Yes, really delete my account"
-msgstr ""
+msgstr "Ja, ta verkligen bort mitt konto"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:23
 #: mediagoblin/templates/mediagoblin/edit/edit.html:35
@@ -1493,15 +1652,15 @@ msgstr "Redigerar %(media_title)s"
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
 #, python-format
 msgid "Changing %(username)s's account settings"
-msgstr ""
+msgstr "Ändra %(username)s's kontoinställningar"
 
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
 msgid "Delete my account"
-msgstr ""
+msgstr "Ta bort mitt konto"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
-msgstr ""
+msgstr "E-postadress"
 
 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
 #, python-format
@@ -1521,19 +1680,19 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:72
 msgid "MetaData"
-msgstr ""
+msgstr "Metadata"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:80
 msgid "Add new Row"
-msgstr ""
+msgstr "Lägg till ny rad"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:83
 msgid "Update Metadata"
-msgstr ""
+msgstr "Uppdatera metadata"
 
 #: mediagoblin/templates/mediagoblin/edit/metadata.html:87
 msgid "Clear empty Rows"
-msgstr ""
+msgstr "Töm tomma rader"
 
 #: mediagoblin/templates/mediagoblin/edit/verification.txt:19
 #, python-format
@@ -1551,24 +1710,11 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
 msgid "New comments"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
+msgstr "Nya kommentarer"
 
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
-msgstr ""
+msgstr "Markera alla som lästa"
 
 #: mediagoblin/templates/mediagoblin/listings/collection.html:30
 #: mediagoblin/templates/mediagoblin/listings/collection.html:35
@@ -1578,38 +1724,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Media taggat med: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
-msgstr ""
+msgstr "Ladda ned"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1617,70 +1763,70 @@ msgstr ""
 msgid "Created"
 msgstr "Skapad"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
-msgstr ""
+msgstr "PDF-fil"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
-msgstr ""
+msgstr "Ladda ned modell"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
-msgstr ""
+msgstr "Filformat"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1699,13 +1845,13 @@ msgstr "Media under behandling"
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
@@ -1718,7 +1864,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
 msgid "Unknown"
-msgstr ""
+msgstr "Okänd"
 
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
@@ -1765,13 +1911,13 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
-msgstr ""
+msgstr "Rapportera"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:38
 msgid "Reported comment"
-msgstr ""
+msgstr "Rapportera kommentar"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:83
 #, python-format
@@ -1899,7 +2045,7 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/moderation/user.html:23
 #, python-format
 msgid "User: %(username)s"
-msgstr ""
+msgstr "Användare: %(username)s"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:42
 msgid "Return to Users Panel"
@@ -1913,7 +2059,7 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
 msgid "Email verification needed"
-msgstr "E-postadressverifiering krävs."
+msgstr "E-postadressverifiering krävs"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:55
 msgid ""
@@ -2006,11 +2152,11 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:172
 msgid "Privilege"
-msgstr ""
+msgstr "Rättighet"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:173
 msgid "Granted"
-msgstr ""
+msgstr "Beviljad"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:180
 msgid "Yes"
@@ -2022,7 +2168,7 @@ msgstr "Nej"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:213
 msgid "Ban User"
-msgstr ""
+msgstr "Bannlys användare"
 
 #: mediagoblin/templates/mediagoblin/moderation/user.html:218
 msgid "UnBan User"
@@ -2042,7 +2188,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
 msgid "Active Users"
-msgstr ""
+msgstr "Aktiva användare"
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
 msgid "When Joined"
@@ -2054,11 +2200,11 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
 msgid "No users found."
-msgstr ""
+msgstr "Hittade inga användare."
 
 #: mediagoblin/templates/mediagoblin/submit/collection.html:26
 msgid "Add a collection"
-msgstr ""
+msgstr "Lägg till en samling"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:28
 #: mediagoblin/templates/mediagoblin/submit/start.html:35
@@ -2071,19 +2217,19 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
-msgstr ""
+msgstr "Lägg till en kommentar"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
-msgstr ""
+msgstr "Tillagd"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
 #, python-format
@@ -2103,7 +2249,7 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
 #, python-format
 msgid "Really delete collection: %(title)s?"
-msgstr ""
+msgstr "Vill du verkligen ta bort samling: %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
 #, python-format
@@ -2117,12 +2263,12 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
 msgid "Remove"
-msgstr ""
+msgstr "Ta bort"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
 #, python-format
 msgid "%(username)s's collections"
-msgstr ""
+msgstr "%(username)s samlingar"
 
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
 #, python-format
@@ -2139,7 +2285,7 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
 msgid "%(username)s's media"
-msgstr "%(username)ss media"
+msgstr "%(username)s media"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
 #, python-format
@@ -2153,20 +2299,20 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>s media"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
-msgstr ""
+msgstr "Förhandsgranska kommentar"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
 #, python-format
 msgid "Add “%(media_title)s� to a collection"
-msgstr ""
+msgstr "Lägg till \"%(media_title)s\" i en samling"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
 msgid "+"
@@ -2174,7 +2320,7 @@ msgstr "+"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
 msgid "Add a new collection"
-msgstr ""
+msgstr "Lägg till ny samling"
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
 msgid ""
@@ -2229,7 +2375,7 @@ msgstr "Här kommer din media att dyka upp, du verkar inte ha lagt till någonti
 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
 msgid "There doesn't seem to be any media here yet..."
-msgstr "Det verkar inte finnas någon media här ännu."
+msgstr "Det verkar inte finnas någon media här ännu..."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
 msgid "Almost done! Your account still needs to be activated."
@@ -2263,19 +2409,19 @@ msgstr "Om det är du som är den personen och har förlorat ditt e-postmeddelan
 
 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
 msgid "(remove)"
-msgstr ""
+msgstr "(ta bort)"
 
 #: mediagoblin/templates/mediagoblin/utils/collections.html:21
 msgid "Collected in"
-msgstr ""
+msgstr "Samlad i"
 
 #: mediagoblin/templates/mediagoblin/utils/collections.html:40
 msgid "Add to a collection"
-msgstr ""
+msgstr "Lägg till i samling"
 
 #: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
 msgid "Subscribe to comments"
-msgstr ""
+msgstr "Prenumerera på kommentarer"
 
 #: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
 msgid "Silence comments"
@@ -2297,11 +2443,11 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "� Newer"
-msgstr ""
+msgstr "� Nyare"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:45
 msgid "Older →"
-msgstr ""
+msgstr "Äldre →"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
@@ -2315,7 +2461,11 @@ msgstr "nyare"
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
-msgstr ""
+msgstr "äldre"
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Plats"
 
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
@@ -2323,40 +2473,40 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
 msgid "Tagged with"
-msgstr ""
+msgstr "Taggad med"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Ojoj!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
-msgstr ""
+msgstr "Ett fel inträffade"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2381,15 +2531,15 @@ msgstr "dag"
 
 #: mediagoblin/tools/timesince.py:66
 msgid "hour"
-msgstr ""
+msgstr "timme"
 
 #: mediagoblin/tools/timesince.py:67
 msgid "minute"
-msgstr ""
+msgstr "minut"
 
 #: mediagoblin/user_pages/forms.py:23
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #: mediagoblin/user_pages/forms.py:25
 msgid ""
@@ -2399,15 +2549,15 @@ msgstr ""
 
 #: mediagoblin/user_pages/forms.py:35
 msgid "I am sure I want to remove this item from the collection"
-msgstr ""
+msgstr "Jag är säker på att jag vill ta bort föremålet från samlingen"
 
 #: mediagoblin/user_pages/forms.py:39
 msgid "Collection"
-msgstr ""
+msgstr "Samling"
 
 #: mediagoblin/user_pages/forms.py:40
 msgid "-- Select --"
-msgstr ""
+msgstr "-- Välj --"
 
 #: mediagoblin/user_pages/forms.py:42
 msgid "Include a note"
@@ -2419,74 +2569,80 @@ msgid ""
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
+"Du kan använda\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> för att formatera texten."
 
 #: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
-msgstr ""
+msgstr "Beklagar, kommentering är avstängt."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
-msgstr ""
+msgstr "Ojdå, din kommentar var tom."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
-msgstr ""
+msgstr "Din kommentar har skickats in!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
-msgstr ""
+msgstr "Du måste välja eller lägga till en samling"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
-msgstr ""
+msgstr "\"%s\" finns redan i samling \"%s\""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
-msgstr ""
+msgstr "\"%s\" lades till i samling \"%s\""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Du tänker radera en annan användares media. Var försiktig."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
-msgstr ""
+msgstr "Du har tagit bort föremålet från samlingen."
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
-msgstr ""
+msgstr "Du tog bort samlingen \"%s\""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
-msgstr ""
+msgstr "Samlingen togs inte bort, eftersom du inte bekräftade borttagningen."
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
+"Du håller på att ta bort en annan användares samling. Fortsätt med "
+"försiktighet."
diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 98bd9054..00000000
--- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/mediagoblin.po
index 0f3a6cb6..4ece607f 100644
--- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/te/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/mediagoblin/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -19,67 +19,167 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr ""
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -95,7 +195,7 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -111,11 +211,11 @@ msgstr ""
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -143,125 +243,137 @@ msgstr ""
 msgid "This address contains errors"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr ""
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr ""
 
@@ -292,7 +404,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -300,58 +412,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -377,28 +489,28 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -418,7 +530,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
@@ -428,7 +540,7 @@ msgstr ""
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
@@ -555,46 +667,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -612,26 +724,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -976,11 +1088,7 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr "మీ సంకేతపదాన�ని మర�చిపోయారా?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
@@ -1047,7 +1155,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1060,8 +1168,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1069,39 +1177,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1125,7 +1233,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1157,26 +1265,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1200,15 +1308,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1227,11 +1335,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr ""
@@ -1254,26 +1362,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1281,29 +1389,29 @@ msgstr ""
 msgid "Media processing panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1357,7 +1465,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1448,13 +1556,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr ""
 
@@ -1472,6 +1580,47 @@ msgstr "మార�ప�లన� భద�రపరచ�"
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1497,7 +1646,7 @@ msgstr ""
 msgid "Delete my account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1551,19 +1700,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1576,38 +1712,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1615,70 +1751,70 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1763,7 +1899,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2069,17 +2205,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr ""
 
@@ -2151,12 +2287,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2315,6 +2451,10 @@ msgstr ""
 msgid "older"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2323,38 +2463,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr ""
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr ""
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2422,69 +2562,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/templates/en/mediagoblin.po b/mediagoblin/i18n/templates/en/mediagoblin.po
new file mode 100644
index 00000000..75aa94d9
--- /dev/null
+++ b/mediagoblin/i18n/templates/en/mediagoblin.po
@@ -0,0 +1,2681 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your "
+"profile, and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure "
+"it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie "
+"blocker or somesuch.<br/>Make sure to permit the settings of cookies for "
+"this domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's "
+"URL and\n"
+"      then paste it into a new line in the text box above. There should "
+"be only\n"
+"      one url per line. The url that you paste into the text box should "
+"be under\n"
+"      the header describing how prominent a feature it will be (whether "
+"Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to "
+"feature are\n"
+"      inside the text box, click the Submit Query button, and your media "
+"should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the"
+" piece\n"
+"        of media you would like to feature or unfeature and look at the "
+"bar to\n"
+"        the side of the media entry. If the piece of media has not been "
+"featured\n"
+"        yet you should see a button that says \"Feature\". Press that "
+"button and\n"
+"        the media will be featured as a Primary Feature at the top of the"
+" page.\n"
+"        All other featured media entries will remain as features, but "
+"will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is "
+"currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and"
+" \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". "
+"Click\n"
+"        Unfeature and that media entry will no longer be displayed on the"
+"\n"
+"        front page, although you can feature it again at any point. "
+"Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and "
+"makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on "
+"your\n"
+"      front page. Primary Features are placed at the top of the front "
+"page and are\n"
+"      much larger. Next are Secondary Features, which are slightly "
+"smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br "
+"/><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than "
+"Secondary\n"
+"      Features, and Secondary Features can display longer descriptions "
+"than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail "
+"and a\n"
+"      portion of its description will be displayed on your website's "
+"front page.\n"
+"      The number of characters displayed varies on the prominence of the "
+"feature.\n"
+"      Primary Features display the first 512 characters of their "
+"description,\n"
+"      Secondary Features display the first 256 characters of their "
+"description,\n"
+"      and Tertiary Features display the first 128 characters of their "
+"description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and "
+"then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware "
+"that if\n"
+"      you make a typo, once you press Submit Query, your media entry will"
+" NOT be\n"
+"      featured. Make sure that all your intended Media Entries are "
+"featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the "
+"button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be "
+"sure to\n"
+"        have media featured as long as your instance has the "
+"'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be "
+"found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management "
+"panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been "
+"sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid "An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or "
+"your account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can "
+"not be\n"
+"                intercepted by the user agent (e.g. server-side "
+"client).<br />\n"
+"                <strong>Public</strong> - The client can't make "
+"confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-"
+"side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a "
+"password set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid "Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> "
+"project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a"
+" href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, "
+"an extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your"
+" MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" "
+"href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your "
+"own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing"
+" the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then"
+" \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can "
+"ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid "Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them."
+"\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at "
+"%(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid "You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid "An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to"
+" be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can "
+"<a href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're "
+"sure the address is correct, maybe the page you're looking for has been "
+"moved or deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed "
+"with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were "
+"sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid "You are about to delete another user's collection. Proceed with caution."
+msgstr ""
+
diff --git a/mediagoblin/i18n/templates/mediagoblin.pot b/mediagoblin/i18n/templates/mediagoblin.pot
new file mode 100644
index 00000000..5184b6ec
--- /dev/null
+++ b/mediagoblin/i18n/templates/mediagoblin.pot
@@ -0,0 +1,2614 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-03-05 15:03-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your "
+"profile, and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:125
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure "
+"it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie "
+"blocker or somesuch.<br/>Make sure to permit the settings of cookies for "
+"this domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:76
+#: mediagoblin/media_types/__init__.py:99
+#: mediagoblin/media_types/__init__.py:135
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:70
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:45
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:77 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:79
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:80 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:82
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:84 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:88
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's "
+"URL and\n"
+"      then paste it into a new line in the text box above. There should "
+"be only\n"
+"      one url per line. The url that you paste into the text box should "
+"be under\n"
+"      the header describing how prominent a feature it will be (whether "
+"Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to "
+"feature are\n"
+"      inside the text box, click the Submit Query button, and your media "
+"should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the"
+" piece\n"
+"        of media you would like to feature or unfeature and look at the "
+"bar to\n"
+"        the side of the media entry. If the piece of media has not been "
+"featured\n"
+"        yet you should see a button that says \"Feature\". Press that "
+"button and\n"
+"        the media will be featured as a Primary Feature at the top of the"
+" page.\n"
+"        All other featured media entries will remain as features, but "
+"will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is "
+"currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and"
+" \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". "
+"Click\n"
+"        Unfeature and that media entry will no longer be displayed on the"
+"\n"
+"        front page, although you can feature it again at any point. "
+"Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and "
+"makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on "
+"your\n"
+"      front page. Primary Features are placed at the top of the front "
+"page and are\n"
+"      much larger. Next are Secondary Features, which are slightly "
+"smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br "
+"/><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than "
+"Secondary\n"
+"      Features, and Secondary Features can display longer descriptions "
+"than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail "
+"and a\n"
+"      portion of its description will be displayed on your website's "
+"front page.\n"
+"      The number of characters displayed varies on the prominence of the "
+"feature.\n"
+"      Primary Features display the first 512 characters of their "
+"description,\n"
+"      Secondary Features display the first 256 characters of their "
+"description,\n"
+"      and Tertiary Features display the first 128 characters of their "
+"description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and "
+"then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware "
+"that if\n"
+"      you make a typo, once you press Submit Query, your media entry will"
+" NOT be\n"
+"      featured. Make sure that all your intended Media Entries are "
+"featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the "
+"button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be "
+"sure to\n"
+"        have media featured as long as your instance has the "
+"'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be "
+"found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management "
+"panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been "
+"sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid "An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or "
+"your account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a "
+"password set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid "Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:421
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:428
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:436
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:56
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:131
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> "
+"project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a"
+" href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, "
+"an extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your"
+" MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" "
+"href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your "
+"own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing"
+" the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then"
+" \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can "
+"ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\t  your web browser does not support HTML5\n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid "Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them."
+"\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at "
+"%(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid "You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid "An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to"
+" be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can "
+"<a href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're "
+"sure the address is correct, maybe the page you're looking for has been "
+"moved or deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed "
+"with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were "
+"sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid "You are about to delete another user's collection. Proceed with caution."
+msgstr ""
+
diff --git a/mediagoblin/i18n/tr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/tr/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 2c1f68d1..00000000
--- a/mediagoblin/i18n/tr/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/tr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/tr/mediagoblin.po
index c82bd819..c82bd819 100644
--- a/mediagoblin/i18n/tr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/tr/mediagoblin.po
diff --git a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 2e01288e..00000000
--- a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/tr_TR/mediagoblin.po
index 3d57de35..ea954a81 100644
--- a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/tr_TR/mediagoblin.po
@@ -1,17 +1,18 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
 # Berker Peksag <berker.peksag@gmail.com>, 2014
 # Caner BaÅŸaran <basaran.caner@gmail.com>, 2013
+# Volkan Gezer <volkangezer@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-07-29 11:01-0500\n"
-"PO-Revision-Date: 2014-08-04 18:37+0000\n"
-"Last-Translator: Berker Peksag <berker.peksag@gmail.com>\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mediagoblin/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,67 +21,167 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Üzgünüz, bu durumda kayıt devre dışıdır."
 
-#: mediagoblin/decorators.py:315
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
-msgstr ""
+msgstr "Üzgünüz, bu örnekte bildirme devre dışı."
 
-#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "Maalesef, bu isimde bir kullanıcı mevcut."
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "Üzgünüz, bu e-posta adresine sahip bir kullanıcı zaten var."
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "E-posta adresiniz doğrulandı. Şimdi giriş yapabilir, profilinizi düzenleyip ve yeni görüntüleri gönderebilirsiniz!"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "Doğrulama anahtarı veya kullanıcı kimliği yanlış"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "Zaten e-posta adresinizi doğruladınız!"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "Doğrulama e-postasını tekrar yolla."
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -96,7 +197,7 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -112,11 +213,11 @@ msgstr "Etiketler"
 msgid "Separate tags by commas."
 msgstr "Etikerleri virgül ile ayırın."
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -144,125 +245,137 @@ msgstr "Web sitesi"
 msgid "This address contains errors"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "Medyama birisi yorum yazdığında bana e-posta at"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "Lisans tercihi"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Eski parola"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Yeni parola"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "Yeni e-posta adresi"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "Parola"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Başka bir kullanıcının medyasını düzenlerken dikkatli davranın."
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "Sadece kendi profilinizi düzenleyebilirsiniz."
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Başka bir kullanıcının profilini düzenlerken dikkatli davranın."
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "Profil deÄŸiÅŸiklikleri kaydedildi"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "Hesap ayarları kaydedildi"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "E-posta adresiniz doğrulandı."
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "Yanlış parola"
 
@@ -293,7 +406,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -301,58 +414,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr "'{username}' adında bir kullanıcı kayıtlı değil."
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr "{files_attempted} dosyadan {files_uploaded} tanesi başarıyla gönderildi."
 
@@ -378,28 +491,28 @@ msgstr "Açıklama"
 msgid "I am sure I want to delete this"
 msgstr "Bunu silmek için eminim"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "Hoooop! Gönderildi!"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Medya silinmedi çünkü emin olduğunuzu onaylamadınız."
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -419,7 +532,7 @@ msgstr "Blog Sil"
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Düzenle"
 
@@ -429,7 +542,7 @@ msgstr "Düzenle"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Si"
 
@@ -556,46 +669,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "süresiz"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -613,26 +726,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -770,7 +883,6 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:64
 msgid "Feature"
 msgstr ""
 
@@ -817,23 +929,20 @@ msgstr ""
 msgid ""
 "If you would like to feature a\n"
 "        piece of media, go to that media entry's homepage and click the button\n"
-"        that says"
+"        that says <a class=\"button_action\">Feature</a>."
 msgstr ""
 
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:65
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
 msgid ""
 "You're seeing this page because you are a user capable of\n"
 "        featuring media, a regular user would see a blank page, so be sure to\n"
 "        have media featured as long as your instance has the 'archivalook'\n"
 "        plugin enabled. A more advanced tool to manage features can be found\n"
-"        in the"
-msgstr ""
-
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:72
-msgid "feature management panel."
+"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
 msgstr ""
 
-#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:77
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
 msgid "View most recent media"
 msgstr ""
 
@@ -981,11 +1090,7 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr "Parolanı mı unuttun?"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "Konum"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
@@ -1052,7 +1157,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1065,8 +1170,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1074,39 +1179,39 @@ msgstr ""
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1130,7 +1235,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1162,26 +1267,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1205,15 +1310,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Bu medya türü için geçersiz dosya türü."
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1232,11 +1337,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "Bir dosya sağlamanız gerekir."
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr ""
@@ -1259,26 +1364,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "E-postanızı doğrulayın!"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "çıkış"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "Hesap ayarlarını değiştir"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1286,29 +1391,29 @@ msgstr "Hesap ayarlarını değiştir"
 msgid "Media processing panel"
 msgstr "Medya iÅŸlem paneli"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "Çıkış"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "Medya ekle"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1362,7 +1467,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1453,13 +1558,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "Ekler"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr ""
 
@@ -1477,6 +1582,47 @@ msgstr "DeÄŸiÅŸiklikleri kaydet"
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s önce"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1502,7 +1648,7 @@ msgstr ""
 msgid "Delete my account"
 msgstr "Hesabımı sil"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "E-posta"
 
@@ -1556,19 +1702,6 @@ msgstr ""
 msgid "New comments"
 msgstr "Yeni yorumlar"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s önce"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1581,38 +1714,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "Özgün"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "Özgün dosya"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1620,70 +1753,70 @@ msgstr ""
 msgid "Created"
 msgstr "OluÅŸturuldu"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF dosya"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "Dosya Biçimi"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1768,7 +1901,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2074,17 +2207,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "Bir yorum ekle"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "Bu yorumu ekle"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "Eklendi"
 
@@ -2156,12 +2289,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a> medyası"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "Yorum önizlemesi"
 
@@ -2320,6 +2453,10 @@ msgstr ""
 msgid "older"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "Konum"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2328,38 +2465,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr ""
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "Amaninnn boo!"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2427,69 +2564,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "Maalesef, yorum devre dışı."
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "Amaninnn boo, yorumunuz boÅŸtu."
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "Yorumunuz gönderildi!"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "Medyayı sildiniz."
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Başka bir kullanıcının medyasını silerken dikkatli davranın."
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/uz@Latn/mediagoblin.po b/mediagoblin/i18n/uz@Latn/mediagoblin.po
new file mode 100644
index 00000000..81373a2d
--- /dev/null
+++ b/mediagoblin/i18n/uz@Latn/mediagoblin.po
@@ -0,0 +1,2629 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
+"Language-Team: Uzbek (Latin) (http://www.transifex.com/projects/p/mediagoblin/language/uz@Latn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Language: uz@Latn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie blocker "
+"or somesuch.<br/>Make sure to permit the settings of cookies for this "
+"domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
+"      then paste it into a new line in the text box above. There should be only\n"
+"      one url per line. The url that you paste into the text box should be under\n"
+"      the header describing how prominent a feature it will be (whether Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
+"      inside the text box, click the Submit Query button, and your media should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
+"        of media you would like to feature or unfeature and look at the bar to\n"
+"        the side of the media entry. If the piece of media has not been featured\n"
+"        yet you should see a button that says \"Feature\". Press that button and\n"
+"        the media will be featured as a Primary Feature at the top of the page.\n"
+"        All other featured media entries will remain as features, but will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". Click\n"
+"        Unfeature and that media entry will no longer be displayed on the\n"
+"        front page, although you can feature it again at any point. Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on your\n"
+"      front page. Primary Features are placed at the top of the front page and are\n"
+"      much larger. Next are Secondary Features, which are slightly smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than Secondary\n"
+"      Features, and Secondary Features can display longer descriptions than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
+"      portion of its description will be displayed on your website's front page.\n"
+"      The number of characters displayed varies on the prominence of the feature.\n"
+"      Primary Features display the first 512 characters of their description,\n"
+"      Secondary Features display the first 256 characters of their description,\n"
+"      and Tertiary Features display the first 128 characters of their description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware that if\n"
+"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
+"      featured. Make sure that all your intended Media Entries are featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be sure to\n"
+"        have media featured as long as your instance has the 'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been sent"
+" with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your "
+"MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid ""
+"Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid ""
+"You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can <a "
+"href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""
diff --git a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 7fd01e75..00000000
--- a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/vi/mediagoblin.po b/mediagoblin/i18n/vi/mediagoblin.po
new file mode 100644
index 00000000..d321ff8f
--- /dev/null
+++ b/mediagoblin/i18n/vi/mediagoblin.po
@@ -0,0 +1,2629 @@
+# Translations template for PROJECT.
+# Copyright (C) 2015 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/mediagoblin/language/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:319
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
+msgid "Sorry, authentication is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:45
+msgid "Invalid User name or email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:46
+msgid "This field does not take email addresses."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:47
+msgid "This field requires an email address."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:118
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
+msgid "Sorry, a user with that email address already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
+msgid "The verification key or user id is incorrect."
+msgstr ""
+
+#: mediagoblin/auth/views.py:164
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:170
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:188
+msgid "You must be logged in so we know who to send the email to!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:196
+msgid "You've already verified your email address!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:206
+msgid "Resent your verification email."
+msgstr ""
+
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
+#: mediagoblin/media_types/blog/forms.py:24
+#: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
+#: mediagoblin/submit/forms.py:61
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:40
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:69
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:100
+#: mediagoblin/user_pages/forms.py:45
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:40
+msgid "Description of this work"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:37 mediagoblin/media_types/blog/forms.py:27
+#: mediagoblin/submit/forms.py:45
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:39 mediagoblin/submit/forms.py:47
+msgid "Separate tags by commas."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:44
+msgid ""
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:48 mediagoblin/media_types/blog/forms.py:29
+#: mediagoblin/submit/forms.py:50
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:54
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:60
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:62
+msgid "This address contains errors"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "Email me when others comment on my media"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:70
+msgid "Enable insite notifications about events."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:72
+msgid "License preference"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:78
+msgid "This will be your default license on upload forms."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:91
+msgid "The title can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
+#: mediagoblin/user_pages/forms.py:48
+msgid "Description of this collection"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:100
+msgid ""
+"The title part of this collection's address. You usually don't need to "
+"change this."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
+msgid "Old password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
+msgid "New password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:120
+msgid "New email address"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/plugins/basic_auth/forms.py:43
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:126
+msgid "Enter your password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:156
+msgid "Identifier"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:157
+msgid "Value"
+msgstr ""
+
+#: mediagoblin/edit/views.py:80
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:98
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:168
+#, python-format
+msgid "You added the attachment %s!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:195
+msgid "You can only edit your own profile."
+msgstr ""
+
+#: mediagoblin/edit/views.py:201
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:232
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:265
+msgid "Account settings saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
+msgid "You need to confirm the deletion of your account."
+msgstr ""
+
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
+#, python-format
+msgid "You already have a collection called \"%s\"!"
+msgstr ""
+
+#: mediagoblin/edit/views.py:367
+msgid "A collection with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:382
+msgid "You are editing another user's collection. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:423
+msgid "Your email address has been verified."
+msgstr ""
+
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:60
+msgid "Cannot link theme... no theme set\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:73
+msgid "No asset directory for this theme\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:76
+msgid "However, old link directory symlink found; removed.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:112
+#, python-format
+msgid "Could not link \"%s\": %s exists and is not a symlink\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:119
+#, python-format
+msgid "Skipping \"%s\"; already set up.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/assetlink.py:124
+#, python-format
+msgid "Old link found for \"%s\"; removing.\n"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
+msgid ""
+"For more information about how to properly run this\n"
+"script (and how to format the metadata csv file), read the MediaGoblin\n"
+"documentation page on command line uploading\n"
+"<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
+msgid "Name of user these media entries belong to"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
+msgid "Path to the csv file containing metadata information."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
+msgid "Don't process eagerly, pass off to celery"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
+msgid "Sorry, no user by username '{username}' exists"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
+msgid "File at {path} not found, use -h flag for help"
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
+msgid ""
+"Error with media '{media_id}' value '{error_path}': {error_msg}\n"
+"Metadata was not uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
+msgid ""
+"FAIL: Local file {filename} could not be accessed.\n"
+"{filename} will not be uploaded."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
+msgid ""
+"Successfully submitted {filename}!\n"
+"Be sure to look at the Media Processing Panel on your website to be sure it\n"
+"uploaded successfully."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
+msgid "FAIL: This file is larger than the upload limits for this site."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
+msgid "FAIL: This file will put this user past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
+msgid "FAIL: This user is already past their upload limits."
+msgstr ""
+
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
+msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
+msgstr ""
+
+#: mediagoblin/meddleware/csrf.py:134
+msgid ""
+"CSRF cookie not present. This is most likely the result of a cookie blocker "
+"or somesuch.<br/>Make sure to permit the settings of cookies for this "
+"domain."
+msgstr ""
+
+#: mediagoblin/media_types/__init__.py:79
+#: mediagoblin/media_types/__init__.py:101
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:26
+#: mediagoblin/media_types/blog/forms.py:35
+#: mediagoblin/plugins/oauth/forms.py:36
+msgid "Description"
+msgstr ""
+
+#: mediagoblin/media_types/blog/forms.py:40 mediagoblin/user_pages/forms.py:31
+msgid "I am sure I want to delete this"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:200
+msgid "Woohoo! edited blogpost is submitted"
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:322
+msgid "You deleted the Blog."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
+msgid "The media was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:335
+msgid "You are about to delete another user's Blog. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/media_types/blog/views.py:346
+msgid "The blog was not deleted because you have no rights."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:43
+msgid "Add Blog Post"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:50
+msgid "Edit Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:57
+msgid "Delete Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:92
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+msgid "Edit"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:93
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
+msgid "Delete"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:102
+msgid "<em> Go to list view </em>"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html:104
+msgid " No blog post yet. "
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:30
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
+#, python-format
+msgid "Really delete %(title)s?"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:47
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:61
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit.html:41
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:54
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48
+msgid "Cancel"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_confirm_delete.html:48
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49
+msgid "Delete permanently"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:26
+msgid "Create/Edit a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_edit_create.html:37
+#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
+#: mediagoblin/templates/mediagoblin/submit/collection.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
+msgid "Add"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:23
+msgid "Create/Edit a blog post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_edit_create.html:29
+msgid "Create/Edit a Blog Post."
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_post_listing.html:24
+#, python-format
+msgid "%(blog_owner_name)s's Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:46
+msgid "View"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html:65
+msgid "Create a Blog"
+msgstr ""
+
+#: mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_dashboard.html:20
+msgid " Blog Dashboard "
+msgstr ""
+
+#: mediagoblin/media_types/pdf/processing.py:142
+msgid "unoconv failing to run, check log file"
+msgstr ""
+
+#: mediagoblin/media_types/video/processing.py:44
+msgid "Video transcoding failed"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Send the user a message"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:24
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:57
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:109
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:115
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:122
+msgid "Why user was banned:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:125
+msgid "Message to user:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:128
+msgid "Resolution content:"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:37
+msgid ""
+"\n"
+"{mod} took away {user}'s {privilege} privileges."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:50
+msgid ""
+"\n"
+"{mod} banned user {user} {expiration_date}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:54
+msgid "until {date}"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:56
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:65
+msgid ""
+"\n"
+"{mod} sent a warning email to the {user}."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:74
+msgid ""
+"\n"
+"{mod} deleted the comment."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:81
+msgid ""
+"\n"
+"{mod} deleted the media entry."
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:94
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
+msgid "commented on your post"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:35
+#, python-format
+msgid "Subscribed to comments on %s!"
+msgstr ""
+
+#: mediagoblin/notifications/views.py:48
+#, python-format
+msgid "You will not receive notifications for comments on %s."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:239
+msgid "Must provide an oauth_token."
+msgstr ""
+
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
+msgid "No request token found."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/forms.py:21
+msgid "Enter the URL for the media to be featured"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:132
+msgid "Primary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:133
+msgid "Secondary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:134
+msgid "Tertiary"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/tools.py:135
+msgid "-----------{display_type}-Features---------------------------\n"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:33
+msgid "How does this work?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:34
+msgid "How to feature media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:37
+msgid ""
+"\n"
+"      Go to the page of the media entry you want to feature. Copy it's URL and\n"
+"      then paste it into a new line in the text box above. There should be only\n"
+"      one url per line. The url that you paste into the text box should be under\n"
+"      the header describing how prominent a feature it will be (whether Primary,\n"
+"      Secondary, or Tertiary). Once all of the media that you want to feature are\n"
+"      inside the text box, click the Submit Query button, and your media should be\n"
+"      displayed on the front page.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:48
+msgid "Is there another way to manage featured media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:51
+msgid ""
+"\n"
+"        Yes. If you would prefer, you may go to the media homepage of the piece\n"
+"        of media you would like to feature or unfeature and look at the bar to\n"
+"        the side of the media entry. If the piece of media has not been featured\n"
+"        yet you should see a button that says \"Feature\". Press that button and\n"
+"        the media will be featured as a Primary Feature at the top of the page.\n"
+"        All other featured media entries will remain as features, but will be\n"
+"        pushed further down the page.<br /><br />\n"
+"\n"
+"        If you go to the media homepage of a piece of media that is currently\n"
+"        featured, you will see the options \"Unfeature\", \"Promote\" and \"Demote\"\n"
+"        where previously there was the button which said \"Feature\". Click\n"
+"        Unfeature and that media entry will no longer be displayed on the\n"
+"        front page, although you can feature it again at any point. Promote\n"
+"        moves the featured media higher up on the page and makes it more\n"
+"        prominent and Demote moves the featured media lower down and makes it\n"
+"        less prominent.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:70
+msgid "What is a Primary Feature? What is a Secondary Feature?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:74
+msgid ""
+"\n"
+"      These categories just describe how prominent a feature will be on your\n"
+"      front page. Primary Features are placed at the top of the front page and are\n"
+"      much larger. Next are Secondary Features, which are slightly smaller.\n"
+"      Tertiary Features make up a grid at the bottom of the page.<br /><br />\n"
+"\n"
+"      Primary Features also can display longer descriptions than Secondary\n"
+"      Features, and Secondary Features can display longer descriptions than\n"
+"      Tertiary Features."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:85
+msgid ""
+"How to decide what information is displayed when a media entry is\n"
+"    featured?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:88
+msgid ""
+"\n"
+"      When a media entry is featured, the entry's title, it's thumbnail and a\n"
+"      portion of its description will be displayed on your website's front page.\n"
+"      The number of characters displayed varies on the prominence of the feature.\n"
+"      Primary Features display the first 512 characters of their description,\n"
+"      Secondary Features display the first 256 characters of their description,\n"
+"      and Tertiary Features display the first 128 characters of their description.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:98
+msgid "How to unfeature a piece of media?"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:102
+msgid ""
+"\n"
+"      Unfeature a media by removing its line from the above textarea and then\n"
+"      pressing the Submit Query button.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:108
+msgid "CAUTION:"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature.html:110
+msgid ""
+"\n"
+"      When copying and pasting urls into the above text box, be aware that if\n"
+"      you make a typo, once you press Submit Query, your media entry will NOT be\n"
+"      featured. Make sure that all your intended Media Entries are featured.\n"
+"    "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:26
+msgid ""
+"\n"
+"Feature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:28
+msgid "Feature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:34
+msgid ""
+"\n"
+"Unfeature Media "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:36
+msgid "Unfeature"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:42
+msgid ""
+"\n"
+"Promote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:44
+msgid "Promote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:50
+msgid ""
+"\n"
+"Demote Feature "
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html:52
+msgid "Demote"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/recent_media.html:30
+#: mediagoblin/templates/mediagoblin/root.html:32
+msgid "Most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:61
+msgid "Nothing is currently featured."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:62
+msgid ""
+"If you would like to feature a\n"
+"        piece of media, go to that media entry's homepage and click the button\n"
+"        that says <a class=\"button_action\">Feature</a>."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:67
+#, python-format
+msgid ""
+"You're seeing this page because you are a user capable of\n"
+"        featuring media, a regular user would see a blank page, so be sure to\n"
+"        have media featured as long as your instance has the 'archivalook'\n"
+"        plugin enabled. A more advanced tool to manage features can be found\n"
+"        in the <a href=\"%(featured_media_url)s\">feature management panel.</a>"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/root.html:79
+msgid "View most recent media"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/bits/feature_dropdown.html:22
+msgid "Feature management panel"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:43
+msgid ""
+"Sorry, this audio will not work because\n"
+"\tyour web browser does not support HTML5\n"
+"\taudio."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_primary.html:46
+msgid ""
+"You can get a modern web browser that\n"
+"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t  http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:43
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:43
+msgid ""
+"Sorry, this video will not work because\n"
+"          your web browser does not support HTML5 \n"
+"          video."
+msgstr ""
+
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_primary.html:46
+#: mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/video_secondary.html:46
+msgid ""
+"You can get a modern web browser that \n"
+"          can play this video at <a href=\"http://getfirefox.com\">\n"
+"          http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:24
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:32
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/persona/forms.py:28
+#: mediagoblin/plugins/persona/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:39
+msgid "Username or Email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:46
+msgid "Stay logged in"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been sent"
+" with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your account."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr ""
+
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
+
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:22
+msgid "Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html:40
+msgid "Edit Metadata"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:29
+msgid "Allow"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:30
+msgid "Deny"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:34
+msgid "Name"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:35
+msgid "The name of the OAuth client"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:38
+msgid ""
+"This will be visible to users allowing your\n"
+"                application to authenticate as them."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:40
+msgid "Type"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:45
+msgid ""
+"<strong>Confidential</strong> - The client can\n"
+"                make requests to the GNU MediaGoblin instance that can not be\n"
+"                intercepted by the user agent (e.g. server-side client).<br />\n"
+"                <strong>Public</strong> - The client can't make confidential\n"
+"                requests to the GNU MediaGoblin instance (e.g. client-side\n"
+"                JavaScript client)."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:52
+msgid "Redirect URI"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:54
+msgid ""
+"The redirect URI for the applications, this field\n"
+"            is <strong>required</strong> for public clients."
+msgstr ""
+
+#: mediagoblin/plugins/oauth/forms.py:66
+msgid "This field is required for public clients"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/views.py:57
+msgid "The client {0} has been registered!"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22
+msgid "OAuth client connections"
+msgstr ""
+
+#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22
+msgid "Your OAuth clients"
+msgstr ""
+
+#: mediagoblin/plugins/openid/__init__.py:97
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
+msgid "Sorry, an account is already registered to that OpenID."
+msgstr ""
+
+#: mediagoblin/plugins/openid/forms.py:38
+msgid "OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:51
+msgid "Sorry, the OpenID server could not be found"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:64
+#, python-format
+msgid "No OpenID service was found for %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:109
+#, python-format
+msgid "Verification of %s failed: %s"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:120
+msgid "Verification cancelled"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:317
+msgid "Your OpenID url was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
+msgid "You can't delete your only OpenID URL unless you have a password set"
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
+msgid "That OpenID is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/openid/views.py:388
+msgid "OpenID was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23
+msgid "Add an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31
+msgid "Delete an OpenID"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21
+msgid "OpenID's"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
+#: mediagoblin/templates/mediagoblin/base.html:124
+#: mediagoblin/templates/mediagoblin/auth/login.html:28
+#: mediagoblin/templates/mediagoblin/auth/login.html:36
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
+msgid "Log in"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39
+#: mediagoblin/templates/mediagoblin/auth/login.html:39
+msgid "Logging in failed!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44
+msgid "Log in to create an account!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51
+msgid "Or login with a password!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23
+msgid "Or login with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23
+msgid "Or register with OpenID!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/__init__.py:90
+msgid "Sorry, an account is already registered to that Persona email."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:140
+msgid "The Persona email address was successfully removed."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:146
+msgid ""
+"You can't delete your only Persona email address unless you have a password "
+"set."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:151
+msgid "That Persona email address is not registered to this account."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:178
+msgid ""
+"Sorry, an account is already registered with that Persona email address."
+msgstr ""
+
+#: mediagoblin/plugins/persona/views.py:194
+msgid "Your Persona email address was saved successfully."
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31
+msgid "Delete a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34
+msgid "Add a Persona email address"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
+msgid "Or login with Persona!"
+msgstr ""
+
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22
+msgid "Or register with Persona!"
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:422
+msgid "Invalid file given for media type."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:429
+msgid "Copying to public storage failed."
+msgstr ""
+
+#: mediagoblin/processing/__init__.py:437
+msgid "An acceptable processing file was not found"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:140
+#, python-format
+msgid "Collection \"%s\" added!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:99
+msgid "Verify your email!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
+msgid "log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:133
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:140
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
+msgid "Media processing panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:154
+msgid "Log out"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:113
+msgid "Add media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:160
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
+msgid "Create new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:165
+msgid "Moderation powers:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:171
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:175
+msgid "Report management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:21
+msgid "Authorization"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:26
+#: mediagoblin/templates/mediagoblin/api/authorize.html:53
+msgid "Authorize"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:29
+msgid "You are logged in as"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:33
+msgid "Do you want to authorize "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:37
+msgid "an unknown application"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:39
+msgid " to access your account? "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:41
+msgid "Applications with access to your account can: "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:43
+msgid "Post new media as you"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:44
+msgid "See your information (e.g profile, media, etc...)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/authorize.html:45
+msgid "Change your information"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:21
+msgid "Authorization Finished"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:26
+msgid "Authorization Complete"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/api/oob.html:28
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:28
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
+msgid "Create an account!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:41
+msgid "Create"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:21
+#, python-format
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org/\" title='Version "
+"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
+msgid "Explore"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24
+msgid "Hi there, welcome to this MediaGoblin site!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25
+msgid ""
+"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
+"extraordinarily great piece of media hosting software."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27
+msgid ""
+"To add your own media, place comments, and more, you can log in with your "
+"MediaGoblin account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:29
+msgid "Don't have one yet? It's easy!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:36
+msgid ""
+"\n"
+"            >Create an account at this site</a>\n"
+"            or"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:42
+msgid ""
+"\n"
+"            <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/bits/logo.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23
+msgid "MediaGoblin logo"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:23
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:35
+#, python-format
+msgid "Editing attachments for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:44
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
+msgid "Attachments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
+msgid "Add attachment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/attachments.html:63
+#: mediagoblin/templates/mediagoblin/edit/edit.html:42
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
+msgid "Save changes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:23
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:33
+#, python-format
+msgid "Changing %(username)s's email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
+#, python-format
+msgid "Really delete user '%(user_name)s' and all related media/comments?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35
+msgid "Yes, really delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit.html:35
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:28
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
+msgid "Delete my account"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
+msgid "Email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29
+#, python-format
+msgid "Editing %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:67
+#, python-format
+msgid "Metadata for \"%(media_name)s\""
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:72
+msgid "MetaData"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:80
+msgid "Add new Row"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:83
+msgid "Update Metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/metadata.html:87
+msgid "Clear empty Rows"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/verification.txt:19
+#, python-format
+msgid ""
+"Hi,\n"
+"\n"
+"We wanted to verify that you are %(username)s. If this is the case, then \n"
+"please follow the link below to verify your new email address.\n"
+"\n"
+"%(verification_url)s\n"
+"\n"
+"If you are not %(username)s or didn't request an email change, you can ignore\n"
+"this email."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4
+msgid "New comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
+msgid "Mark all read"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/collection.html:30
+#: mediagoblin/templates/mediagoblin/listings/collection.html:35
+#: mediagoblin/templates/mediagoblin/listings/tag.html:30
+#: mediagoblin/templates/mediagoblin/listings/tag.html:35
+#, python-format
+msgid "Media tagged with: %(tag_name)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
+msgid "Download"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
+msgid "Original"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
+msgid ""
+"Sorry, this audio will not work because \n"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
+msgid ""
+"You can get a modern web browser that \n"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
+msgid "Original file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
+msgid "WebM file (Vorbis codec)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:36
+msgid "Created"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#, python-format
+msgid "Image for %(media_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
+msgid "PDF file"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
+msgid "Perspective"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
+msgid "Front"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
+msgid "Top"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
+msgid "Side"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
+msgid "WebGL"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
+msgid "Download model"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
+msgid "File Format"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
+msgid "Object Height"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
+msgid ""
+"Sorry, this video will not work because\n"
+"      your web browser does not support HTML5 \n"
+"      video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
+msgid ""
+"You can get a modern web browser that \n"
+"      can play this video at <a href=\"http://getfirefox.com\">\n"
+"      http://getfirefox.com</a>!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
+msgid "WebM file (VP8/Vorbis)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid ""
+"Here you can track the state of media being processed on this instance."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:38
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:67
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:98
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:39
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:68
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:99
+msgid "User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:41
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:70
+msgid "When submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:42
+msgid "Transcoding progress"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:53
+msgid "Unknown"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:71
+msgid "Reason for failure"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:72
+msgid "Failure metadata"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:101
+msgid "Submitted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:35
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:38
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:83
+#, python-format
+msgid ""
+"\n"
+"        � Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:92
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:102
+msgid "Reason for report:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:133
+#: mediagoblin/templates/mediagoblin/moderation/user.html:136
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:137
+#: mediagoblin/templates/mediagoblin/moderation/report.html:157
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:149
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:151
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:159
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:175
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:176
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:95
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:111
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:127
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:188
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:202
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:42
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:49
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:55
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:68
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:78
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+msgid "This user hasn't filled in their profile (yet)."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:74
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:96
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:81
+msgid "Browse collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:112
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:113
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:122
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:129
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:131
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:142
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:150
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:155
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:164
+#, python-format
+msgid "%(username)s's Privileges"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:172
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Granted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:180
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:182
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:213
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:218
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/collection.html:26
+msgid "Add a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:38
+#, python-format
+msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
+msgid "Add a comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
+msgid "Added"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30
+#, python-format
+msgid "%(collection_title)s (%(username)s's collection)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39
+#, python-format
+msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:23
+#, python-format
+msgid "Delete collection %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:38
+#, python-format
+msgid "Really delete collection: %(title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:23
+#, python-format
+msgid "Remove %(media_title)s from %(collection_title)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:39
+#, python-format
+msgid "Really remove %(media_title)s from %(collection_title)s?"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:62
+msgid "Remove"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21
+#, python-format
+msgid "%(username)s's collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "%(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38
+#, python-format
+msgid ""
+"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a "
+"href=\"%(tag_url)s\">%(tag)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
+#, python-format
+msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
+msgid "Comment Preview"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40
+#, python-format
+msgid "Add “%(media_title)s� to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54
+msgid "+"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58
+msgid "Add a new collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29
+msgid ""
+"You can track the state of media being processed for your gallery here."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89
+msgid "Your last 10 successful uploads"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
+#, python-format
+msgid ""
+"\n"
+"            � Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+msgid "Here's a spot to tell others about yourself."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:94
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
+msgid "Almost done! Your account still needs to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
+#, python-format
+msgid ""
+"If you are that person but you've lost your verification email, you can <a "
+"href=\"%(login_url)s\">log in</a> and resend it."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
+msgid "(remove)"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:21
+msgid "Collected in"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/collections.html:40
+msgid "Add to a collection"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:24
+msgid "Subscribe to comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/comment-subscription.html:30
+msgid "Silence comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21
+msgid "feed icon"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23
+#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23
+msgid "Atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "� Newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
+msgid "Go to page:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
+msgid "older"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/tags.html:20
+msgid "Tagged with"
+msgstr ""
+
+#: mediagoblin/tools/exif.py:83
+msgid "Could not read the image file."
+msgstr ""
+
+#: mediagoblin/tools/response.py:40
+msgid "Oops!"
+msgstr ""
+
+#: mediagoblin/tools/response.py:41
+msgid "An error occured"
+msgstr ""
+
+#: mediagoblin/tools/response.py:55
+msgid "Bad Request"
+msgstr ""
+
+#: mediagoblin/tools/response.py:57
+msgid "The request sent to the server is invalid, please double check it"
+msgstr ""
+
+#: mediagoblin/tools/response.py:65
+msgid "Operation not allowed"
+msgstr ""
+
+#: mediagoblin/tools/response.py:66
+msgid ""
+"Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
+"function that you are not allowed to. Have you been trying to delete all "
+"user accounts again?"
+msgstr ""
+
+#: mediagoblin/tools/response.py:74
+msgid ""
+"There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
+" the address is correct, maybe the page you're looking for has been moved or"
+" deleted."
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:62
+msgid "year"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:63
+msgid "month"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:64
+msgid "week"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:65
+msgid "day"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:66
+msgid "hour"
+msgstr ""
+
+#: mediagoblin/tools/timesince.py:67
+msgid "minute"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:23
+msgid "Comment"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:25
+msgid ""
+"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" "
+"target=\"_blank\">Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:35
+msgid "I am sure I want to remove this item from the collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:39
+msgid "Collection"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:40
+msgid "-- Select --"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:42
+msgid "Include a note"
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:49
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:191
+msgid "Sorry, comments are disabled."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:196
+msgid "Oops, your comment was empty."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:204
+msgid "Your comment has been posted!"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:237
+msgid "Please check your entries and try again."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:278
+msgid "You have to select or add a collection"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:289
+#, python-format
+msgid "\"%s\" already in collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:295
+#, python-format
+msgid "\"%s\" added to collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:320
+msgid "You deleted the media."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:339
+msgid "You are about to delete another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:412
+msgid "You deleted the item from the collection."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:416
+msgid "The item was not removed because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:424
+msgid ""
+"You are about to delete an item from another user's collection. Proceed with"
+" caution."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:456
+#, python-format
+msgid "You deleted the collection \"%s\""
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:463
+msgid ""
+"The collection was not deleted because you didn't check that you were sure."
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:471
+msgid ""
+"You are about to delete another user's collection. Proceed with caution."
+msgstr ""
diff --git a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 7f624285..00000000
--- a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/vi_VN/mediagoblin.po
index 063a9d65..ecf299ad 100644
--- a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/vi_VN/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/mediagoblin/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -18,67 +18,167 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr ""
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -94,7 +194,7 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -110,11 +210,11 @@ msgstr ""
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -142,125 +242,137 @@ msgstr ""
 msgid "This address contains errors"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr ""
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr ""
 
@@ -291,7 +403,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -299,58 +411,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -376,28 +488,28 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -417,7 +529,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
@@ -427,7 +539,7 @@ msgstr ""
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
@@ -554,46 +666,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -611,26 +723,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -975,11 +1087,7 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr ""
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
@@ -1046,7 +1154,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1059,8 +1167,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1068,39 +1176,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1124,7 +1232,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1156,26 +1264,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1199,15 +1307,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1226,11 +1334,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr ""
@@ -1253,26 +1361,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1280,29 +1388,29 @@ msgstr ""
 msgid "Media processing panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1356,7 +1464,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1447,13 +1555,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr ""
 
@@ -1471,6 +1579,47 @@ msgstr ""
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1496,7 +1645,7 @@ msgstr ""
 msgid "Delete my account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1550,19 +1699,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1575,38 +1711,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1614,70 +1750,70 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1762,7 +1898,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2068,17 +2204,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr ""
 
@@ -2150,12 +2286,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2314,6 +2450,10 @@ msgstr ""
 msgid "older"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2322,38 +2462,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr ""
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr ""
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2421,69 +2561,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index acf9243a..00000000
--- a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_CN/mediagoblin.po
index c8c5427f..5c5a5f4e 100644
--- a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_CN/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mediagoblin/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -23,67 +23,167 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "抱歉，本站已暂�注册。"
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "无效用户�或电�邮件地�。"
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "此字段�能填写电�邮件地�。"
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "此字段需填写电�邮件地�。"
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "抱歉，该用户�已存在。"
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "抱歉，已有用户用该电�邮件注册。"
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "您的电�邮件地�已认�。您现在�以登录�修改个人资料并上传图片了�"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "验��错误或用户 ID 错误"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "您必须登录以便让我们知�将电�邮件�给�"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "您已�认�过电�邮件地�了�"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "��认�邮件。"
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -99,7 +199,7 @@ msgid "Description of this work"
 msgstr "该作�的�述"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -115,11 +215,11 @@ msgstr "标签"
 msgid "Separate tags by commas."
 msgstr "用逗�分隔标签。"
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "简称"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "简称�能为空"
 
@@ -147,125 +247,137 @@ msgstr "网站"
 msgid "This address contains errors"
 msgstr "本网�出错了"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "当有人对我的媒体评论时给我电�邮件"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "许���好"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "这将是您上传界�的默认许��。"
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "标题�能是空的"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "这个�集的�述"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "此�集网�的标题部份，通常�需�修改。"
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "旧的密�"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "输入您的旧密���明您拥有这个账户。"
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "新密�"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "密�"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "这个简称已�被别人用了"
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "您正在修改别人的媒体，请�心�作。"
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "您加上了附件“%s��"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "您�能修改自己的个人资料"
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "您正在修改别人的个人资料，请�心�作。"
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "个人资料已修改"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "账户设置已�存"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "您需�确认删除您的账户。"
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "您已�有一个称�“%s�的�集了�"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "该用户已�有使用该简称的�集了。"
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "您正在修改别人的�集，请�心�作。"
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "密�错误"
 
@@ -296,7 +408,7 @@ msgstr "跳过“%s�；已设置过了。\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "“%s�的旧链接已�找到并移除。\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -304,58 +416,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -381,28 +493,28 @@ msgstr "�述"
 msgid "I am sure I want to delete this"
 msgstr "我确定我�删除这个媒体"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "啊哈�已�交�"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "由于您没有勾选确认，该媒体没有被移除。"
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -422,7 +534,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "编辑"
 
@@ -432,7 +544,7 @@ msgstr "编辑"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "删除"
 
@@ -559,46 +671,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -616,26 +728,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -980,11 +1092,7 @@ msgstr "��找回密�说明"
 msgid "Forgot your password?"
 msgstr "忘了密��？"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "�置"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "在 <a href=\"%(osm_url)s\">OpenStreetMap</a> 上观看"
@@ -1051,7 +1159,7 @@ msgstr "此应用程�的�定� URI，本字段在公开类型的 OAuth clie
 msgid "This field is required for public clients"
 msgstr "本字段在公开类型的 OAuth client 为必填"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "OAuth client {0} 注册完��"
 
@@ -1064,8 +1172,8 @@ msgid "Your OAuth clients"
 msgstr "您的 OAuth client"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1073,39 +1181,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1129,7 +1237,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1161,26 +1269,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1204,15 +1312,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "�供文件的媒体类型错误。"
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1231,11 +1339,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "您必须�供一个文件"
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "�集“%s�已新增�"
@@ -1258,26 +1366,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "确认您的电�邮件�"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "登出"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> 的账户"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "更改账户设置"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1285,29 +1393,29 @@ msgstr "更改账户设置"
 msgid "Media processing panel"
 msgstr "媒体处���"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "登出"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "新增媒体"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "新增�集"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1361,7 +1469,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1452,13 +1560,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "编辑 %(media_title)s 的附件"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "附件"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "新增附件"
 
@@ -1476,6 +1584,47 @@ msgstr "�存更改"
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s�"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1501,7 +1650,7 @@ msgstr "正在改� %(username)s 的账户设置"
 msgid "Delete my account"
 msgstr "删除我的�户"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1555,19 +1704,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s�"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1580,38 +1716,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr "此媒体被标记为：%(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "下载"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "�文件"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "抱歉，此声音无法播放，因为您的�览器�支� HTML5 音频。"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "您�以在 <a href=\"http://getfirefox.com\">http://getfirefox.com</a> �得�以播放此声音的�览器�"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "�文件"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM 文件（Vorbis 编�）"
 
@@ -1619,70 +1755,70 @@ msgstr "WebM 文件（Vorbis 编�）"
 msgid "Created"
 msgstr "已创建"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr "%(media_title)s 的照片"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF 文件"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "�视"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "正�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "顶�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "侧�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "下载模型"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "文件格�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "物体高度"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "抱歉，此视频无法播放，因为您的�览器�支� HTML5 视频。"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "您�以在 <a href=\"http://getfirefox.com\">http://getfirefox.com</a> �得�以播放此视频的�览器�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1767,7 +1903,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2073,17 +2209,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "新增评论"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "增加评论"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "已增加"
 
@@ -2155,12 +2291,12 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a> 的有 <a href=\"%(tag_url)s\"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a> 的媒体"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� �览 <a href=\"%(user_url)s\">%(username)s</a> 的媒体"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2319,6 +2455,10 @@ msgstr "æ›´æ–°çš„"
 msgid "older"
 msgstr "更旧的"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "�置"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2327,38 +2467,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr "标签"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "无法读�图片文件。"
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "糟糕�"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "�生错误"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "�作��许"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "对�起�兄，我�能让你这样��</p><p>您正在试��作��许您使用的功能。您难�想打算删除所有用户账户�？"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2426,69 +2566,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "抱歉，�开放评论。"
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "啊，您的评论是空的。"
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "您的评论已�张贴完��"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "请检查项目并�试。"
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "您需�选择或是新增一个�集"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "“%s�已�在“%s��集"
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "“%s�加入“%s��集"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "您已�删除此媒体。"
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "您正在删除别人的媒体，请�心�作。"
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "您已�从该�集中删除该项目。"
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "由于您没有勾选确认，该项目没有被移除。"
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "您正在从别人的�集中删除项目，请�心�作。"
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "您已�删除“%s��集。"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "由于您没有勾选确认，该�集没有被移除。"
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "您正在删除别人的�集，请�心�作。"
diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 90d89958..00000000
--- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW.Big5/mediagoblin.po
index 983880e9..6575465f 100644
--- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW.Big5/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Chinese (Taiwan) (Big5)  (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n"
 "MIME-Version: 1.0\n"
@@ -18,67 +18,167 @@ msgstr ""
 "Language: zh_TW.Big5\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr ""
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr ""
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr ""
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -94,7 +194,7 @@ msgid "Description of this work"
 msgstr ""
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -110,11 +210,11 @@ msgstr ""
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr ""
 
@@ -142,125 +242,137 @@ msgstr ""
 msgid "This address contains errors"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr ""
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr ""
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr ""
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr ""
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr ""
 
@@ -291,7 +403,7 @@ msgstr ""
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -299,58 +411,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -376,28 +488,28 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -417,7 +529,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
@@ -427,7 +539,7 @@ msgstr ""
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
@@ -554,46 +666,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr ""
 
@@ -611,26 +723,26 @@ msgstr ""
 msgid "You will not receive notifications for comments on %s."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr ""
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr ""
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr ""
 
@@ -975,11 +1087,7 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr ""
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr ""
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
@@ -1046,7 +1154,7 @@ msgstr ""
 msgid "This field is required for public clients"
 msgstr ""
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr ""
 
@@ -1059,8 +1167,8 @@ msgid "Your OAuth clients"
 msgstr ""
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr ""
 
@@ -1068,39 +1176,39 @@ msgstr ""
 msgid "OpenID"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr ""
 
@@ -1124,7 +1232,7 @@ msgstr ""
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1156,26 +1264,26 @@ msgstr ""
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr ""
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr ""
 
@@ -1199,15 +1307,15 @@ msgstr ""
 msgid "Or register with Persona!"
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr ""
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr ""
 
@@ -1226,11 +1334,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr ""
@@ -1253,26 +1361,26 @@ msgstr ""
 msgid "until %(until_when)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1280,29 +1388,29 @@ msgstr ""
 msgid "Media processing panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr ""
 
@@ -1356,7 +1464,7 @@ msgid "Authorization Complete"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
@@ -1447,13 +1555,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr ""
 
@@ -1471,6 +1579,47 @@ msgstr ""
 msgid "Changing %(username)s's email"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1496,7 +1645,7 @@ msgstr ""
 msgid "Delete my account"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr ""
 
@@ -1550,19 +1699,6 @@ msgstr ""
 msgid "New comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr ""
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr ""
@@ -1575,38 +1711,38 @@ msgstr ""
 msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr ""
 
@@ -1614,70 +1750,70 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr ""
 
@@ -1762,7 +1898,7 @@ msgid "Return to Reports Panel"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr ""
 
@@ -2068,17 +2204,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr ""
 
@@ -2150,12 +2286,12 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr ""
 
@@ -2314,6 +2450,10 @@ msgstr ""
 msgid "older"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr ""
@@ -2322,38 +2462,38 @@ msgstr ""
 msgid "Tagged with"
 msgstr ""
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr ""
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr ""
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr ""
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr ""
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr ""
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr ""
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr ""
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2421,69 +2561,69 @@ msgstr ""
 msgid "Reason for Reporting"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr ""
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
deleted file mode 100644
index 1c15a6f3..00000000
--- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
+++ /dev/null
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/mediagoblin.po
index ed25a3fd..da0a9b36 100644
--- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-04 13:45-0500\n"
-"PO-Revision-Date: 2014-08-04 18:45+0000\n"
+"POT-Creation-Date: 2015-01-16 15:13-0600\n"
+"PO-Revision-Date: 2015-01-16 21:13+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -23,67 +23,167 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: mediagoblin/decorators.py:303 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:304 mediagoblin/plugins/openid/views.py:205
 msgid "Sorry, registration is disabled on this instance."
 msgstr "抱歉，本站已經關閉註冊功能。"
 
-#: mediagoblin/decorators.py:318
+#: mediagoblin/decorators.py:319
 msgid "Sorry, reporting is disabled on this instance."
 msgstr "抱歉，本站已經關閉回報功能。"
 
-#: mediagoblin/decorators.py:361 mediagoblin/plugins/ldap/views.py:55
-#: mediagoblin/plugins/persona/views.py:77
+#: mediagoblin/decorators.py:362 mediagoblin/plugins/ldap/views.py:58
+#: mediagoblin/plugins/persona/views.py:79
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "抱歉，本站已經關閉�証。"
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "Invalid User name or email address."
 msgstr "無效的使用者�稱或 email �置。"
 
-#: mediagoblin/auth/tools.py:44
+#: mediagoblin/auth/tools.py:46
 msgid "This field does not take email addresses."
 msgstr "本欄��接� email �置。"
 
-#: mediagoblin/auth/tools.py:45
+#: mediagoblin/auth/tools.py:47
 msgid "This field requires an email address."
 msgstr "本欄�需� email �置。"
 
-#: mediagoblin/auth/tools.py:116
+#: mediagoblin/auth/tools.py:118
 msgid "Sorry, a user with that name already exists."
 msgstr "抱歉，這個使用者�稱已經存在。"
 
-#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:407
+#: mediagoblin/auth/tools.py:122 mediagoblin/edit/views.py:452
 msgid "Sorry, a user with that email address already exists."
 msgstr "抱歉，此 email �置已經被註冊了。"
 
-#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:363
-#: mediagoblin/edit/views.py:384 mediagoblin/plugins/basic_auth/views.py:110
+#: mediagoblin/auth/views.py:145 mediagoblin/edit/views.py:408
+#: mediagoblin/edit/views.py:429 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "�証金鑰或使用者 ID �正確。"
 
-#: mediagoblin/auth/views.py:161
+#: mediagoblin/auth/views.py:164
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "您的 email ��已被�證。您已經�以登入，編輯您的個人檔案並上傳圖片�"
 
-#: mediagoblin/auth/views.py:167
+#: mediagoblin/auth/views.py:170
 msgid "The verification key or user id is incorrect"
 msgstr "�證碼或是使用者 ID 錯誤"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:188
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "您必須登入，我們�知�信��給誰�"
 
-#: mediagoblin/auth/views.py:193
+#: mediagoblin/auth/views.py:196
 msgid "You've already verified your email address!"
 msgstr "您的電�郵件已經確�了�"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:206
 msgid "Resent your verification email."
 msgstr "���證信。"
 
-#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:89
+#: mediagoblin/db/mixin.py:404
+msgid "{username} added {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:405
+msgid "{username} added {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:407
+msgid "{username} authored {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:408
+msgid "{username} created {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:409
+msgid "{username} deleted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:410
+msgid "{username} disliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:411
+msgid "{username} favorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:412
+msgid "{username} followed {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:413
+msgid "{username} liked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:415
+msgid "{username} posted {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:416
+msgid "{username} posted {object} to {target}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:418
+msgid "{username} shared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:419
+msgid "{username} unfavorited {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:420
+msgid "{username} stopped following {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:421
+msgid "{username} unliked {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:422
+msgid "{username} unshared {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:423
+msgid "{username} updated {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:424
+msgid "{username} tagged {object}"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:428
+msgid "an image"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:429
+msgid "a comment"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:430
+msgid "a collection"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:431
+msgid "a video"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:432
+msgid "audio"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:433
+msgid "a person"
+msgstr ""
+
+#: mediagoblin/db/mixin.py:450 mediagoblin/db/mixin.py:459
+msgid "an object"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:90
 #: mediagoblin/media_types/blog/forms.py:24
 #: mediagoblin/media_types/blog/forms.py:33 mediagoblin/submit/forms.py:37
 #: mediagoblin/submit/forms.py:61
@@ -99,7 +199,7 @@ msgid "Description of this work"
 msgstr "這個作�的�述"
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/edit/forms.py:56
-#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:65
+#: mediagoblin/edit/forms.py:94 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
@@ -115,11 +215,11 @@ msgstr "標籤"
 msgid "Separate tags by commas."
 msgstr "用逗號分隔標籤。"
 
-#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:97
+#: mediagoblin/edit/forms.py:42 mediagoblin/edit/forms.py:98
 msgid "Slug"
 msgstr "簡稱"
 
-#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:98
+#: mediagoblin/edit/forms.py:43 mediagoblin/edit/forms.py:99
 msgid "The slug can't be empty"
 msgstr "簡稱�能為空白"
 
@@ -147,125 +247,137 @@ msgstr "網站"
 msgid "This address contains errors"
 msgstr "本網�出錯了"
 
-#: mediagoblin/edit/forms.py:67
+#: mediagoblin/edit/forms.py:64
+msgid "Hometown"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
 msgid "Email me when others comment on my media"
 msgstr "當有人�我的媒體評論時寄信給我"
 
-#: mediagoblin/edit/forms.py:69
+#: mediagoblin/edit/forms.py:70
 msgid "Enable insite notifications about events."
 msgstr "啟用活動的站內通知。"
 
-#: mediagoblin/edit/forms.py:71
+#: mediagoblin/edit/forms.py:72
 msgid "License preference"
 msgstr "授權�好"
 
-#: mediagoblin/edit/forms.py:77
+#: mediagoblin/edit/forms.py:78
 msgid "This will be your default license on upload forms."
 msgstr "在上傳��，這將會是您�設的授權模�。"
 
-#: mediagoblin/edit/forms.py:90
+#: mediagoblin/edit/forms.py:91
 msgid "The title can't be empty"
 msgstr "標題�能是空的"
 
-#: mediagoblin/edit/forms.py:92 mediagoblin/submit/forms.py:64
+#: mediagoblin/edit/forms.py:93 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "這個��的�述"
 
-#: mediagoblin/edit/forms.py:99
+#: mediagoblin/edit/forms.py:100
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "此��網�的標題部份，通常�需�修改。"
 
-#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:68
+#: mediagoblin/edit/forms.py:107 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "舊的密碼"
 
-#: mediagoblin/edit/forms.py:108 mediagoblin/plugins/basic_auth/forms.py:70
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "輸入您的舊密碼來證明您�有這個帳號。"
 
-#: mediagoblin/edit/forms.py:111 mediagoblin/plugins/basic_auth/forms.py:73
+#: mediagoblin/edit/forms.py:112 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "新密碼"
 
-#: mediagoblin/edit/forms.py:119
+#: mediagoblin/edit/forms.py:120
 msgid "New email address"
 msgstr "新的 email ��"
 
-#: mediagoblin/edit/forms.py:123 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:124 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
 #: mediagoblin/plugins/ldap/forms.py:39
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
-#: mediagoblin/tests/test_util.py:116
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:67
+#: mediagoblin/tests/test_util.py:148
 msgid "Password"
 msgstr "密碼"
 
-#: mediagoblin/edit/forms.py:125
+#: mediagoblin/edit/forms.py:126
 msgid "Enter your password to prove you own this account."
 msgstr "輸入您的密碼來證明您�有這個帳號。"
 
-#: mediagoblin/edit/forms.py:155
+#: mediagoblin/edit/forms.py:156
 msgid "Identifier"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:156
+#: mediagoblin/edit/forms.py:157
 msgid "Value"
 msgstr ""
 
-#: mediagoblin/edit/views.py:78
+#: mediagoblin/edit/views.py:80
 msgid "An entry with that slug already exists for this user."
 msgstr "這個使用者已經有使用該簡稱的項目了。"
 
-#: mediagoblin/edit/views.py:96
+#: mediagoblin/edit/views.py:98
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "您正在修改別人的媒體，請�心�作。"
 
-#: mediagoblin/edit/views.py:166
+#: mediagoblin/edit/views.py:168
 #, python-format
 msgid "You added the attachment %s!"
 msgstr "您加上了附件「%s��"
 
-#: mediagoblin/edit/views.py:193
+#: mediagoblin/edit/views.py:195
 msgid "You can only edit your own profile."
 msgstr "您�能修改您自己的個人檔案。"
 
-#: mediagoblin/edit/views.py:199
+#: mediagoblin/edit/views.py:201
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "您正在修改別人的個人檔案，請�心�作。"
 
-#: mediagoblin/edit/views.py:215
+#: mediagoblin/edit/views.py:232
 msgid "Profile changes saved"
 msgstr "個人檔案修改已儲存"
 
-#: mediagoblin/edit/views.py:248
+#: mediagoblin/edit/views.py:265
 msgid "Account settings saved"
 msgstr "帳號設定已儲存"
 
-#: mediagoblin/edit/views.py:282
+#: mediagoblin/edit/views.py:286
+msgid "Unknown application, not able to deauthorize"
+msgstr ""
+
+#: mediagoblin/edit/views.py:293
+msgid "Application has been deauthorized"
+msgstr ""
+
+#: mediagoblin/edit/views.py:327
 msgid "You need to confirm the deletion of your account."
 msgstr "您必須�確�是�刪除您的帳號。"
 
-#: mediagoblin/edit/views.py:318 mediagoblin/submit/views.py:132
-#: mediagoblin/user_pages/views.py:252
+#: mediagoblin/edit/views.py:363 mediagoblin/submit/views.py:134
+#: mediagoblin/user_pages/views.py:254
 #, python-format
 msgid "You already have a collection called \"%s\"!"
 msgstr "您已經有一個稱�「%s�的��了�"
 
-#: mediagoblin/edit/views.py:322
+#: mediagoblin/edit/views.py:367
 msgid "A collection with that slug already exists for this user."
 msgstr "這個使用者已經有使用該簡稱的��了。"
 
-#: mediagoblin/edit/views.py:337
+#: mediagoblin/edit/views.py:382
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "您正在修改別人的��，請�心�作。"
 
-#: mediagoblin/edit/views.py:378
+#: mediagoblin/edit/views.py:423
 msgid "Your email address has been verified."
 msgstr "您的 email ��已�証。"
 
-#: mediagoblin/edit/views.py:413 mediagoblin/plugins/basic_auth/views.py:200
+#: mediagoblin/edit/views.py:458 mediagoblin/plugins/basic_auth/views.py:200
 msgid "Wrong password"
 msgstr "密碼錯誤"
 
@@ -296,7 +408,7 @@ msgstr "跳�「%s�，已經建置完�。\n"
 msgid "Old link found for \"%s\"; removing.\n"
 msgstr "找到「%s�舊的連�，刪除中。\n"
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:34
+#: mediagoblin/gmg_commands/batchaddmedia.py:40
 msgid ""
 "For more information about how to properly run this\n"
 "script (and how to format the metadata csv file), read the MediaGoblin\n"
@@ -304,58 +416,58 @@ msgid ""
 "<http://docs.mediagoblin.org/siteadmin/commandline-upload.html>"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:40
+#: mediagoblin/gmg_commands/batchaddmedia.py:46
 msgid "Name of user these media entries belong to"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:43
+#: mediagoblin/gmg_commands/batchaddmedia.py:49
 msgid "Path to the csv file containing metadata information."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:48
+#: mediagoblin/gmg_commands/batchaddmedia.py:54
 msgid "Don't process eagerly, pass off to celery"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:63
+#: mediagoblin/gmg_commands/batchaddmedia.py:69
 msgid "Sorry, no user by username '{username}' exists"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:74
+#: mediagoblin/gmg_commands/batchaddmedia.py:80
 msgid "File at {path} not found, use -h flag for help"
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:115
+#: mediagoblin/gmg_commands/batchaddmedia.py:121
 msgid ""
 "Error with media '{media_id}' value '{error_path}': {error_msg}\n"
 "Metadata was not uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:141
+#: mediagoblin/gmg_commands/batchaddmedia.py:147
 msgid ""
 "FAIL: Local file {filename} could not be accessed.\n"
 "{filename} will not be uploaded."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:157
+#: mediagoblin/gmg_commands/batchaddmedia.py:163
 msgid ""
 "Successfully submitted {filename}!\n"
 "Be sure to look at the Media Processing Panel on your website to be sure it\n"
 "uploaded successfully."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:160
+#: mediagoblin/gmg_commands/batchaddmedia.py:166
 msgid "FAIL: This file is larger than the upload limits for this site."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:163
+#: mediagoblin/gmg_commands/batchaddmedia.py:169
 msgid "FAIL: This file will put this user past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:166
+#: mediagoblin/gmg_commands/batchaddmedia.py:172
 msgid "FAIL: This user is already past their upload limits."
 msgstr ""
 
-#: mediagoblin/gmg_commands/batchaddmedia.py:168
+#: mediagoblin/gmg_commands/batchaddmedia.py:174
 msgid "{files_uploaded} out of {files_attempted} files successfully submitted"
 msgstr ""
 
@@ -381,28 +493,28 @@ msgstr "�述"
 msgid "I am sure I want to delete this"
 msgstr "我確定我�刪除這個媒體"
 
-#: mediagoblin/media_types/blog/views.py:156 mediagoblin/submit/views.py:69
+#: mediagoblin/media_types/blog/views.py:158 mediagoblin/submit/views.py:71
 msgid "Woohoo! Submitted!"
 msgstr "啊哈�PO 上去啦�"
 
-#: mediagoblin/media_types/blog/views.py:198
+#: mediagoblin/media_types/blog/views.py:200
 msgid "Woohoo! edited blogpost is submitted"
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:320
+#: mediagoblin/media_types/blog/views.py:322
 msgid "You deleted the Blog."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:326
-#: mediagoblin/user_pages/views.py:329
+#: mediagoblin/media_types/blog/views.py:328
+#: mediagoblin/user_pages/views.py:332
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "由於您沒有勾�確�，該媒體沒有被移除。"
 
-#: mediagoblin/media_types/blog/views.py:333
+#: mediagoblin/media_types/blog/views.py:335
 msgid "You are about to delete another user's Blog. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/media_types/blog/views.py:344
+#: mediagoblin/media_types/blog/views.py:346
 msgid "The blog was not deleted because you have no rights."
 msgstr ""
 
@@ -422,7 +534,7 @@ msgstr ""
 #: mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html:35
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:76
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:84
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "編輯"
 
@@ -432,7 +544,7 @@ msgstr "編輯"
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:80
 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:88
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "刪除"
 
@@ -559,46 +671,46 @@ msgstr ""
 msgid "Resolution content:"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:34
+#: mediagoblin/moderation/tools.py:37
 msgid ""
 "\n"
 "{mod} took away {user}'s {privilege} privileges."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:47
+#: mediagoblin/moderation/tools.py:50
 msgid ""
 "\n"
 "{mod} banned user {user} {expiration_date}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:51
+#: mediagoblin/moderation/tools.py:54
 msgid "until {date}"
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:53
+#: mediagoblin/moderation/tools.py:56
 #: mediagoblin/templates/mediagoblin/banned.html:30
 msgid "indefinitely"
 msgstr "永久�鎖了"
 
-#: mediagoblin/moderation/tools.py:62
+#: mediagoblin/moderation/tools.py:65
 msgid ""
 "\n"
 "{mod} sent a warning email to the {user}."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:71
+#: mediagoblin/moderation/tools.py:74
 msgid ""
 "\n"
 "{mod} deleted the comment."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:78
+#: mediagoblin/moderation/tools.py:81
 msgid ""
 "\n"
 "{mod} deleted the media entry."
 msgstr ""
 
-#: mediagoblin/moderation/tools.py:91
+#: mediagoblin/moderation/tools.py:94
 msgid "Warning from"
 msgstr "警告，來自"
 
@@ -616,26 +728,26 @@ msgstr "已訂閱 %s 的評論�"
 msgid "You will not receive notifications for comments on %s."
 msgstr "您將�會收到 %s 的評論通知。"
 
-#: mediagoblin/oauth/views.py:242
+#: mediagoblin/oauth/views.py:239
 msgid "Must provide an oauth_token."
 msgstr "必須�供 oauth_token。"
 
-#: mediagoblin/oauth/views.py:247 mediagoblin/oauth/views.py:298
+#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:295
 msgid "No request token found."
 msgstr "找�到請求的 token。"
 
-#: mediagoblin/plugins/api/views.py:76 mediagoblin/plugins/piwigo/views.py:155
-#: mediagoblin/submit/views.py:78
+#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:157
+#: mediagoblin/submit/views.py:80
 msgid "Sorry, the file size is too big."
 msgstr "抱歉，檔案太大了。"
 
-#: mediagoblin/plugins/api/views.py:79 mediagoblin/plugins/piwigo/views.py:158
-#: mediagoblin/submit/views.py:81
+#: mediagoblin/plugins/api/views.py:81 mediagoblin/plugins/piwigo/views.py:160
+#: mediagoblin/submit/views.py:83
 msgid "Sorry, uploading this file will put you over your upload limit."
 msgstr "抱歉，上傳該檔案將會超�您的上傳�制。"
 
-#: mediagoblin/plugins/api/views.py:83 mediagoblin/plugins/piwigo/views.py:162
-#: mediagoblin/submit/views.py:87
+#: mediagoblin/plugins/api/views.py:85 mediagoblin/plugins/piwigo/views.py:164
+#: mediagoblin/submit/views.py:89
 msgid "Sorry, you have reached your upload limit."
 msgstr "抱歉，您已經碰到了您的上傳�制。"
 
@@ -980,11 +1092,7 @@ msgstr "�出指示"
 msgid "Forgot your password?"
 msgstr "忘了密碼嗎？"
 
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
-msgid "Location"
-msgstr "�置"
-
-#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52
+#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:51
 #, python-format
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "在 <a href=\"%(osm_url)s\">OpenStreetMap</a> 上觀看"
@@ -1051,7 +1159,7 @@ msgstr "此應用程å¼�çš„é‡�定å�‘ URI，本欄ä½�在公開類型的 OAuth 用æ
 msgid "This field is required for public clients"
 msgstr "本欄�在公開類型的用戶程�為必填"
 
-#: mediagoblin/plugins/oauth/views.py:55
+#: mediagoblin/plugins/oauth/views.py:57
 msgid "The client {0} has been registered!"
 msgstr "OAuth 用戶程� {0} 註冊完��"
 
@@ -1064,8 +1172,8 @@ msgid "Your OAuth clients"
 msgstr "您的 OAuth 用戶程�"
 
 #: mediagoblin/plugins/openid/__init__.py:97
-#: mediagoblin/plugins/openid/views.py:268
-#: mediagoblin/plugins/openid/views.py:297
+#: mediagoblin/plugins/openid/views.py:271
+#: mediagoblin/plugins/openid/views.py:300
 msgid "Sorry, an account is already registered to that OpenID."
 msgstr "抱歉，有帳號已經登記了您輸入的 OpenID。"
 
@@ -1073,39 +1181,39 @@ msgstr "抱歉，有帳號已經登記了您輸入的 OpenID。"
 msgid "OpenID"
 msgstr "OpenID"
 
-#: mediagoblin/plugins/openid/views.py:48
+#: mediagoblin/plugins/openid/views.py:51
 msgid "Sorry, the OpenID server could not be found"
 msgstr "抱歉，找�到 OpenID 伺�器"
 
-#: mediagoblin/plugins/openid/views.py:61
+#: mediagoblin/plugins/openid/views.py:64
 #, python-format
 msgid "No OpenID service was found for %s"
 msgstr "找�到 %s 的 OpenID �務"
 
-#: mediagoblin/plugins/openid/views.py:106
+#: mediagoblin/plugins/openid/views.py:109
 #, python-format
 msgid "Verification of %s failed: %s"
 msgstr "%s 的�証失敗：%s"
 
-#: mediagoblin/plugins/openid/views.py:117
+#: mediagoblin/plugins/openid/views.py:120
 msgid "Verification cancelled"
 msgstr "�証已�消"
 
-#: mediagoblin/plugins/openid/views.py:314
+#: mediagoblin/plugins/openid/views.py:317
 msgid "Your OpenID url was saved successfully."
 msgstr "您的 OpenID url 已�功儲存。"
 
-#: mediagoblin/plugins/openid/views.py:338
-#: mediagoblin/plugins/openid/views.py:393
+#: mediagoblin/plugins/openid/views.py:341
+#: mediagoblin/plugins/openid/views.py:396
 msgid "You can't delete your only OpenID URL unless you have a password set"
 msgstr "除�您設定了帳號的密碼，您無法刪除帳號下唯一的 OpenID URL"
 
-#: mediagoblin/plugins/openid/views.py:343
-#: mediagoblin/plugins/openid/views.py:402
+#: mediagoblin/plugins/openid/views.py:346
+#: mediagoblin/plugins/openid/views.py:405
 msgid "That OpenID is not registered to this account."
 msgstr "OpenID 尚未登記到此帳號"
 
-#: mediagoblin/plugins/openid/views.py:385
+#: mediagoblin/plugins/openid/views.py:388
 msgid "OpenID was successfully removed."
 msgstr "OpenID 已�功移除。"
 
@@ -1129,7 +1237,7 @@ msgstr "OpenID"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:122
+#: mediagoblin/templates/mediagoblin/base.html:124
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
 #: mediagoblin/templates/mediagoblin/auth/login.html:47
@@ -1161,26 +1269,26 @@ msgstr "或是使用 OpenID 註冊�"
 msgid "Sorry, an account is already registered to that Persona email."
 msgstr "抱歉，有帳號已經登記了您輸入的 Persona email。"
 
-#: mediagoblin/plugins/persona/views.py:138
+#: mediagoblin/plugins/persona/views.py:140
 msgid "The Persona email address was successfully removed."
 msgstr "Persona email ��已�功移除。"
 
-#: mediagoblin/plugins/persona/views.py:144
+#: mediagoblin/plugins/persona/views.py:146
 msgid ""
 "You can't delete your only Persona email address unless you have a password "
 "set."
 msgstr "除�您設定了帳號的密碼，您無法刪除帳號下唯一的 Persona email ��。"
 
-#: mediagoblin/plugins/persona/views.py:149
+#: mediagoblin/plugins/persona/views.py:151
 msgid "That Persona email address is not registered to this account."
 msgstr "該 Persona email ��尚未登記到此帳號。"
 
-#: mediagoblin/plugins/persona/views.py:176
+#: mediagoblin/plugins/persona/views.py:178
 msgid ""
 "Sorry, an account is already registered with that Persona email address."
 msgstr "抱歉，有帳號已經登記了您輸入的 Persona email ��。"
 
-#: mediagoblin/plugins/persona/views.py:192
+#: mediagoblin/plugins/persona/views.py:194
 msgid "Your Persona email address was saved successfully."
 msgstr "您的 Persona email ��已�功儲存"
 
@@ -1204,15 +1312,15 @@ msgstr "或是使用 Persona 登入�"
 msgid "Or register with Persona!"
 msgstr "或是使用 Persona 註冊�"
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "指定錯誤的媒體類別�"
 
-#: mediagoblin/processing/__init__.py:427
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "複製到公有存儲失敗。"
 
-#: mediagoblin/processing/__init__.py:435
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "找�到�收�的待處�檔案"
 
@@ -1231,11 +1339,11 @@ msgid ""
 "                        Markdown</a> for formatting."
 msgstr "您�以使用\n<a href=\"http://markdown.tw\">\nMarkdown</a> 來排版。"
 
-#: mediagoblin/submit/views.py:55
+#: mediagoblin/submit/views.py:57
 msgid "You must provide a file."
 msgstr "您必須�供一個檔案"
 
-#: mediagoblin/submit/views.py:138
+#: mediagoblin/submit/views.py:140
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "��「%s�新增完��"
@@ -1258,26 +1366,26 @@ msgstr "您被"
 msgid "until %(until_when)s"
 msgstr "�鎖了，會在 %(until_when)s 解除"
 
-#: mediagoblin/templates/mediagoblin/base.html:97
+#: mediagoblin/templates/mediagoblin/base.html:99
 msgid "Verify your email!"
 msgstr "確�您的電�郵件"
 
-#: mediagoblin/templates/mediagoblin/base.html:104
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:106
+#: mediagoblin/templates/mediagoblin/base.html:114
 msgid "log out"
 msgstr "登出"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:133
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> 的帳號"
 
-#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/base.html:140
 msgid "Change account settings"
 msgstr "更改帳號設定"
 
-#: mediagoblin/templates/mediagoblin/base.html:142
-#: mediagoblin/templates/mediagoblin/base.html:165
+#: mediagoblin/templates/mediagoblin/base.html:144
+#: mediagoblin/templates/mediagoblin/base.html:167
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
 #: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
@@ -1285,29 +1393,29 @@ msgstr "更改帳號設定"
 msgid "Media processing panel"
 msgstr "媒體處���"
 
-#: mediagoblin/templates/mediagoblin/base.html:152
+#: mediagoblin/templates/mediagoblin/base.html:154
 msgid "Log out"
 msgstr "登出"
 
-#: mediagoblin/templates/mediagoblin/base.html:155
+#: mediagoblin/templates/mediagoblin/base.html:157
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:113
 msgid "Add media"
 msgstr "新增媒體"
 
-#: mediagoblin/templates/mediagoblin/base.html:158
+#: mediagoblin/templates/mediagoblin/base.html:160
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "新增新的��"
 
-#: mediagoblin/templates/mediagoblin/base.html:163
+#: mediagoblin/templates/mediagoblin/base.html:165
 msgid "Moderation powers:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:169
+#: mediagoblin/templates/mediagoblin/base.html:171
 msgid "User management panel"
 msgstr "使用者管���"
 
-#: mediagoblin/templates/mediagoblin/base.html:173
+#: mediagoblin/templates/mediagoblin/base.html:175
 msgid "Report management panel"
 msgstr "回報管���"
 
@@ -1361,8 +1469,8 @@ msgid "Authorization Complete"
 msgstr "�証完�"
 
 #: mediagoblin/templates/mediagoblin/api/oob.html:28
-msgid "Copy and paste this into your client:"
-msgstr "請將以下文字複製並貼到應用程�上："
+msgid "Copy and paste this <strong>verifier code</strong> into your client:"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
@@ -1452,13 +1560,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "編輯 %(media_title)s 的附件"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:204
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:220
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:205
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:221
 msgid "Attachments"
 msgstr "附件"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:226
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:227
 msgid "Add attachment"
 msgstr "新增附件"
 
@@ -1476,6 +1584,47 @@ msgstr "儲存變更"
 msgid "Changing %(username)s's email"
 msgstr "更改 %(username)s 的 email ��"
 
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:21
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+msgid "Deauthorize applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:27
+msgid "Deauthorize Applications"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:28
+msgid ""
+"These applications can access your GNU MediaGoblin account. Deauthorizing the\n"
+"    application will prevent the application from accessing your account."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:37
+msgid "There are no applications authorized."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:53
+msgid "Type:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:58
+msgid "Authorized:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html:60
+#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
+#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:57
+#: mediagoblin/templates/mediagoblin/moderation/report.html:120
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
+#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:147
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:182
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
+#, python-format
+msgid "%(formatted_time)s ago"
+msgstr "%(formatted_time)s �"
+
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -1501,7 +1650,7 @@ msgstr "正在改變 %(username)s 的帳號設定"
 msgid "Delete my account"
 msgstr "刪除我的帳號"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62
 msgid "Email"
 msgstr "Email"
 
@@ -1555,19 +1704,6 @@ msgstr "您好：\n\n我們�確�您是 %(username)s 。如果確實如此，
 msgid "New comments"
 msgstr "æ–°çš„è©•è«–"
 
-#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
-#: mediagoblin/templates/mediagoblin/media_displays/image.html:39
-#: mediagoblin/templates/mediagoblin/moderation/report.html:57
-#: mediagoblin/templates/mediagoblin/moderation/report.html:120
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:131
-#: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:151
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:146
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:181
-#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
-#, python-format
-msgid "%(formatted_time)s ago"
-msgstr "%(formatted_time)s �"
-
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41
 msgid "Mark all read"
 msgstr "全部標示為已讀"
@@ -1580,38 +1716,38 @@ msgstr "全部標示為已讀"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "這個媒體具有以下標籤：%(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:58
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:76
 msgid "Download"
 msgstr "下載"
 
-#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:40
 msgid "Original"
 msgstr "原始檔"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:45
 msgid ""
 "Sorry, this audio will not work because \n"
-"\tyour web browser does not support HTML5 \n"
-"\taudio."
-msgstr "抱歉，此�音無法播放，因為您的�覽器�支� HTML5 音訊。"
+"\t  your web browser does not support HTML5 \n"
+"\t  audio."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:48
 msgid ""
 "You can get a modern web browser that \n"
-"\tcan play the audio at <a href=\"http://getfirefox.com\">\n"
-"\t  http://getfirefox.com</a>!"
-msgstr "您�以在 <a href=\"http://getfirefox.com\">http://getfirefox.com</a> �得�以播放此�音的�覽器�"
+"\t  can play the audio at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:62
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:75
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:82
 msgid "Original file"
 msgstr "原始檔案"
 
-#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/audio.html:65
 msgid "WebM file (Vorbis codec)"
 msgstr "WebM 檔案 (Vorbis 編碼)"
 
@@ -1619,70 +1755,70 @@ msgstr "WebM 檔案 (Vorbis 編碼)"
 msgid "Created"
 msgstr "建立於"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:90
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:96
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:102
 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:108
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:59
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:65
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:62
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:68
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:63
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
 #, python-format
 msgid "Image for %(media_title)s"
 msgstr " %(media_title)s 的照片"
 
-#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81
+#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:83
 msgid "PDF file"
 msgstr "PDF 檔"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117
 msgid "Perspective"
 msgstr "�視"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:119
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120
 msgid "Front"
 msgstr "正�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:122
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:123
 msgid "Top"
 msgstr "頂�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126
 msgid "Side"
 msgstr "��"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131
 msgid "WebGL"
 msgstr "WebGL"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:137
 msgid "Download model"
 msgstr "下載模型"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:145
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146
 msgid "File Format"
 msgstr "檔案格�"
 
-#: mediagoblin/templates/mediagoblin/media_displays/stl.html:147
+#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148
 msgid "Object Height"
 msgstr "物件高度"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:64
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "抱歉，由於您的�覽器�支� HTML5 影片，本影片無法播放"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:67
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "您�以在 <a href=\"http://getfirefox.com\">http://getfirefox.com</a> �得�以播放此影片的先進�覽器。"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:90
 msgid "WebM file (VP8/Vorbis)"
 msgstr "WebM 檔案 (VP8/Vorbis)"
 
@@ -1767,7 +1903,7 @@ msgid "Return to Reports Panel"
 msgstr "回到回報��"
 
 #: mediagoblin/templates/mediagoblin/moderation/report.html:35
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:162
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:163
 msgid "Report"
 msgstr "回報"
 
@@ -2073,17 +2209,17 @@ msgid "� Blog post by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:92
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:105
 msgid "Add a comment"
 msgstr "新增評論"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:103
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:115
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr "增加評論"
 
 #: mediagoblin/templates/mediagoblin/user_pages/blog_media.html:149
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:179
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:180
 msgid "Added"
 msgstr "新增於"
 
@@ -2155,12 +2291,12 @@ msgstr "標籤為 <a href=\"%(tag_url)s\">%(tag)s</a> 的 <a href=\"%(user_url)s
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a> 的媒體"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:38
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:39
 #, python-format
 msgid "� Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr "� �覽 <a href=\"%(user_url)s\">%(username)s</a> 的媒體"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:120
 msgid "Comment Preview"
 msgstr "評論�覽"
 
@@ -2319,6 +2455,10 @@ msgstr "æ›´æ–°çš„"
 msgid "older"
 msgstr "更舊的"
 
+#: mediagoblin/templates/mediagoblin/utils/profile.html:36
+msgid "Location"
+msgstr "�置"
+
 #: mediagoblin/templates/mediagoblin/utils/report.html:25
 msgid "Report media"
 msgstr "回報媒體"
@@ -2327,38 +2467,38 @@ msgstr "回報媒體"
 msgid "Tagged with"
 msgstr "標籤"
 
-#: mediagoblin/tools/exif.py:81
+#: mediagoblin/tools/exif.py:83
 msgid "Could not read the image file."
 msgstr "無法讀�圖片檔案。"
 
-#: mediagoblin/tools/response.py:38
+#: mediagoblin/tools/response.py:40
 msgid "Oops!"
 msgstr "糟糕�"
 
-#: mediagoblin/tools/response.py:39
+#: mediagoblin/tools/response.py:41
 msgid "An error occured"
 msgstr "發生錯誤"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "Bad Request"
 msgstr "錯誤的請求"
 
-#: mediagoblin/tools/response.py:55
+#: mediagoblin/tools/response.py:57
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "傳�到此伺�器的請求無效，請�三確�"
 
-#: mediagoblin/tools/response.py:63
+#: mediagoblin/tools/response.py:65
 msgid "Operation not allowed"
 msgstr "�作��許"
 
-#: mediagoblin/tools/response.py:64
+#: mediagoblin/tools/response.py:66
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "Dave ��起，我�能讓你這樣��</p><p>您正在試著�作��許您使用的功能。您打算刪除所有使用者的帳號嗎？"
 
-#: mediagoblin/tools/response.py:72
+#: mediagoblin/tools/response.py:74
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -2426,69 +2566,69 @@ msgstr "您�以使用\n<a href=\"http://markdown.tw\" target=\"_blank\">\nMark
 msgid "Reason for Reporting"
 msgstr "回報�由"
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:191
 msgid "Sorry, comments are disabled."
 msgstr "抱歉，評論被關閉了。"
 
-#: mediagoblin/user_pages/views.py:193
+#: mediagoblin/user_pages/views.py:196
 msgid "Oops, your comment was empty."
 msgstr "啊，您的評論是空的。"
 
-#: mediagoblin/user_pages/views.py:199
+#: mediagoblin/user_pages/views.py:204
 msgid "Your comment has been posted!"
 msgstr "您的評論已經張貼完��"
 
-#: mediagoblin/user_pages/views.py:235
+#: mediagoblin/user_pages/views.py:237
 msgid "Please check your entries and try again."
 msgstr "請檢查項目並�試。"
 
-#: mediagoblin/user_pages/views.py:275
+#: mediagoblin/user_pages/views.py:278
 msgid "You have to select or add a collection"
 msgstr "您需��擇或是新增一個��"
 
-#: mediagoblin/user_pages/views.py:286
+#: mediagoblin/user_pages/views.py:289
 #, python-format
 msgid "\"%s\" already in collection \"%s\""
 msgstr "「%s�已經在「%s���"
 
-#: mediagoblin/user_pages/views.py:292
+#: mediagoblin/user_pages/views.py:295
 #, python-format
 msgid "\"%s\" added to collection \"%s\""
 msgstr "「%s�加入「%s���"
 
-#: mediagoblin/user_pages/views.py:317
+#: mediagoblin/user_pages/views.py:320
 msgid "You deleted the media."
 msgstr "您已經刪除此媒體。"
 
-#: mediagoblin/user_pages/views.py:336
+#: mediagoblin/user_pages/views.py:339
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "您正在刪除別人的媒體，請�心�作。"
 
-#: mediagoblin/user_pages/views.py:409
+#: mediagoblin/user_pages/views.py:412
 msgid "You deleted the item from the collection."
 msgstr "您已經從該��中刪除該項目。"
 
-#: mediagoblin/user_pages/views.py:413
+#: mediagoblin/user_pages/views.py:416
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "由於您沒有勾�確�，該項目沒有被移除。"
 
-#: mediagoblin/user_pages/views.py:421
+#: mediagoblin/user_pages/views.py:424
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "您正在從別人的��中刪除項目，請�心�作。"
 
-#: mediagoblin/user_pages/views.py:453
+#: mediagoblin/user_pages/views.py:456
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "您已經刪除「%s���。"
 
-#: mediagoblin/user_pages/views.py:460
+#: mediagoblin/user_pages/views.py:463
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "由於您沒有勾�確�，該��沒有被移除。"
 
-#: mediagoblin/user_pages/views.py:468
+#: mediagoblin/user_pages/views.py:471
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "您正在刪除別人的��，請�心�作。"
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index e0711416..38ec1260 100644
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -28,6 +28,8 @@ from mediagoblin.tools.pluginapi import hook_runall
 from mediagoblin.tools.workbench import WorkbenchManager
 from mediagoblin.storage import storage_system_from_config
 
+from mediagoblin.tools.transition import DISABLE_GLOBALS
+
 
 class Error(Exception):
     pass
@@ -58,14 +60,16 @@ def setup_global_and_app_config(config_path):
     return global_config, app_config
 
 
-def setup_database(run_migrations=False):
-    app_config = mg_globals.app_config
-    global_config = mg_globals.global_config
+def setup_database(app):
+    app_config = app.app_config
+    global_config = app.global_config
+    run_migrations = app_config['run_migrations']
 
     # Load all models for media types (plugins, ...)
     load_models(app_config)
     # Set up the database
-    db = setup_connection_and_db_from_config(app_config, run_migrations)
+    db = setup_connection_and_db_from_config(
+        app_config, run_migrations, app=app)
     if run_migrations:
         #Run the migrations to initialize/update the database.
         from mediagoblin.gmg_commands.dbupdate import run_all_migrations
@@ -154,4 +158,7 @@ def setup_workbench():
 
     workbench_manager = WorkbenchManager(app_config['workbench_path'])
 
-    setup_globals(workbench_manager=workbench_manager)
+    if not DISABLE_GLOBALS:
+        setup_globals(workbench_manager=workbench_manager)
+
+    return workbench_manager
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py
index fa1749e9..780e0055 100644
--- a/mediagoblin/init/celery/__init__.py
+++ b/mediagoblin/init/celery/__init__.py
@@ -19,6 +19,8 @@ import sys
 import datetime
 import logging
 
+import six
+
 from celery import Celery
 from mediagoblin.tools.pluginapi import hook_runall
 
@@ -48,7 +50,7 @@ def get_celery_settings_dict(app_config, global_config,
     celery_settings = {}
 
     # Add all celery settings from config
-    for key, value in celery_conf.iteritems():
+    for key, value in six.iteritems(celery_conf):
         celery_settings[key] = value
 
     # TODO: use default result stuff here if it exists
@@ -113,7 +115,7 @@ def setup_celery_from_config(app_config, global_config,
     __import__(settings_module)
     this_module = sys.modules[settings_module]
 
-    for key, value in celery_settings.iteritems():
+    for key, value in six.iteritems(celery_settings):
         setattr(this_module, key, value)
 
     if set_environ:
diff --git a/mediagoblin/init/config.py b/mediagoblin/init/config.py
index 11a91cff..a9189e8d 100644
--- a/mediagoblin/init/config.py
+++ b/mediagoblin/init/config.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import copy
 import logging
 import os
 import pkg_resources
@@ -29,16 +30,21 @@ CONFIG_SPEC_PATH = pkg_resources.resource_filename(
     'mediagoblin', 'config_spec.ini')
 
 
-def _setup_defaults(config, config_path):
+def _setup_defaults(config, config_path, extra_defaults=None):
     """
     Setup DEFAULTS in a config object from an (absolute) config_path.
     """
+    extra_defaults = extra_defaults or {}
+
     config.setdefault('DEFAULT', {})
     config['DEFAULT']['here'] = os.path.dirname(config_path)
     config['DEFAULT']['__file__'] = config_path
 
+    for key, value in extra_defaults.items():
+        config['DEFAULT'].setdefault(key, value)
+
 
-def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
+def read_mediagoblin_config(config_path, config_spec_path=CONFIG_SPEC_PATH):
     """
     Read a config object from config_path.
 
@@ -54,7 +60,7 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
 
     Args:
      - config_path: path to the config file
-     - config_spec: config file that provides defaults and value types
+     - config_spec_path: config file that provides defaults and value types
        for validation / conversion.  Defaults to mediagoblin/config_spec.ini
 
     Returns:
@@ -68,7 +74,20 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
     # we can add their plugin specs to the general config_spec.
     config = ConfigObj(
         config_path,
-        interpolation='ConfigParser')
+        interpolation="ConfigParser")
+
+    # temporary bootstrap, just setup here and __file__... we'll do this again
+    _setup_defaults(config, config_path)
+
+    # Now load the main config spec
+    config_spec = ConfigObj(
+        config_spec_path,
+        encoding="UTF8", list_values=False, _inspec=True)
+
+    # Set up extra defaults that will be pushed into the rest of the
+    # configs.  This is a combined extrapolation of defaults based on
+    mainconfig_defaults = copy.copy(config_spec.get("DEFAULT", {}))
+    mainconfig_defaults.update(config["DEFAULT"])
 
     plugins = config.get("plugins", {}).keys()
     plugin_configs = {}
@@ -79,11 +98,12 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
                 plugin, "config_spec.ini")
             if not os.path.exists(plugin_config_spec_path):
                 continue
-            
+
             plugin_config_spec = ConfigObj(
                 plugin_config_spec_path,
-                encoding='UTF8', list_values=False, _inspec=True)
-            _setup_defaults(plugin_config_spec, config_path)
+                encoding="UTF8", list_values=False, _inspec=True)
+            _setup_defaults(
+                plugin_config_spec, config_path, mainconfig_defaults)
 
             if not "plugin_spec" in plugin_config_spec:
                 continue
@@ -94,23 +114,18 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
             _log.warning(
                 "When setting up config section, could not import '%s'" %
                 plugin)
-    
-    # Now load the main config spec
-    config_spec = ConfigObj(
-        config_spec,
-        encoding='UTF8', list_values=False, _inspec=True)
 
     # append the plugin specific sections of the config spec
-    config_spec['plugins'] = plugin_configs
+    config_spec["plugins"] = plugin_configs
 
-    _setup_defaults(config_spec, config_path)
+    _setup_defaults(config_spec, config_path, mainconfig_defaults)
 
     config = ConfigObj(
         config_path,
         configspec=config_spec,
-        interpolation='ConfigParser')
+        interpolation="ConfigParser")
 
-    _setup_defaults(config, config_path)
+    _setup_defaults(config, config_path, mainconfig_defaults)
 
     # For now the validator just works with the default functions,
     # but in the future if we want to add additional validation/configuration
diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py
index 2e392317..3eeead86 100644
--- a/mediagoblin/media_types/__init__.py
+++ b/mediagoblin/media_types/__init__.py
@@ -16,6 +16,7 @@
 
 import os
 import logging
+import shutil
 import tempfile
 
 from mediagoblin.tools.pluginapi import hook_handle
@@ -23,10 +24,18 @@ from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 
 _log = logging.getLogger(__name__)
 
+
 class FileTypeNotSupported(Exception):
     pass
 
-class InvalidFileType(Exception):
+
+class TypeNotFound(FileTypeNotSupported):
+    '''Raised if no mediagoblin plugin supporting this file type was found'''
+    pass
+
+
+class MissingComponents(FileTypeNotSupported):
+    '''Raised if plugin found, but it can't process the file for some reason'''
     pass
 
 
@@ -50,40 +59,30 @@ class MediaManagerBase(object):
         return hasattr(self, i)
 
 
-def sniff_media(media_file, filename):
+def sniff_media_contents(media_file, filename):
     '''
-    Iterate through the enabled media types and find those suited
-    for a certain file.
+    Check media contents using 'expensive' scanning. For example, for video it
+    is checking the contents using gstreamer
+    :param media_file: file-like object with 'name' attribute
+    :param filename: expected filename of the media
     '''
-
-    try:
-        return get_media_type_and_manager(filename)
-    except FileTypeNotSupported:
-        _log.info('No media handler found by file extension. Doing it the expensive way...')
-        # Create a temporary file for sniffers suchs as GStreamer-based
-        # Audio video
-        tmp_media_file = tempfile.NamedTemporaryFile()
-        tmp_media_file.write(media_file.read())
-        tmp_media_file.seek(0)
-        media_file.seek(0)
-
-        media_type = hook_handle('sniff_handler', tmp_media_file, filename)
-        if media_type:
-            _log.info('{0} accepts the file'.format(media_type))
-            return media_type, hook_handle(('media_manager', media_type))
-        else:
-            _log.debug('{0} did not accept the file'.format(media_type))
-
-    raise FileTypeNotSupported(
-        # TODO: Provide information on which file types are supported
-        _(u'Sorry, I don\'t support that file type :('))
-
+    media_type = hook_handle('sniff_handler', media_file, filename)
+    if media_type:
+        _log.info('{0} accepts the file'.format(media_type))
+        return media_type, hook_handle(('media_manager', media_type))
+    else:
+        _log.debug('{0} did not accept the file'.format(media_type))
+        raise FileTypeNotSupported(
+            # TODO: Provide information on which file types are supported
+            _(u'Sorry, I don\'t support that file type :('))
 
 def get_media_type_and_manager(filename):
     '''
     Try to find the media type based on the file name, extension
     specifically. This is used as a speedup, the sniffing functionality
     then falls back on more in-depth bitsniffing of the source file.
+
+    This hook is deprecated, 'type_match_handler' should be used instead
     '''
     if filename.find('.') > 0:
         # Get the file extension
@@ -97,5 +96,67 @@ def get_media_type_and_manager(filename):
         _log.info('File {0} has no file extension, let\'s hope the sniffers get it.'.format(
             filename))
 
-    raise FileTypeNotSupported(
+    raise TypeNotFound(
         _(u'Sorry, I don\'t support that file type :('))
+
+def type_match_handler(media_file, filename):
+    '''Check media file by name and then by content
+
+    Try to find the media type based on the file name, extension
+    specifically. After that, if media type is one of supported ones, check the
+    contents of the file
+    '''
+    if filename.find('.') > 0:
+        # Get the file extension
+        ext = os.path.splitext(filename)[1].lower()
+
+        # Omit the dot from the extension and match it against
+        # the media manager
+        hook_result = hook_handle('type_match_handler', ext[1:])
+        if hook_result:
+            _log.info('Info about file found, checking further')
+            MEDIA_TYPE, Manager, sniffer = hook_result
+            if not sniffer:
+                _log.debug('sniffer is None, plugin trusts the extension')
+                return MEDIA_TYPE, Manager
+            _log.info('checking the contents with sniffer')
+            try:
+                sniffer(media_file)
+                _log.info('checked, found')
+                return MEDIA_TYPE, Manager
+            except Exception as e:
+                _log.info('sniffer says it will not accept the file')
+                _log.debug(e)
+                raise
+        else:
+            _log.info('No plugins handled extension {0}'.format(ext))
+    else:
+        _log.info('File {0} has no known file extension, let\'s hope '
+                'the sniffers get it.'.format(filename))
+    raise TypeNotFound(_(u'Sorry, I don\'t support that file type :('))
+
+
+def sniff_media(media_file, filename):
+    '''
+    Iterate through the enabled media types and find those suited
+    for a certain file.
+    '''
+    # copy the contents to a .name-enabled temporary file for further checks
+    # TODO: there are cases when copying is not required
+    tmp_media_file = tempfile.NamedTemporaryFile()
+    shutil.copyfileobj(media_file, tmp_media_file)
+    media_file.seek(0)
+    try:
+        return type_match_handler(tmp_media_file, filename)
+    except TypeNotFound as e:
+        _log.info('No plugins using two-step checking found')
+
+    # keep trying, using old `get_media_type_and_manager`
+    try:
+        return get_media_type_and_manager(filename)
+    except TypeNotFound as e:
+        # again, no luck. Do it expensive way
+        _log.info('No media handler found by file extension')
+    _log.info('Doing it the expensive way...')
+    return sniff_media_contents(tmp_media_file, filename)
+
diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py
index 84030362..ed6600ee 100644
--- a/mediagoblin/media_types/ascii/processing.py
+++ b/mediagoblin/media_types/ascii/processing.py
@@ -22,6 +22,8 @@ except ImportError:
     import Image
 import logging
 
+import six
+
 from mediagoblin import mg_globals as mgg
 from mediagoblin.processing import (
     create_pub_filepath, FilenameBuilder,
@@ -93,7 +95,7 @@ class CommonAsciiProcessor(MediaProcessor):
         orig_file.seek(0)
 
     def store_unicode_file(self):
-        with file(self.process_filename, 'rb') as orig_file:
+        with open(self.process_filename, 'rb') as orig_file:
             self._detect_charset(orig_file)
             unicode_filepath = create_pub_filepath(self.entry,
                                                    'ascii-portable.txt')
@@ -104,7 +106,7 @@ class CommonAsciiProcessor(MediaProcessor):
                 # Encode the unicode instance to ASCII and replace any
                 # non-ASCII with an HTML entity (&#
                 unicode_file.write(
-                    unicode(orig_file.read().decode(
+                    six.text_type(orig_file.read().decode(
                             self.charset)).encode(
                                 'ascii',
                                 'xmlcharrefreplace'))
@@ -112,7 +114,7 @@ class CommonAsciiProcessor(MediaProcessor):
         self.entry.media_files['unicode'] = unicode_filepath
 
     def generate_thumb(self, font=None, thumb_size=None):
-        with file(self.process_filename, 'rb') as orig_file:
+        with open(self.process_filename, 'rb') as orig_file:
             # If no font kwarg, check config
             if not font:
                 font = self.ascii_config.get('thumbnail_font', None)
@@ -141,7 +143,7 @@ class CommonAsciiProcessor(MediaProcessor):
             thumb = converter._create_image(
                 orig_file.read())
 
-            with file(tmp_thumb, 'w') as thumb_file:
+            with open(tmp_thumb, 'w') as thumb_file:
                 thumb.thumbnail(
                     thumb_size,
                     Image.ANTIALIAS)
@@ -271,6 +273,6 @@ class Resizer(CommonAsciiProcessor):
 
 class AsciiProcessingManager(ProcessingManager):
     def __init__(self):
-        super(self.__class__, self).__init__()
+        super(AsciiProcessingManager, self).__init__()
         self.add_processor(InitialProcessor)
         self.add_processor(Resizer)
diff --git a/mediagoblin/media_types/audio/processing.py b/mediagoblin/media_types/audio/processing.py
index c4ed4eca..c1f6cb6b 100644
--- a/mediagoblin/media_types/audio/processing.py
+++ b/mediagoblin/media_types/audio/processing.py
@@ -27,6 +27,7 @@ from mediagoblin.processing import (
 
 from mediagoblin.media_types.audio.transcoders import (
     AudioTranscoder, AudioThumbnailer)
+from mediagoblin.media_types.tools import discover
 
 _log = logging.getLogger(__name__)
 
@@ -36,15 +37,12 @@ MEDIA_TYPE = 'mediagoblin.media_types.audio'
 def sniff_handler(media_file, filename):
     _log.info('Sniffing {0}'.format(MEDIA_TYPE))
     try:
-        transcoder = AudioTranscoder()
-        data = transcoder.discover(media_file.name)
-    except BadMediaFail:
-        _log.debug('Audio discovery raised BadMediaFail')
+        data = discover(media_file.name)
+    except Exception as e:
+        _log.info(unicode(e))
         return None
-
-    if data.is_audio is True and data.is_video is False:
+    if data and data.get_audio_streams() and not data.get_video_streams():
         return MEDIA_TYPE
-
     return None
 
 
@@ -126,8 +124,6 @@ class CommonAudioProcessor(MediaProcessor):
             quality=quality,
             progress_callback=progress_callback)
 
-        self.transcoder.discover(webm_audio_tmp)
-
         self._keep_best()
 
         _log.debug('Saving medium...')
@@ -145,21 +141,14 @@ class CommonAudioProcessor(MediaProcessor):
         if self._skip_processing('spectrogram', max_width=max_width,
                                  fft_size=fft_size):
             return
-
         wav_tmp = os.path.join(self.workbench.dir, self.name_builder.fill(
             '{basename}.ogg'))
-
         _log.info('Creating OGG source for spectrogram')
-        self.transcoder.transcode(
-            self.process_filename,
-            wav_tmp,
-            mux_string='vorbisenc quality={0} ! oggmux'.format(
-                self.audio_config['quality']))
-
+        self.transcoder.transcode(self.process_filename, wav_tmp,
+                                  mux_name='oggmux')
         spectrogram_tmp = os.path.join(self.workbench.dir,
                                        self.name_builder.fill(
                                            '{basename}-spectrogram.jpg'))
-
         self.thumbnailer.spectrogram(
             wav_tmp,
             spectrogram_tmp,
@@ -370,7 +359,7 @@ class Transcoder(CommonAudioProcessor):
 
 class AudioProcessingManager(ProcessingManager):
     def __init__(self):
-        super(self.__class__, self).__init__()
+        super(AudioProcessingManager, self).__init__()
         self.add_processor(InitialProcessor)
         self.add_processor(Resizer)
         self.add_processor(Transcoder)
diff --git a/mediagoblin/media_types/audio/transcoders.py b/mediagoblin/media_types/audio/transcoders.py
index 150dad8e..f86528de 100644
--- a/mediagoblin/media_types/audio/transcoders.py
+++ b/mediagoblin/media_types/audio/transcoders.py
@@ -20,10 +20,8 @@ try:
 except ImportError:
     import Image
 
-from mediagoblin.processing import BadMediaFail
 from mediagoblin.media_types.audio import audioprocessing
 
-
 _log = logging.getLogger(__name__)
 
 CPU_COUNT = 2  # Just assuming for now
@@ -39,26 +37,13 @@ try:
 except ImportError:
     _log.warning('Could not import multiprocessing, assuming 2 CPU cores')
 
-# IMPORT GOBJECT
-try:
-    import gobject
-    gobject.threads_init()
-except ImportError:
-    raise Exception('gobject could not be found')
-
-# IMPORT PYGST
-try:
-    import pygst
-
-    # We won't settle for less. For now, this is an arbitrary limit
-    # as we have not tested with > 0.10
-    pygst.require('0.10')
+# uncomment this to get a lot of logs from gst
+# import os;os.environ['GST_DEBUG'] = '5,python:5'
 
-    import gst
-
-    import gst.extend.discoverer
-except ImportError:
-    raise Exception('gst/pygst >= 0.10 could not be imported')
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import GObject, Gst
+Gst.init(None)
 
 import numpy
 
@@ -72,7 +57,6 @@ class AudioThumbnailer(object):
         height = int(kw.get('height', float(width) * 0.3))
         fft_size = kw.get('fft_size', 2048)
         callback = kw.get('progress_callback')
-
         processor = audioprocessing.AudioProcessor(
             src,
             fft_size,
@@ -132,95 +116,87 @@ class AudioTranscoder(object):
         _log.info('Initializing {0}'.format(self.__class__.__name__))
 
         # Instantiate MainLoop
-        self._loop = gobject.MainLoop()
+        self._loop = GObject.MainLoop()
         self._failed = None
 
-    def discover(self, src):
-        self._src_path = src
-        _log.info('Discovering {0}'.format(src))
-        self._discovery_path = src
-
-        self._discoverer = gst.extend.discoverer.Discoverer(
-            self._discovery_path)
-        self._discoverer.connect('discovered', self.__on_discovered)
-        self._discoverer.discover()
-
-        self._loop.run()  # Run MainLoop
-
-        if self._failed:
-            raise self._failed
-
-        # Once MainLoop has returned, return discovery data
-        return getattr(self, '_discovery_data', False)
-
-    def __on_discovered(self, data, is_media):
-        if not is_media:
-            self._failed = BadMediaFail()
-            _log.error('Could not discover {0}'.format(self._src_path))
-            self.halt()
-
-        _log.debug('Discovered: {0}'.format(data.__dict__))
-
-        self._discovery_data = data
-
-        # Gracefully shut down MainLoop
-        self.halt()
-
-    def transcode(self, src, dst, **kw):
+    def transcode(self, src, dst, mux_name='webmmux',quality=0.3,
+                  progress_callback=None, **kw):
+        def _on_pad_added(element, pad, connect_to):
+            caps = pad.query_caps(None)
+            name = caps.to_string()
+            _log.debug('on_pad_added: {0}'.format(name))
+            if name.startswith('audio') and not connect_to.is_linked():
+                pad.link(connect_to)
         _log.info('Transcoding {0} into {1}'.format(src, dst))
-        self._discovery_data = kw.get('data', self.discover(src))
-
-        self.__on_progress = kw.get('progress_callback')
-
-        quality = kw.get('quality', 0.3)
-
-        mux_string = kw.get(
-            'mux_string',
-            'vorbisenc quality={0} ! webmmux'.format(quality))
-
+        self.__on_progress = progress_callback
         # Set up pipeline
-        self.pipeline = gst.parse_launch(
-            'filesrc location="{src}" ! '
-            'decodebin2 ! queue ! audiorate tolerance={tolerance} ! '
-            'audioconvert ! audio/x-raw-float,channels=2 ! '
-            '{mux_string} ! '
-            'progressreport silent=true ! '
-            'filesink location="{dst}"'.format(
-                src=src,
-                tolerance=80000000,
-                mux_string=mux_string,
-                dst=dst))
-
+        tolerance = 80000000
+        self.pipeline = Gst.Pipeline()
+        filesrc = Gst.ElementFactory.make('filesrc', 'filesrc')
+        filesrc.set_property('location', src)
+        decodebin = Gst.ElementFactory.make('decodebin', 'decodebin')
+        queue = Gst.ElementFactory.make('queue', 'queue')
+        decodebin.connect('pad-added', _on_pad_added,
+                          queue.get_static_pad('sink'))
+        audiorate = Gst.ElementFactory.make('audiorate', 'audiorate')
+        audiorate.set_property('tolerance', tolerance)
+        audioconvert = Gst.ElementFactory.make('audioconvert', 'audioconvert')
+        caps_struct = Gst.Structure.new_empty('audio/x-raw')
+        caps_struct.set_value('channels', 2)
+        caps = Gst.Caps.new_empty()
+        caps.append_structure(caps_struct)
+        capsfilter = Gst.ElementFactory.make('capsfilter', 'capsfilter')
+        capsfilter.set_property('caps', caps)
+        enc = Gst.ElementFactory.make('vorbisenc', 'enc')
+        enc.set_property('quality', quality)
+        mux = Gst.ElementFactory.make(mux_name, 'mux')
+        progressreport = Gst.ElementFactory.make('progressreport', 'progress')
+        progressreport.set_property('silent', True)
+        sink = Gst.ElementFactory.make('filesink', 'sink')
+        sink.set_property('location', dst)
+        # add to pipeline
+        for e in [filesrc, decodebin, queue, audiorate, audioconvert,
+                  capsfilter, enc, mux, progressreport, sink]:
+            self.pipeline.add(e)
+        # link elements
+        filesrc.link(decodebin)
+        decodebin.link(queue)
+        queue.link(audiorate)
+        audiorate.link(audioconvert)
+        audioconvert.link(capsfilter)
+        capsfilter.link(enc)
+        enc.link(mux)
+        mux.link(progressreport)
+        progressreport.link(sink)
         self.bus = self.pipeline.get_bus()
         self.bus.add_signal_watch()
         self.bus.connect('message', self.__on_bus_message)
-
-        self.pipeline.set_state(gst.STATE_PLAYING)
-
+        # run
+        self.pipeline.set_state(Gst.State.PLAYING)
         self._loop.run()
 
     def __on_bus_message(self, bus, message):
-        _log.debug(message)
-
-        if (message.type == gst.MESSAGE_ELEMENT
-            and message.structure.get_name() == 'progress'):
-            data = dict(message.structure)
-
-            if self.__on_progress:
-                self.__on_progress(data.get('percent'))
-
-            _log.info('{0}% done...'.format(
-                    data.get('percent')))
-        elif message.type == gst.MESSAGE_EOS:
+        _log.debug(message.type)
+        if (message.type == Gst.MessageType.ELEMENT
+                and message.has_name('progress')):
+            structure = message.get_structure()
+            (success, percent) = structure.get_int('percent')
+            if self.__on_progress and success:
+                self.__on_progress(percent)
+            _log.info('{0}% done...'.format(percent))
+        elif message.type == Gst.MessageType.EOS:
             _log.info('Done')
             self.halt()
+        elif message.type == Gst.MessageType.ERROR:
+            _log.error(message.parse_error())
+            self.halt()
 
     def halt(self):
         if getattr(self, 'pipeline', False):
-            self.pipeline.set_state(gst.STATE_NULL)
+            self.pipeline.set_state(Gst.State.NULL)
             del self.pipeline
         _log.info('Quitting MainLoop gracefully...')
-        gobject.idle_add(self._loop.quit)
+        GObject.idle_add(self._loop.quit)
 
 if __name__ == '__main__':
     import sys
diff --git a/mediagoblin/media_types/blog/forms.py b/mediagoblin/media_types/blog/forms.py
index 1cc41a02..12857e28 100644
--- a/mediagoblin/media_types/blog/forms.py
+++ b/mediagoblin/media_types/blog/forms.py
@@ -21,26 +21,25 @@ from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.licenses import licenses_as_choices
 
 class BlogPostEditForm(wtforms.Form):
-    title = wtforms.TextField(_('Title'),
-		[wtforms.validators.Length(min=0, max=500)])
+    title = wtforms.StringField(_('Title'),
+    [wtforms.validators.Length(min=0, max=500)])
     description = wtforms.TextAreaField(_('Description'))
-    tags = wtforms.TextField(_('Tags'), [tag_length_validator], 
-		description="Seperate tags by commas.")
-    license = wtforms.SelectField(_('License'), 
-		[wtforms.validators.Optional(),], choices=licenses_as_choices())
+    tags = wtforms.StringField(
+        _('Tags'), [tag_length_validator],
+        description="Seperate tags by commas."
+    )
+    license = wtforms.SelectField(
+        _('License'),
+        [wtforms.validators.Optional()],
+        choices=licenses_as_choices()
+    )
 
 class BlogEditForm(wtforms.Form):
-    title = wtforms.TextField(_('Title'),
-		[wtforms.validators.Length(min=0, max=500)])
+    title = wtforms.StringField(_('Title'),
+                                [wtforms.validators.Length(min=0, max=500)])
     description = wtforms.TextAreaField(_('Description'))
     
 
 class ConfirmDeleteForm(wtforms.Form):
     confirm = wtforms.BooleanField(
         _('I am sure I want to delete this'))
-    
-
-    
-    
-    
-    
diff --git a/mediagoblin/media_types/blog/views.py b/mediagoblin/media_types/blog/views.py
index 088164b9..0b88037f 100644
--- a/mediagoblin/media_types/blog/views.py
+++ b/mediagoblin/media_types/blog/views.py
@@ -19,6 +19,8 @@ _log = logging.getLogger(__name__)
 
 from datetime import datetime
 
+import six
+
 from werkzeug.exceptions import Forbidden
 from mediagoblin.tools import pluginapi
 
@@ -75,8 +77,8 @@ def blog_edit(request):
             if request.method=='POST' and form.validate():
                 _log.info("Here")
                 blog = request.db.Blog()
-                blog.title = unicode(form.title.data)
-                blog.description = unicode(cleaned_markdown_conversion((form.description.data)))
+                blog.title = six.text_type(form.title.data)
+                blog.description = six.text_type(cleaned_markdown_conversion((form.description.data)))
                 blog.author = request.user.id
                 blog.generate_slug()
 
@@ -112,8 +114,8 @@ def blog_edit(request):
                      'app_config': mg_globals.app_config})
         else:
             if request.method == 'POST' and form.validate():
-                blog.title = unicode(form.title.data)
-                blog.description = unicode(cleaned_markdown_conversion((form.description.data)))
+                blog.title = six.text_type(form.title.data)
+                blog.description = six.text_type(cleaned_markdown_conversion((form.description.data)))
                 blog.author = request.user.id
                 blog.generate_slug()
 
@@ -137,10 +139,10 @@ def blogpost_create(request):
 
         blogpost = request.db.MediaEntry()
         blogpost.media_type = 'mediagoblin.media_types.blogpost'
-        blogpost.title = unicode(form.title.data)
-        blogpost.description = unicode(cleaned_markdown_conversion((form.description.data)))
+        blogpost.title = six.text_type(form.title.data)
+        blogpost.description = six.text_type(cleaned_markdown_conversion((form.description.data)))
         blogpost.tags =  convert_to_tag_list_of_dicts(form.tags.data)
-        blogpost.license = unicode(form.license.data) or None
+        blogpost.license = six.text_type(form.license.data) or None
         blogpost.uploader = request.user.id
         blogpost.generate_slug()
 
@@ -187,10 +189,10 @@ def blogpost_edit(request):
 
     form = blog_forms.BlogPostEditForm(request.form, **defaults)
     if request.method == 'POST' and form.validate():
-        blogpost.title = unicode(form.title.data)
-        blogpost.description = unicode(cleaned_markdown_conversion((form.description.data)))
+        blogpost.title = six.text_type(form.title.data)
+        blogpost.description = six.text_type(cleaned_markdown_conversion((form.description.data)))
         blogpost.tags =  convert_to_tag_list_of_dicts(form.tags.data)
-        blogpost.license = unicode(form.license.data)
+        blogpost.license = six.text_type(form.license.data)
         set_blogpost_state(request, blogpost)
         blogpost.generate_slug()
         blogpost.save()
diff --git a/mediagoblin/media_types/image/migrations.py b/mediagoblin/media_types/image/migrations.py
index f54c23ea..83f5dc8e 100644
--- a/mediagoblin/media_types/image/migrations.py
+++ b/mediagoblin/media_types/image/migrations.py
@@ -13,5 +13,61 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import json
+
+from sqlalchemy import MetaData, Column, ForeignKey
+
+from mediagoblin.db.migration_tools import RegisterMigration, inspect_table
+
 
 MIGRATIONS = {}
+
+@RegisterMigration(1, MIGRATIONS)
+def remove_gps_from_image(db):
+    """
+    This will remove GPS coordinates from the image model to put them
+    on the new Location model.
+    """
+    metadata = MetaData(bind=db.bind)
+    image_table = inspect_table(metadata, "image__mediadata")
+    location_table = inspect_table(metadata, "core__locations")
+    media_entries_table = inspect_table(metadata, "core__media_entries")
+
+    # First do the data migration
+    for row in db.execute(image_table.select()):
+        fields = {
+            "longitude": row.gps_longitude,
+            "latitude": row.gps_latitude,
+            "altitude": row.gps_altitude,
+            "direction": row.gps_direction,
+        }
+
+        # Remove empty values
+        for k, v in fields.items():
+            if v is None:
+                del fields[k]
+
+        # No point in adding empty locations
+        if not fields:
+            continue
+
+        # JSONEncoded is actually a string field just json.dumped
+        # without the ORM we're responsible for that.
+        fields = json.dumps(fields)
+
+        location = db.execute(location_table.insert().values(position=fields))
+
+        # now store the new location model on Image
+        db.execute(media_entries_table.update().values(
+            location=location.inserted_primary_key[0]
+        ).where(media_entries_table.c.id==row.media_entry))
+
+    db.commit()
+
+    # All that data has been migrated across lets remove the fields
+    image_table.columns["gps_longitude"].drop()
+    image_table.columns["gps_latitude"].drop()
+    image_table.columns["gps_altitude"].drop()
+    image_table.columns["gps_direction"].drop()
+
+    db.commit()
diff --git a/mediagoblin/media_types/image/models.py b/mediagoblin/media_types/image/models.py
index b2ea3960..02040ec2 100644
--- a/mediagoblin/media_types/image/models.py
+++ b/mediagoblin/media_types/image/models.py
@@ -39,10 +39,6 @@ class ImageData(Base):
     width = Column(Integer)
     height = Column(Integer)
     exif_all = Column(JSONEncoded)
-    gps_longitude = Column(Float)
-    gps_latitude = Column(Float)
-    gps_altitude = Column(Float)
-    gps_direction = Column(Float)
 
 
 DATA_MODEL = ImageData
diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py
index 1db82ee7..951a720d 100644
--- a/mediagoblin/media_types/image/processing.py
+++ b/mediagoblin/media_types/image/processing.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function
+
 try:
     from PIL import Image
 except ImportError:
@@ -22,7 +24,10 @@ import os
 import logging
 import argparse
 
+import six
+
 from mediagoblin import mg_globals as mgg
+from mediagoblin.db.models import Location
 from mediagoblin.processing import (
     BadMediaFail, FilenameBuilder,
     MediaProcessor, ProcessingManager,
@@ -65,14 +70,14 @@ def resize_image(entry, resized, keyname, target_name, new_size,
         resize_filter = PIL_FILTERS[filter.upper()]
     except KeyError:
         raise Exception('Filter "{0}" not found, choose one of {1}'.format(
-            unicode(filter),
+            six.text_type(filter),
             u', '.join(PIL_FILTERS.keys())))
 
     resized.thumbnail(new_size, resize_filter)
 
     # Copy the new file to the conversion subdir, then remotely.
     tmp_resized_filename = os.path.join(workdir, target_name)
-    with file(tmp_resized_filename, 'w') as resized_file:
+    with open(tmp_resized_filename, 'wb') as resized_file:
         resized.save(resized_file, quality=quality)
     store_public(entry, keyname, tmp_resized_filename, target_name)
 
@@ -114,7 +119,7 @@ def resize_tool(entry,
         or im.size[1] > new_size[1]\
         or exif_image_needs_rotation(exif_tags):
         resize_image(
-            entry, im, unicode(keyname), target_name,
+            entry, im, six.text_type(keyname), target_name,
             tuple(new_size),
             exif_tags, conversions_subdir,
             quality, filter)
@@ -220,20 +225,32 @@ class CommonImageProcessor(MediaProcessor):
             self.entry, self.process_filename,
             self.name_builder.fill('{basename}{ext}'))
 
-    def extract_metadata(self):
-        # Is there any GPS data
+    def extract_metadata(self, file):
+        """ Extract all the metadata from the image and store """
+        # Extract GPS data and store in Location
         gps_data = get_gps_data(self.exif_tags)
 
+        if len(gps_data):
+            Location.create({"position": gps_data}, self.entry)
+
         # Insert exif data into database
         exif_all = clean_exif(self.exif_tags)
 
         if len(exif_all):
             self.entry.media_data_init(exif_all=exif_all)
 
-        if len(gps_data):
-            for key in list(gps_data.keys()):
-                gps_data['gps_' + key] = gps_data.pop(key)
-            self.entry.media_data_init(**gps_data)
+        # Extract file metadata
+        try:
+            im = Image.open(self.process_filename)
+        except IOError:
+            raise BadMediaFail()
+
+        metadata = {
+            "width": im.size[0],
+            "height": im.size[1],
+        }
+
+        self.entry.set_file_metadata(file, **metadata)
 
 
 class InitialProcessor(CommonImageProcessor):
@@ -248,6 +265,9 @@ class InitialProcessor(CommonImageProcessor):
         """
         Determine if this media type is eligible for processing
         """
+        if entry is None and state is None:
+            raise ValueError("Must specify either entry or state")
+
         if not state:
             state = entry.state
         return state in (
@@ -297,7 +317,7 @@ class InitialProcessor(CommonImageProcessor):
                                            quality=quality)
         self.generate_thumb(size=thumb_size, filter=filter, quality=quality)
         self.copy_original()
-        self.extract_metadata()
+        self.extract_metadata('original')
         self.delete_queue_file()
 
 
@@ -314,6 +334,9 @@ class Resizer(CommonImageProcessor):
         """
         Determine if this media type is eligible for processing
         """
+        if entry is None and state is None:
+            raise ValueError("Must specify either entry or state")
+
         if not state:
             state = entry.state
         return state in 'processed'
@@ -362,13 +385,52 @@ class Resizer(CommonImageProcessor):
         elif file == 'thumb':
             self.generate_thumb(size=size, filter=filter, quality=quality)
 
+        self.extract_metadata(file)
+
+class MetadataProcessing(CommonImageProcessor):
+    """ Extraction and storage of media's metadata for processed images """
+
+    name = 'metadatabuilder'
+    description = 'Add or update image metadata'
+
+    @classmethod
+    def media_is_eligible(cls, entry=None, state=None):
+        if entry is None and state is None:
+            raise ValueError("Must specify either entry or state")
+
+        if state is None:
+            state = entry.state
+
+        return state == 'processed'
+
+    @classmethod
+    def generate_parser(cls):
+        parser = argparse.ArgumentParser(
+            description=cls.description,
+            prog=cls.name
+        )
+
+        parser.add_argument(
+            'file',
+            choices=['original', 'medium', 'thumb']
+        )
+
+        return parser
+
+    @classmethod
+    def args_to_request(cls, args):
+        return request_from_args(args, ['file'])
+
+    def process(self, file):
+        self.common_setup()
+        self.extract_metadata(file)
 
 class ImageProcessingManager(ProcessingManager):
     def __init__(self):
-        super(self.__class__, self).__init__()
+        super(ImageProcessingManager, self).__init__()
         self.add_processor(InitialProcessor)
         self.add_processor(Resizer)
-
+        self.add_processor(MetadataProcessing)
 
 if __name__ == '__main__':
     import sys
@@ -381,5 +443,4 @@ if __name__ == '__main__':
     clean = clean_exif(result)
     useful = get_useful(clean)
 
-    print pp.pprint(
-        clean)
+    print(pp.pprint(clean))
diff --git a/mediagoblin/media_types/pdf/processing.py b/mediagoblin/media_types/pdf/processing.py
index a000007a..f6d10a5f 100644
--- a/mediagoblin/media_types/pdf/processing.py
+++ b/mediagoblin/media_types/pdf/processing.py
@@ -138,10 +138,10 @@ def is_unoconv_working():
     try:
         proc = Popen([unoconv, '--show'], stderr=PIPE)
         output = proc.stderr.read()
-    except OSError, e:
+    except OSError:
         _log.warn(_('unoconv failing to run, check log file'))
         return False
-    if 'ERROR' in output:
+    if b'ERROR' in output:
         return False
     return True
 
@@ -207,6 +207,7 @@ def pdf_info(original):
         _log.debug('pdfinfo could not read the pdf file.')
         raise BadMediaFail()
 
+    lines = [l.decode() for l in lines]
     info_dict = dict([[part.strip() for part in l.strip().split(':', 1)]
                       for l in lines if ':' in l])
 
@@ -466,6 +467,6 @@ class Resizer(CommonPdfProcessor):
 
 class PdfProcessingManager(ProcessingManager):
     def __init__(self):
-        super(self.__class__, self).__init__()
+        super(PdfProcessingManager, self).__init__()
         self.add_processor(InitialProcessor)
         self.add_processor(Resizer)
diff --git a/mediagoblin/media_types/raw_image/processing.py b/mediagoblin/media_types/raw_image/processing.py
index 5ff54cf3..740ba2dd 100644
--- a/mediagoblin/media_types/raw_image/processing.py
+++ b/mediagoblin/media_types/raw_image/processing.py
@@ -54,7 +54,7 @@ class InitialRawProcessor(InitialProcessor):
         """
         Pull out a full-size JPEG-preview
         """
-        super(self.__class__, self).common_setup()
+        super(InitialRawProcessor, self).common_setup()
 
         self._original_raw = self.process_filename
 
@@ -77,6 +77,6 @@ class InitialRawProcessor(InitialProcessor):
 
 class RawImageProcessingManager(ProcessingManager):
     def __init__(self):
-        super(self.__class__, self).__init__()
+        super(RawImageProcessingManager, self).__init__()
         self.add_processor(InitialRawProcessor)
         self.add_processor(Resizer)
diff --git a/mediagoblin/media_types/stl/model_loader.py b/mediagoblin/media_types/stl/model_loader.py
index 88f19314..c1864613 100644
--- a/mediagoblin/media_types/stl/model_loader.py
+++ b/mediagoblin/media_types/stl/model_loader.py
@@ -22,7 +22,7 @@ class ThreeDeeParseError(Exception):
     pass
 
 
-class ThreeDee():
+class ThreeDee(object):
     """
     3D model parser base class.  Derrived classes are used for basic
     analysis of 3D models, and are not intended to be used for 3D
diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py
index 65a86234..55764aeb 100644
--- a/mediagoblin/media_types/stl/processing.py
+++ b/mediagoblin/media_types/stl/processing.py
@@ -365,6 +365,6 @@ class Resizer(CommonStlProcessor):
 
 class StlProcessingManager(ProcessingManager):
     def __init__(self):
-        super(self.__class__, self).__init__()
+        super(StlProcessingManager, self).__init__()
         self.add_processor(InitialProcessor)
         self.add_processor(Resizer)
diff --git a/mediagoblin/media_types/tools.py b/mediagoblin/media_types/tools.py
index fe7b3772..3bc56e2c 100644
--- a/mediagoblin/media_types/tools.py
+++ b/mediagoblin/media_types/tools.py
@@ -25,3 +25,20 @@ def media_type_warning():
         _log.warning('Media_types have been converted to plugins. Old'
                      ' media_types will no longer work. Please convert them'
                      ' to plugins to continue using them.')
+
+
+def discover(src):
+    '''
+    Discover properties about a media file
+    '''
+    # GStreamer might be not installed, so it should not be initialized on
+    # import, or an exception will be raised.
+    import gi
+    gi.require_version('Gst', '1.0')
+    from gi.repository import GObject, Gst, GstPbutils, GLib
+    Gst.init(None)
+
+    _log.info('Discovering {0}...'.format(src))
+    uri = 'file://{0}'.format(src)
+    discoverer = GstPbutils.Discoverer.new(60 * Gst.SECOND)
+    return discoverer.discover_uri(uri)
diff --git a/mediagoblin/media_types/video/__init__.py b/mediagoblin/media_types/video/__init__.py
index c85cc0b2..f636f1ab 100644
--- a/mediagoblin/media_types/video/__init__.py
+++ b/mediagoblin/media_types/video/__init__.py
@@ -15,8 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from mediagoblin.media_types import MediaManagerBase
-from mediagoblin.media_types.video.processing import VideoProcessingManager, \
-    sniff_handler
+from mediagoblin.media_types.video.processing import (VideoProcessingManager,
+        sniff_handler, sniffer)
 
 
 MEDIA_TYPE = 'mediagoblin.media_types.video'
@@ -38,8 +38,12 @@ def get_media_type_and_manager(ext):
     if ext in ACCEPTED_EXTENSIONS:
         return MEDIA_TYPE, VideoMediaManager
 
+def type_match_handler(ext):
+    if ext in ACCEPTED_EXTENSIONS:
+        return MEDIA_TYPE, VideoMediaManager, sniffer
+
 hooks = {
-    'get_media_type_and_manager': get_media_type_and_manager,
+    'type_match_handler': type_match_handler,
     'sniff_handler': sniff_handler,
     ('media_manager', MEDIA_TYPE): lambda: VideoMediaManager,
     ('reprocess_manager', MEDIA_TYPE): lambda: VideoProcessingManager,
diff --git a/mediagoblin/media_types/video/migrations.py b/mediagoblin/media_types/video/migrations.py
index d68e2933..8088220b 100644
--- a/mediagoblin/media_types/video/migrations.py
+++ b/mediagoblin/media_types/video/migrations.py
@@ -18,6 +18,8 @@ from mediagoblin.db.migration_tools import RegisterMigration, inspect_table
 
 from sqlalchemy import MetaData, Column, Unicode
 
+import json
+
 MIGRATIONS = {}
 
 
@@ -47,3 +49,62 @@ def webm_640_to_webm_video(db):
                 values(name='webm_video'))
 
     db.commit()
+
+
+@RegisterMigration(3, MIGRATIONS)
+def change_metadata_format(db):
+    """Change orig_metadata format for multi-stream a-v"""
+    db_metadata = MetaData(bind=db.bind)
+
+    vid_data = inspect_table(db_metadata, "video__mediadata")
+
+    for row in db.execute(vid_data.select()):
+        metadata = json.loads(row.orig_metadata)
+
+        if not metadata:
+            continue
+
+        # before this migration there was info about only one video or audio
+        # stream. So, we store existing info as the first item in the list
+        new_metadata = {'audio': [], 'video': [], 'common': {}}
+        video_key_map = {  # old: new
+                'videoheight': 'height',
+                'videowidth': 'width',
+                'videorate': 'rate',
+                }
+        audio_key_map = {  # old: new
+                'audiochannels': 'channels',
+                }
+        common_key_map = {
+                'videolength': 'length',
+                }
+
+        new_metadata['video'] = [dict((v, metadata.get(k))
+                for k, v in video_key_map.items() if metadata.get(k))]
+        new_metadata['audio'] = [dict((v, metadata.get(k))
+                for k, v in audio_key_map.items() if metadata.get(k))]
+        new_metadata['common'] = dict((v, metadata.get(k))
+                for k, v in common_key_map.items() if metadata.get(k))
+        
+        # 'mimetype' should be in tags
+        new_metadata['common']['tags'] = {'mimetype': metadata.get('mimetype')}
+        if 'tags' in metadata:
+            new_metadata['video'][0]['tags'] = {}
+            new_metadata['audio'][0]['tags'] = {}
+
+            tags = metadata['tags']
+
+            video_keys = ['encoder', 'encoder-version', 'video-codec']
+            audio_keys = ['audio-codec']
+
+            for t, v in tags.items():
+                if t in video_keys:
+                    new_metadata['video'][0]['tags'][t] = tags[t]
+                elif t in audio_keys:
+                    new_metadata['audio'][0]['tags'][t] = tags[t]
+                else:
+                    new_metadata['common']['tags'][t] = tags[t]
+        db.execute(vid_data.update()
+                .where(vid_data.c.media_entry==row.media_entry)
+                .values(orig_metadata=json.dumps(new_metadata)))
+    db.commit()
diff --git a/mediagoblin/media_types/video/models.py b/mediagoblin/media_types/video/models.py
index be9d258f..4d539e7b 100644
--- a/mediagoblin/media_types/video/models.py
+++ b/mediagoblin/media_types/video/models.py
@@ -68,19 +68,18 @@ class VideoData(Base):
         """
         orig_metadata = self.orig_metadata or {}
 
-        if "webm_video" not in self.get_media_entry.media_files \
-           and "mimetype" in orig_metadata \
-           and "tags" in orig_metadata \
-           and "audio-codec" in orig_metadata["tags"] \
-           and "video-codec" in orig_metadata["tags"]:
+        if ("webm_video" not in self.get_media_entry.media_files
+           and "mimetype" in orig_metadata['common']['tags']
+           and "codec" in orig_metadata['audio']
+           and "codec" in orig_metadata['video']):
             if orig_metadata['mimetype'] == 'application/ogg':
                 # stupid ambiguous .ogg extension
                 mimetype = "video/ogg"
             else:
-                mimetype = orig_metadata['mimetype']
+                mimetype = orig_metadata['common']['tags']['mimetype']
 
-            video_codec = orig_metadata["tags"]["video-codec"].lower()
-            audio_codec = orig_metadata["tags"]["audio-codec"].lower()
+            video_codec = orig_metadata["video"]["codec"].lower()
+            audio_codec = orig_metadata["audio"]["codec"].lower()
 
             # We don't want the "video" at the end of vp8...
             # not sure of a nicer way to be cleaning this stuff
diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py
index a7716592..a85b232c 100644
--- a/mediagoblin/media_types/video/processing.py
+++ b/mediagoblin/media_types/video/processing.py
@@ -27,6 +27,7 @@ from mediagoblin.processing import (
     get_process_filename, store_public,
     copy_original)
 from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
+from mediagoblin.media_types import MissingComponents
 
 from . import transcoders
 from .util import skip_transcode
@@ -44,86 +45,117 @@ class VideoTranscodingFail(BaseProcessingFail):
     general_message = _(u'Video transcoding failed')
 
 
-EXCLUDED_EXTS = ["nef", "cr2"]
+def sniffer(media_file):
+    '''New style sniffer, used in two-steps check; requires to have .name'''
+    _log.info('Sniffing {0}'.format(MEDIA_TYPE))
+    try:
+        data = transcoders.discover(media_file.name)
+    except Exception as e:
+        # this is usually GLib.GError, but we don't really care which one
+        _log.warning(u'GStreamer: {0}'.format(unicode(e)))
+        raise MissingComponents(u'GStreamer: {0}'.format(unicode(e)))
+    _log.debug('Discovered: {0}'.format(data))
 
-def sniff_handler(media_file, filename):
-    name, ext = os.path.splitext(filename)
-    clean_ext = ext.lower()[1:]
+    if not data.get_video_streams():
+        raise MissingComponents('No video streams found in this video')
 
-    if clean_ext in EXCLUDED_EXTS:
-        # We don't handle this filetype, though gstreamer might think we can
-        return None
+    if data.get_result() != 0:  # it's 0 if success
+        try:
+            missing = data.get_misc().get_string('name')
+            _log.warning('GStreamer: missing {0}'.format(missing))
+        except AttributeError as e:
+            # AttributeError happens here on gstreamer >1.4, when get_misc
+            # returns None. There is a special function to get info about
+            # missing plugin. This info should be printed to logs for admin and
+            # showed to the user in a short and nice version
+            details = data.get_missing_elements_installer_details()
+            _log.warning('GStreamer: missing: {0}'.format(', '.join(details)))
+            missing = u', '.join([u'{0} ({1})'.format(*d.split('|')[3:])
+                                  for d in details])
+        raise MissingComponents(u'{0} is missing'.format(missing))
 
-    transcoder = transcoders.VideoTranscoder()
-    data = transcoder.discover(media_file.name)
+    return MEDIA_TYPE
 
-    _log.info('Sniffing {0}'.format(MEDIA_TYPE))
-    _log.debug('Discovered: {0}'.format(data))
 
-    if not data:
+def sniff_handler(media_file, filename):
+    try:
+        return sniffer(media_file)
+    except:
         _log.error('Could not discover {0}'.format(filename))
         return None
 
-    if data['is_video'] is True:
-        return MEDIA_TYPE
-
-    return None
+def get_tags(stream_info):
+    'gets all tags and their values from stream info'
+    taglist = stream_info.get_tags()
+    if not taglist:
+        return {}
+    tags = []
+    taglist.foreach(
+            lambda list, tag: tags.append((tag, list.get_value_index(tag, 0))))
+    tags = dict(tags)
+
+    # date/datetime should be converted from GDate/GDateTime to strings
+    if 'date' in tags:
+        date = tags['date']
+        tags['date'] = "%s-%s-%s" % (
+                date.year, date.month, date.day)
 
+    if 'datetime' in tags:
+        # TODO: handle timezone info; gst.get_time_zone_offset +
+        # python's tzinfo should help
+        dt = tags['datetime']
+        tags['datetime'] = datetime.datetime(
+            dt.get_year(), dt.get_month(), dt.get_day(), dt.get_hour(),
+            dt.get_minute(), dt.get_second(),
+            dt.get_microsecond()).isoformat()
+    for k, v in tags.items():
+        # types below are accepted by json; others must not present
+        if not isinstance(v, (dict, list, basestring, int, float, bool,
+                              type(None))):
+            del tags[k]
+    return dict(tags)
 
 def store_metadata(media_entry, metadata):
     """
     Store metadata from this video for this media entry.
     """
-    # Let's pull out the easy, not having to be converted ones first
-    stored_metadata = dict(
-        [(key, metadata[key])
-         for key in [
-             "videoheight", "videolength", "videowidth",
-             "audiorate", "audiolength", "audiochannels", "audiowidth",
-             "mimetype"]
-         if key in metadata])
-
-    # We have to convert videorate into a sequence because it's a
-    # special type normally..
-
-    if "videorate" in metadata:
-        videorate = metadata["videorate"]
-        stored_metadata["videorate"] = [videorate.num, videorate.denom]
-
-    # Also make a whitelist conversion of the tags.
-    if "tags" in metadata:
-        tags_metadata = metadata['tags']
-
-        # we don't use *all* of these, but we know these ones are
-        # safe...
-        tags = dict(
-            [(key, tags_metadata[key])
-             for key in [
-                 "application-name", "artist", "audio-codec", "bitrate",
-                 "container-format", "copyright", "encoder",
-                 "encoder-version", "license", "nominal-bitrate", "title",
-                 "video-codec"]
-             if key in tags_metadata])
-        if 'date' in tags_metadata:
-            date = tags_metadata['date']
-            tags['date'] = "%s-%s-%s" % (
-                date.year, date.month, date.day)
-
-        # TODO: handle timezone info; gst.get_time_zone_offset +
-        #   python's tzinfo should help
-        if 'datetime' in tags_metadata:
-            dt = tags_metadata['datetime']
-            tags['datetime'] = datetime.datetime(
-                dt.get_year(), dt.get_month(), dt.get_day(), dt.get_hour(),
-                dt.get_minute(), dt.get_second(),
-                dt.get_microsecond()).isoformat()
-
-        stored_metadata['tags'] = tags
-
+    stored_metadata = dict()
+    audio_info_list = metadata.get_audio_streams()
+    if audio_info_list:
+        stored_metadata['audio'] = []
+    for audio_info in audio_info_list:
+        stored_metadata['audio'].append(
+                {
+                    'channels': audio_info.get_channels(),
+                    'bitrate': audio_info.get_bitrate(),
+                    'depth': audio_info.get_depth(),
+                    'languange': audio_info.get_language(),
+                    'sample_rate': audio_info.get_sample_rate(),
+                    'tags': get_tags(audio_info)
+                })
+
+    video_info_list = metadata.get_video_streams()
+    if video_info_list:
+        stored_metadata['video'] = []
+    for video_info in video_info_list:
+        stored_metadata['video'].append(
+                {
+                    'width': video_info.get_width(),
+                    'height': video_info.get_height(),
+                    'bitrate': video_info.get_bitrate(),
+                    'depth': video_info.get_depth(),
+                    'videorate': [video_info.get_framerate_num(),
+                                  video_info.get_framerate_denom()],
+                    'tags': get_tags(video_info)
+                })
+
+    stored_metadata['common'] = {
+        'duration': metadata.get_duration(),
+        'tags': get_tags(metadata),
+    }
     # Only save this field if there's something to save
     if len(stored_metadata):
-        media_entry.media_data_init(
-            orig_metadata=stored_metadata)
+        media_entry.media_data_init(orig_metadata=stored_metadata)
 
 
 class CommonVideoProcessor(MediaProcessor):
@@ -213,15 +245,22 @@ class CommonVideoProcessor(MediaProcessor):
             return
 
         # Extract metadata and keep a record of it
-        metadata = self.transcoder.discover(self.process_filename)
+        metadata = transcoders.discover(self.process_filename)
+
+        # metadata's stream info here is a DiscovererContainerInfo instance,
+        # it gets split into DiscovererAudioInfo and DiscovererVideoInfo;
+        # metadata itself has container-related data in tags, like video-codec
         store_metadata(self.entry, metadata)
 
+        orig_dst_dimensions = (metadata.get_video_streams()[0].get_width(),
+                metadata.get_video_streams()[0].get_height())
+
         # Figure out whether or not we need to transcode this video or
         # if we can skip it
         if skip_transcode(metadata, medium_size):
             _log.debug('Skipping transcoding')
 
-            dst_dimensions = metadata['videowidth'], metadata['videoheight']
+            dst_dimensions = orig_dst_dimensions
 
             # If there is an original and transcoded, delete the transcoded
             # since it must be of lower quality then the original
@@ -236,21 +275,23 @@ class CommonVideoProcessor(MediaProcessor):
                                       vorbis_quality=vorbis_quality,
                                       progress_callback=progress_callback,
                                       dimensions=tuple(medium_size))
+            if self.transcoder.dst_data:
+                video_info = self.transcoder.dst_data.get_video_streams()[0]
+                dst_dimensions = (video_info.get_width(),
+                                  video_info.get_height())
+                self._keep_best()
 
-            dst_dimensions = self.transcoder.dst_data.videowidth,\
-                self.transcoder.dst_data.videoheight
-
-            self._keep_best()
-
-            # Push transcoded video to public storage
-            _log.debug('Saving medium...')
-            store_public(self.entry, 'webm_video', tmp_dst,
-                         self.name_builder.fill('{basename}.medium.webm'))
-            _log.debug('Saved medium')
+                # Push transcoded video to public storage
+                _log.debug('Saving medium...')
+                store_public(self.entry, 'webm_video', tmp_dst,
+                             self.name_builder.fill('{basename}.medium.webm'))
+                _log.debug('Saved medium')
 
-            self.entry.set_file_metadata('webm_video', **file_metadata)
+                self.entry.set_file_metadata('webm_video', **file_metadata)
 
-            self.did_transcode = True
+                self.did_transcode = True
+            else:
+                dst_dimensions = orig_dst_dimensions
 
         # Save the width and height of the transcoded video
         self.entry.media_data_init(
@@ -270,7 +311,7 @@ class CommonVideoProcessor(MediaProcessor):
             return
 
         # We will only use the width so that the correct scale is kept
-        transcoders.VideoThumbnailerMarkII(
+        transcoders.capture_thumb(
             self.process_filename,
             tmp_thumb,
             thumb_size[0])
@@ -456,7 +497,7 @@ class Transcoder(CommonVideoProcessor):
 
 class VideoProcessingManager(ProcessingManager):
     def __init__(self):
-        super(self.__class__, self).__init__()
+        super(VideoProcessingManager, self).__init__()
         self.add_processor(InitialProcessor)
         self.add_processor(Resizer)
         self.add_processor(Transcoder)
diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py
index 3a3fa97f..ba469af2 100644
--- a/mediagoblin/media_types/video/transcoders.py
+++ b/mediagoblin/media_types/video/transcoders.py
@@ -19,16 +19,20 @@ from __future__ import division
 import os
 import sys
 import logging
-import urllib
 import multiprocessing
-import gobject
+
+from mediagoblin.media_types.tools import discover
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
+
+#os.environ['GST_DEBUG'] = '4,python:4'
 
 old_argv = sys.argv
 sys.argv = []
 
-import pygst
-pygst.require('0.10')
-import gst
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import GObject, Gst, GstPbutils
+Gst.init(None)
 
 sys.argv = old_argv
 import struct
@@ -37,12 +41,8 @@ try:
 except ImportError:
     import Image
 
-from gst.extend import discoverer
-
 _log = logging.getLogger(__name__)
 
-gobject.threads_init()
-
 CPU_COUNT = 2
 
 try:
@@ -53,338 +53,92 @@ except NotImplementedError:
 os.putenv('GST_DEBUG_DUMP_DOT_DIR', '/tmp')
 
 
-def pixbuf_to_pilbuf(buf):
-    data = list()
-    for i in range(0, len(buf), 3):
-        r, g, b = struct.unpack('BBB', buf[i:i + 3])
-        data.append((r, g, b))
-
-    return data
-
-
-class VideoThumbnailerMarkII(object):
-    '''
-    Creates a thumbnail from a video file. Rewrite of VideoThumbnailer.
-
-    Large parts of the functionality and overall architectue contained within
-    this object is taken from Participatory Culture Foundation's
-    `gst_extractor.Extractor` object last seen at
-    https://github.com/pculture/miro/blob/master/tv/lib/frontends/widgets/gst/gst_extractor.py
-    in the `miro` codebase.
-
-    The `miro` codebase and the gst_extractor.py are licensed under the GNU
-    General Public License v2 or later.
-    '''
-    STATE_NULL = 0
-    STATE_HALTING = 1
-    STATE_PROCESSING = 2
-    STATE_PROCESSING_THUMBNAIL = 3
-
-    def __init__(self, source_path, dest_path, width=None, height=None,
-            position_callback=None):
-        self.state = self.STATE_NULL
-
-        self.has_reached_playbin_pause = False
-
-        self.thumbnail_pipeline = None
-
-        self.permission_to_take_picture = False
-
-        self.buffer_probes = {}
-
-        self.errors = []
-
-        self.source_path = os.path.abspath(source_path)
-        self.dest_path = os.path.abspath(dest_path)
-
-        self.width = width
-        self.height = height
-        self.position_callback = position_callback \
-                or self.wadsworth_position_callback
-
-        self.mainloop = gobject.MainLoop()
-
-        self.playbin = gst.element_factory_make('playbin')
-
-        self.videosink = gst.element_factory_make('fakesink', 'videosink')
-        self.audiosink = gst.element_factory_make('fakesink', 'audiosink')
-
-        self.playbin.set_property('video-sink', self.videosink)
-        self.playbin.set_property('audio-sink', self.audiosink)
-
-        self.playbin_message_bus = self.playbin.get_bus()
-
-        self.playbin_message_bus.add_signal_watch()
-        self.playbin_bus_watch_id = self.playbin_message_bus.connect(
-                'message',
-                self.on_playbin_message)
-
-        self.playbin.set_property(
-                'uri',
-                'file:{0}'.format(
-                    urllib.pathname2url(self.source_path)))
-
-        self.playbin.set_state(gst.STATE_PAUSED)
-
-        try:
-            self.run()
-        except Exception as exc:
-            _log.critical(
-                'Exception "{0}" caught, shutting down mainloop and re-raising'\
-                    .format(exc))
-            self.disconnect()
-            raise
-
-    def wadsworth_position_callback(self, duration, gst):
-        return self.duration / 100 * 30
-
-    def run(self):
-        self.mainloop.run()
-
-    def on_playbin_message(self, message_bus, message):
-        # Silenced to prevent clobbering of output
-        #_log.debug('playbin message: {0}'.format(message))
-
-        if message.type == gst.MESSAGE_ERROR:
-            _log.error('playbin error: {0}'.format(message))
-            gobject.idle_add(self.on_playbin_error)
-
-        if message.type == gst.MESSAGE_STATE_CHANGED:
-            prev_state, cur_state, pending_state = \
-                    message.parse_state_changed()
-
-            _log.debug('playbin state changed: \nprev: {0}\ncur: {1}\n \
-pending: {2}'.format(
-    prev_state,
-    cur_state,
-    pending_state))
-
-            if cur_state == gst.STATE_PAUSED:
-                if message.src == self.playbin:
-                    _log.info('playbin ready')
-                    gobject.idle_add(self.on_playbin_paused)
-
-    def on_playbin_paused(self):
-        if self.has_reached_playbin_pause:
-            _log.warn('Has already reached on_playbin_paused. Aborting \
-without doing anything this time.')
-            return False
-
-        self.has_reached_playbin_pause = True
-
-        # XXX: Why is this even needed at this point?
-        current_video = self.playbin.get_property('current-video')
-
-        if not current_video:
-            _log.critical('Could not get any video data \
-from playbin')
-        else:
-            _log.info('Got video data from playbin')
-
-        self.duration = self.get_duration(self.playbin)
-        self.permission_to_take_picture = True
-        self.buffer_probes = {}
-
-        pipeline = ''.join([
-            'filesrc location="%s" ! decodebin2 ! ' % self.source_path,
-            'ffmpegcolorspace ! videoscale ! ',
-            'video/x-raw-rgb,depth=24,bpp=24,pixel-aspect-ratio=1/1',
-            ',width={0}'.format(self.width) if self.width else '',
-            ',height={0}'.format(self.height) if self.height else '',
-            ' ! ',
-            'fakesink signal-handoffs=True'])
-
-        _log.debug('thumbnail_pipeline: {0}'.format(pipeline))
-
-        self.thumbnail_pipeline = gst.parse_launch(pipeline)
-        self.thumbnail_message_bus = self.thumbnail_pipeline.get_bus()
-        self.thumbnail_message_bus.add_signal_watch()
-        self.thumbnail_bus_watch_id = self.thumbnail_message_bus.connect(
-                'message',
-                self.on_thumbnail_message)
-
-        self.thumbnail_pipeline.set_state(gst.STATE_PAUSED)
-
-        gobject.timeout_add(3000, self.on_gobject_timeout)
-
-        return False
-
-    def on_thumbnail_message(self, message_bus, message):
-        # This is silenced to prevent clobbering of the terminal window
-        #_log.debug('thumbnail message: {0}'.format(message))
-
-        if message.type == gst.MESSAGE_ERROR:
-            _log.error('thumbnail error: {0}'.format(message.parse_error()))
-            gobject.idle_add(self.on_thumbnail_error, message)
-
-        if message.type == gst.MESSAGE_STATE_CHANGED:
-            prev_state, cur_state, pending_state = \
-                    message.parse_state_changed()
-
-            _log.debug('thumbnail state changed: \nprev: {0}\ncur: {1}\n \
-pending: {2}'.format(
-    prev_state,
-    cur_state,
-    pending_state))
-
-            if cur_state == gst.STATE_PAUSED and \
-               not self.state == self.STATE_PROCESSING_THUMBNAIL:
-                # Find the fakesink sink pad and attach the on_buffer_probe
-                # handler to it.
-                seek_amount = self.position_callback(self.duration, gst)
-
-                seek_result = self.thumbnail_pipeline.seek(
-                        1.0,
-                        gst.FORMAT_TIME,
-                        gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE,
-                        gst.SEEK_TYPE_SET,
-                        seek_amount,
-                        gst.SEEK_TYPE_NONE,
-                        0)
-
-                if not seek_result:
-                    _log.info('Could not seek.')
-                else:
-                    _log.info('Seek successful, attaching buffer probe')
-                    self.state = self.STATE_PROCESSING_THUMBNAIL
-                    for sink in self.thumbnail_pipeline.sinks():
-                        sink_name = sink.get_name()
-                        sink_factory_name = sink.get_factory().get_name()
-
-                        if sink_factory_name == 'fakesink':
-                            sink_pad = sink.get_pad('sink')
-
-                            self.buffer_probes[sink_name] = sink_pad\
-                                    .add_buffer_probe(
-                                            self.on_pad_buffer_probe,
-                                            sink_name)
-
-                            _log.info('Attached buffer probes: {0}'.format(
-                                self.buffer_probes))
-
-                            break
-
-
-            elif self.state == self.STATE_PROCESSING_THUMBNAIL:
-                _log.info('Already processing thumbnail')
-
-    def on_pad_buffer_probe(self, *args):
-        _log.debug('buffer probe handler: {0}'.format(args))
-        gobject.idle_add(lambda: self.take_snapshot(*args))
-
-    def take_snapshot(self, pad, buff, name):
-        if self.state == self.STATE_HALTING:
-            _log.debug('Pipeline is halting, will not take snapshot')
-            return False
-
-        _log.info('Taking snapshot! ({0})'.format(
-            (pad, buff, name)))
-        try:
-            caps = buff.caps
-            if caps is None:
-                _log.error('No buffer caps present /take_snapshot')
-                self.disconnect()
-
-            _log.debug('caps: {0}'.format(caps))
-
-            filters = caps[0]
-            width = filters['width']
-            height = filters['height']
-
-            im = Image.new('RGB', (width, height))
-
-            data = pixbuf_to_pilbuf(buff.data)
-
-            im.putdata(data)
-
-            im.save(self.dest_path)
-
-            _log.info('Saved snapshot!')
-
-            self.disconnect()
-
-        except gst.QueryError as exc:
-            _log.error('take_snapshot - QueryError: {0}'.format(exc))
-
-        return False
-
-    def on_thumbnail_error(self, message):
-        scaling_failed = False
-
-        if 'Error calculating the output scaled size - integer overflow' \
-           in message.parse_error()[1]:
-            # GStreamer videoscale sometimes fails to calculate the dimensions
-            # given only one of the destination dimensions and the source
-            # dimensions. This is a workaround in case videoscale returns an
-            # error that indicates this has happened.
-            scaling_failed = True
-            _log.error('Thumbnailing failed because of videoscale integer'
-                       ' overflow. Will retry with fallback.')
-        else:
-            _log.error('Thumbnailing failed: {0}'.format(message.parse_error()))
-
-        # Kill the current mainloop
-        self.disconnect()
-
-        if scaling_failed:
-            # Manually scale the destination dimensions
-            _log.info('Retrying with manually set sizes...')
-
-            info = VideoTranscoder().discover(self.source_path)
-
-            h = info['videoheight']
-            w = info['videowidth']
-            ratio = 180 / int(w)
-            h = int(h * ratio)
-
-            self.__init__(self.source_path, self.dest_path, 180, h)
-
-    def disconnect(self):
-        self.state = self.STATE_HALTING
-
-        if self.playbin is not None:
-            self.playbin.set_state(gst.STATE_NULL)
-
-            for sink in self.playbin.sinks():
-                sink_name = sink.get_name()
-                sink_factory_name = sink.get_factory().get_name()
-
-                if sink_factory_name == 'fakesink':
-                    sink_pad = sink.get_pad('sink')
-                    sink_pad.remove_buffer_probe(self.buffer_probes[sink_name])
-                    del self.buffer_probes[sink_name]
-
-            self.playbin = None
-
-        if self.thumbnail_pipeline is not None:
-            self.thumbnail_pipeline.set_state(gst.STATE_NULL)
-            self.thumbnail_pipeline = None
-
-        if self.playbin_message_bus is not None:
-            self.playbin_message_bus.disconnect(self.playbin_bus_watch_id)
-            self.playbin_message_bus = None
-
-        self.halt()
-
-    def halt(self):
-        gobject.idle_add(self.mainloop.quit)
-
-    def on_gobject_timeout(self):
-        _log.critical('Reached gobject timeout')
-        self.disconnect()
-
-    def get_duration(self, pipeline, attempt=1):
-        if attempt == 5:
-            _log.critical('Pipeline duration query retry limit reached.')
-            return 0
-
-        try:
-            return pipeline.query_duration(gst.FORMAT_TIME)[0]
-        except gst.QueryError as exc:
-            _log.error('Could not get duration on attempt {0}: {1}'.format(
-                attempt,
-                exc))
-            return self.get_duration(pipeline, attempt + 1)
+def capture_thumb(video_path, dest_path, width=None, height=None, percent=0.5):
+    def pad_added(element, pad, connect_to):
+        '''This is a callback to dynamically add element to pipeline'''
+        caps = pad.query_caps(None)
+        name = caps.to_string()
+        _log.debug('on_pad_added: {0}'.format(name))
+        if name.startswith('video') and not connect_to.is_linked():
+            pad.link(connect_to)
+
+    # construct pipeline: uridecodebin ! videoconvert ! videoscale ! \
+    # ! CAPS ! appsink
+    pipeline = Gst.Pipeline()
+    uridecodebin = Gst.ElementFactory.make('uridecodebin', None)
+    uridecodebin.set_property('uri', 'file://{0}'.format(video_path))
+    videoconvert = Gst.ElementFactory.make('videoconvert', None)
+    uridecodebin.connect('pad-added', pad_added,
+                         videoconvert.get_static_pad('sink'))
+    videoscale = Gst.ElementFactory.make('videoscale', None)
+
+    # create caps for video scaling
+    caps_struct = Gst.Structure.new_empty('video/x-raw')
+    caps_struct.set_value('pixel-aspect-ratio', Gst.Fraction(1, 1))
+    caps_struct.set_value('format', 'RGB')
+    if height:
+        caps_struct.set_value('height', height)
+    if width:
+        caps_struct.set_value('width', width)
+    caps = Gst.Caps.new_empty()
+    caps.append_structure(caps_struct)
+
+    # sink everything to memory
+    appsink = Gst.ElementFactory.make('appsink', None)
+    appsink.set_property('caps', caps)
+
+    # add everything to pipeline
+    elements = [uridecodebin, videoconvert, videoscale, appsink]
+    for e in elements:
+        pipeline.add(e)
+    videoconvert.link(videoscale)
+    videoscale.link(appsink)
+
+    # pipeline constructed, starting playing, but first some preparations
+    # seek to 50% of the file is required
+    pipeline.set_state(Gst.State.PAUSED)
+    # timeout of 3 seconds below was set experimentally
+    state = pipeline.get_state(Gst.SECOND * 3)
+    if state[0] != Gst.StateChangeReturn.SUCCESS:
+        _log.warning('state change failed, {0}'.format(state))
+        return
+
+    # get duration
+    (success, duration) = pipeline.query_duration(Gst.Format.TIME)
+    if not success:
+        _log.warning('query_duration failed')
+        return
+
+    seek_to = int(duration * int(percent * 100) / 100)
+    _log.debug('Seeking to {0} of {1}'.format(
+            float(seek_to) / Gst.SECOND, float(duration) / Gst.SECOND))
+    seek = pipeline.seek_simple(Gst.Format.TIME, Gst.SeekFlags.FLUSH, seek_to)
+    if not seek:
+        _log.warning('seek failed')
+        return
+
+    # get sample, retrieve it's format and save
+    sample = appsink.emit("pull-preroll")
+    if not sample:
+        _log.warning('could not get sample')
+        return
+    caps = sample.get_caps()
+    if not caps:
+        _log.warning('could not get snapshot format')
+        return
+    structure = caps.get_structure(0)
+    (success, width) = structure.get_int('width')
+    (success, height) = structure.get_int('height')
+    buffer = sample.get_buffer()
+
+    # get the image from the buffer and save it to disk
+    im = Image.frombytes('RGB', (width, height),
+                         buffer.extract_dup(0, buffer.get_size()))
+    im.save(dest_path)
+    _log.info('thumbnail saved to {0}'.format(dest_path))
+
+    # cleanup
+    pipeline.set_state(Gst.State.NULL)
 
 
 class VideoTranscoder(object):
@@ -393,16 +147,12 @@ class VideoTranscoder(object):
 
     Transcodes the SRC video file to a VP8 WebM video file at DST
 
-     - Does the same thing as VideoThumbnailer, but produces a WebM vp8
-       and vorbis video file.
-     - The VideoTranscoder exceeds the VideoThumbnailer in the way
-       that it was refined afterwards and therefore is done more
-       correctly.
+     - Produces a WebM vp8 and vorbis video file.
     '''
     def __init__(self):
         _log.info('Initializing VideoTranscoder...')
         self.progress_percentage = None
-        self.loop = gobject.MainLoop()
+        self.loop = GObject.MainLoop()
 
     def transcode(self, src, dst, **kwargs):
         '''
@@ -435,153 +185,84 @@ class VideoTranscoder(object):
         if not type(self.destination_dimensions) == tuple:
             raise Exception('dimensions must be tuple: (width, height)')
 
-        self._setup()
-        self._run()
-
-    # XXX: This could be a static method.
-    def discover(self, src):
-        '''
-        Discover properties about a media file
-        '''
-        _log.info('Discovering {0}'.format(src))
-
-        self.source_path = src
-        self._setup_discover(discovered_callback=self.__on_discovered)
-
-        self.discoverer.discover()
-
-        self.loop.run()
-
-        if hasattr(self, '_discovered_data'):
-            return self._discovered_data.__dict__
-        else:
-            return None
-
-    def __on_discovered(self, data, is_media):
-        _log.debug('Discovered: {0}'.format(data))
-        if not is_media:
-            self.__stop()
-            raise Exception('Could not discover {0}'.format(self.source_path))
-
-        self._discovered_data = data
-
-        self.__stop_mainloop()
-
-    def _setup(self):
-        self._setup_discover()
         self._setup_pipeline()
-
-    def _run(self):
-        _log.info('Discovering...')
-        self.discoverer.discover()
-        _log.info('Done')
-
-        _log.debug('Initializing MainLoop()')
-        self.loop.run()
-
-    def _setup_discover(self, **kw):
-        _log.debug('Setting up discoverer')
-        self.discoverer = discoverer.Discoverer(self.source_path)
-
-        # Connect self.__discovered to the 'discovered' event
-        self.discoverer.connect(
-            'discovered',
-            kw.get('discovered_callback', self.__discovered))
-
-    def __discovered(self, data, is_media):
-        '''
-        Callback for media discoverer.
-        '''
-        if not is_media:
-            self.__stop()
-            raise Exception('Could not discover {0}'.format(self.source_path))
-
-        _log.debug('__discovered, data: {0}'.format(data.__dict__))
-
-        self.data = data
-
-        # Launch things that should be done after discovery
+        self.data = discover(self.source_path)
         self._link_elements()
         self.__setup_videoscale_capsfilter()
-
-        # Tell the transcoding pipeline to start running
-        self.pipeline.set_state(gst.STATE_PLAYING)
+        self.pipeline.set_state(Gst.State.PLAYING)
         _log.info('Transcoding...')
+        _log.debug('Initializing MainLoop()')
+        self.loop.run()
+
 
     def _setup_pipeline(self):
         _log.debug('Setting up transcoding pipeline')
         # Create the pipeline bin.
-        self.pipeline = gst.Pipeline('VideoTranscoderPipeline')
+        self.pipeline = Gst.Pipeline.new('VideoTranscoderPipeline')
 
         # Create all GStreamer elements, starting with
         # filesrc & decoder
-        self.filesrc = gst.element_factory_make('filesrc', 'filesrc')
+        self.filesrc = Gst.ElementFactory.make('filesrc', 'filesrc')
         self.filesrc.set_property('location', self.source_path)
         self.pipeline.add(self.filesrc)
 
-        self.decoder = gst.element_factory_make('decodebin2', 'decoder')
-        self.decoder.connect('new-decoded-pad', self._on_dynamic_pad)
+        self.decoder = Gst.ElementFactory.make('decodebin', 'decoder')
+        self.decoder.connect('pad-added', self._on_dynamic_pad)
         self.pipeline.add(self.decoder)
 
         # Video elements
-        self.videoqueue = gst.element_factory_make('queue', 'videoqueue')
+        self.videoqueue = Gst.ElementFactory.make('queue', 'videoqueue')
         self.pipeline.add(self.videoqueue)
 
-        self.videorate = gst.element_factory_make('videorate', 'videorate')
+        self.videorate = Gst.ElementFactory.make('videorate', 'videorate')
         self.pipeline.add(self.videorate)
 
-        self.ffmpegcolorspace = gst.element_factory_make(
-            'ffmpegcolorspace', 'ffmpegcolorspace')
-        self.pipeline.add(self.ffmpegcolorspace)
+        self.videoconvert = Gst.ElementFactory.make('videoconvert',
+                                                    'videoconvert')
+        self.pipeline.add(self.videoconvert)
 
-        self.videoscale = gst.element_factory_make('ffvideoscale', 'videoscale')
-        #self.videoscale.set_property('method', 2)  # I'm not sure this works
-        #self.videoscale.set_property('add-borders', 0)
+        self.videoscale = Gst.ElementFactory.make('videoscale', 'videoscale')
         self.pipeline.add(self.videoscale)
 
-        self.capsfilter = gst.element_factory_make('capsfilter', 'capsfilter')
+        self.capsfilter = Gst.ElementFactory.make('capsfilter', 'capsfilter')
         self.pipeline.add(self.capsfilter)
 
-        self.vp8enc = gst.element_factory_make('vp8enc', 'vp8enc')
-        self.vp8enc.set_property('quality', self.vp8_quality)
+        self.vp8enc = Gst.ElementFactory.make('vp8enc', 'vp8enc')
         self.vp8enc.set_property('threads', self.vp8_threads)
-        self.vp8enc.set_property('max-latency', 25)
         self.pipeline.add(self.vp8enc)
 
         # Audio elements
-        self.audioqueue = gst.element_factory_make('queue', 'audioqueue')
+        self.audioqueue = Gst.ElementFactory.make('queue', 'audioqueue')
         self.pipeline.add(self.audioqueue)
 
-        self.audiorate = gst.element_factory_make('audiorate', 'audiorate')
+        self.audiorate = Gst.ElementFactory.make('audiorate', 'audiorate')
         self.audiorate.set_property('tolerance', 80000000)
         self.pipeline.add(self.audiorate)
 
-        self.audioconvert = gst.element_factory_make('audioconvert', 'audioconvert')
+        self.audioconvert = Gst.ElementFactory.make('audioconvert', 'audioconvert')
         self.pipeline.add(self.audioconvert)
-
-        self.audiocapsfilter = gst.element_factory_make('capsfilter',
-                                                        'audiocapsfilter')
-        audiocaps = ['audio/x-raw-float']
-        self.audiocapsfilter.set_property(
-            'caps',
-            gst.caps_from_string(
-                ','.join(audiocaps)))
+        self.audiocapsfilter = Gst.ElementFactory.make('capsfilter',
+                                                       'audiocapsfilter')
+        audiocaps = Gst.Caps.new_empty()
+        audiocaps_struct = Gst.Structure.new_empty('audio/x-raw')
+        audiocaps.append_structure(audiocaps_struct)
+        self.audiocapsfilter.set_property('caps', audiocaps)
         self.pipeline.add(self.audiocapsfilter)
 
-        self.vorbisenc = gst.element_factory_make('vorbisenc', 'vorbisenc')
+        self.vorbisenc = Gst.ElementFactory.make('vorbisenc', 'vorbisenc')
         self.vorbisenc.set_property('quality', self.vorbis_quality)
         self.pipeline.add(self.vorbisenc)
 
         # WebMmux & filesink
-        self.webmmux = gst.element_factory_make('webmmux', 'webmmux')
+        self.webmmux = Gst.ElementFactory.make('webmmux', 'webmmux')
         self.pipeline.add(self.webmmux)
 
-        self.filesink = gst.element_factory_make('filesink', 'filesink')
+        self.filesink = Gst.ElementFactory.make('filesink', 'filesink')
         self.filesink.set_property('location', self.destination_path)
         self.pipeline.add(self.filesink)
 
         # Progressreport
-        self.progressreport = gst.element_factory_make(
+        self.progressreport = Gst.ElementFactory.make(
             'progressreport', 'progressreport')
         # Update every second
         self.progressreport.set_property('update-freq', 1)
@@ -600,48 +281,41 @@ class VideoTranscoder(object):
         # 'new-decoded-pad' which links decoded src pads to either a video
         # or audio sink
         self.filesrc.link(self.decoder)
-
-        # Link all the video elements in a row to webmmux
-        gst.element_link_many(
-            self.videoqueue,
-            self.videorate,
-            self.ffmpegcolorspace,
-            self.videoscale,
-            self.capsfilter,
-            self.vp8enc,
-            self.webmmux)
-
-        if self.data.is_audio:
-            # Link all the audio elements in a row to webmux
-            gst.element_link_many(
-                self.audioqueue,
-                self.audiorate,
-                self.audioconvert,
-                self.audiocapsfilter,
-                self.vorbisenc,
-                self.webmmux)
-
-        gst.element_link_many(
-            self.webmmux,
-            self.progressreport,
-            self.filesink)
+        # link the rest
+        self.videoqueue.link(self.videorate)
+        self.videorate.link(self.videoconvert)
+        self.videoconvert.link(self.videoscale)
+        self.videoscale.link(self.capsfilter)
+        self.capsfilter.link(self.vp8enc)
+        self.vp8enc.link(self.webmmux)
+
+        if self.data.get_audio_streams():
+            self.audioqueue.link(self.audiorate)
+            self.audiorate.link(self.audioconvert)
+            self.audioconvert.link(self.audiocapsfilter)
+            self.audiocapsfilter.link(self.vorbisenc)
+            self.vorbisenc.link(self.webmmux)
+        self.webmmux.link(self.progressreport)
+        self.progressreport.link(self.filesink)
 
         # Setup the message bus and connect _on_message to the pipeline
         self._setup_bus()
 
-    def _on_dynamic_pad(self, dbin, pad, islast):
+    def _on_dynamic_pad(self, dbin, pad):
         '''
-        Callback called when ``decodebin2`` has a pad that we can connect to
+        Callback called when ``decodebin`` has a pad that we can connect to
         '''
         # Intersect the capabilities of the video sink and the pad src
         # Then check if they have no common capabilities.
-        if self.ffmpegcolorspace.get_pad_template('sink')\
-                .get_caps().intersect(pad.get_caps()).is_empty():
+        if (self.videorate.get_static_pad('sink').get_pad_template()
+                .get_caps().intersect(pad.query_caps()).is_empty()):
             # It is NOT a video src pad.
-            pad.link(self.audioqueue.get_pad('sink'))
+            _log.debug('linking audio to the pad dynamically')
+            pad.link(self.audioqueue.get_static_pad('sink'))
         else:
             # It IS a video src pad.
-            pad.link(self.videoqueue.get_pad('sink'))
+            _log.debug('linking video to the pad dynamically')
+            pad.link(self.videoqueue.get_static_pad('sink'))
 
     def _setup_bus(self):
         self.bus = self.pipeline.get_bus()
@@ -652,73 +326,54 @@ class VideoTranscoder(object):
         '''
         Sets up the output format (width, height) for the video
         '''
-        caps = ['video/x-raw-yuv', 'pixel-aspect-ratio=1/1', 'framerate=30/1']
-
-        if self.data.videoheight > self.data.videowidth:
-            # Whoa! We have ourselves a portrait video!
-            caps.append('height={0}'.format(
-                    self.destination_dimensions[1]))
+        caps_struct = Gst.Structure.new_empty('video/x-raw')
+        caps_struct.set_value('pixel-aspect-ratio', Gst.Fraction(1, 1))
+        caps_struct.set_value('framerate', Gst.Fraction(30, 1))
+        video_info = self.data.get_video_streams()[0]
+        if video_info.get_height() > video_info.get_width():
+            # portrait
+            caps_struct.set_value('height', self.destination_dimensions[1])
         else:
-            # It's a landscape, phew, how normal.
-            caps.append('width={0}'.format(
-                    self.destination_dimensions[0]))
-
-        self.capsfilter.set_property(
-            'caps',
-            gst.caps_from_string(
-                ','.join(caps)))
+            # landscape
+            caps_struct.set_value('width', self.destination_dimensions[0])
+        caps = Gst.Caps.new_empty()
+        caps.append_structure(caps_struct)
+        self.capsfilter.set_property('caps', caps)
 
     def _on_message(self, bus, message):
         _log.debug((bus, message, message.type))
-
-        t = message.type
-
-        if message.type == gst.MESSAGE_EOS:
-            self._discover_dst_and_stop()
+        if message.type == Gst.MessageType.EOS:
+            self.dst_data = discover(self.destination_path)
+            self.__stop()
             _log.info('Done')
-
-        elif message.type == gst.MESSAGE_ELEMENT:
-            if message.structure.get_name() == 'progress':
-                data = dict(message.structure)
+        elif message.type == Gst.MessageType.ELEMENT:
+            if message.has_name('progress'):
+                structure = message.get_structure()
                 # Update progress state if it has changed
-                if self.progress_percentage != data.get('percent'):
-                    self.progress_percentage = data.get('percent')
+                (success, percent) = structure.get_int('percent')
+                if self.progress_percentage != percent and success:
+                    self.progress_percentage = percent
                     if self._progress_callback:
-                        self._progress_callback(data.get('percent'))
-
-                    _log.info('{percent}% done...'.format(
-                            percent=data.get('percent')))
-                _log.debug(data)
-
-        elif t == gst.MESSAGE_ERROR:
-            _log.error((bus, message))
+                        self._progress_callback(percent)
+                    _log.info('{percent}% done...'.format(percent=percent))
+        elif message.type == Gst.MessageType.ERROR:
+            _log.error('Got error: {0}'.format(message.parse_error()))
+            self.dst_data = None
             self.__stop()
 
-    def _discover_dst_and_stop(self):
-        self.dst_discoverer = discoverer.Discoverer(self.destination_path)
-
-        self.dst_discoverer.connect('discovered', self.__dst_discovered)
-
-        self.dst_discoverer.discover()
-
-    def __dst_discovered(self, data, is_media):
-        self.dst_data = data
-
-        self.__stop()
-
     def __stop(self):
         _log.debug(self.loop)
 
         if hasattr(self, 'pipeline'):
             # Stop executing the pipeline
-            self.pipeline.set_state(gst.STATE_NULL)
+            self.pipeline.set_state(Gst.State.NULL)
 
         # This kills the loop, mercifully
-        gobject.idle_add(self.__stop_mainloop)
+        GObject.idle_add(self.__stop_mainloop)
 
     def __stop_mainloop(self):
         '''
-        Wrapper for gobject.MainLoop.quit()
+        Wrapper for GObject.MainLoop.quit()
 
         This wrapper makes us able to see if self.loop.quit has been called
         '''
@@ -729,7 +384,6 @@ class VideoTranscoder(object):
 
 if __name__ == '__main__':
     os.nice(19)
-    logging.basicConfig()
     from optparse import OptionParser
 
     parser = OptionParser(
diff --git a/mediagoblin/media_types/video/util.py b/mediagoblin/media_types/video/util.py
index 29b7f410..d3d29279 100644
--- a/mediagoblin/media_types/video/util.py
+++ b/mediagoblin/media_types/video/util.py
@@ -33,27 +33,33 @@ def skip_transcode(metadata, size):
     medium_config = mgg.global_config['media:medium']
 
     _log.debug('skip_transcode config: {0}'.format(config))
-
-    if config['mime_types'] and metadata.get('mimetype'):
-        if not metadata['mimetype'] in config['mime_types']:
+    tags = metadata.get_tags()
+    if config['mime_types'] and tags.get_string('mimetype')[0]:
+        if not tags.get_string('mimetype')[1] in config['mime_types']:
             return False
 
-    if config['container_formats'] and metadata['tags'].get('container-format'):
-        if not metadata['tags']['container-format'] in config['container_formats']:
+    if config['container_formats'] and tags.get_string('container-format')[0]:
+        if not (tags.get_string('container-format')[1] in
+                config['container_formats']):
             return False
 
-    if config['video_codecs'] and metadata['tags'].get('video-codec'):
-        if not metadata['tags']['video-codec'] in config['video_codecs']:
-            return False
+    if config['video_codecs']:
+        for video_info in metadata.get_video_streams():
+            if not (video_info.get_tags().get_string('video-codec')[1] in
+                    config['video_codecs']):
+                return False
 
-    if config['audio_codecs'] and metadata['tags'].get('audio-codec'):
-        if not metadata['tags']['audio-codec'] in config['audio_codecs']:
-            return False
+    if config['audio_codecs']:
+        for audio_info in metadata.get_audio_streams():
+            if not (audio_info.get_tags().get_string('audio-codec')[1] in
+                    config['audio_codecs']):
+                return False
 
     if config['dimensions_match']:
-        if not metadata['videoheight'] <= size[1]:
-            return False
-        if not metadata['videowidth'] <= size[0]:
-            return False
+        for video_info in metadata.get_video_streams():
+            if not video_info.get_height() <= size[1]:
+                return False
+            if not video_info.get_width() <= size[0]:
+                return False
 
     return True
diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py
index 26ed66fa..7da31680 100644
--- a/mediagoblin/mg_globals.py
+++ b/mediagoblin/mg_globals.py
@@ -21,6 +21,7 @@ import gettext
 import pkg_resources
 import threading
 
+import six
 
 #############################
 # General mediagoblin globals
@@ -64,7 +65,7 @@ def setup_globals(**kwargs):
     """
     from mediagoblin import mg_globals
 
-    for key, value in kwargs.iteritems():
+    for key, value in six.iteritems(kwargs):
         if not hasattr(mg_globals, key):
             raise AssertionError("Global %s not known" % key)
         setattr(mg_globals, key, value)
diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py
index 8d758f18..0bcd8762 100644
--- a/mediagoblin/moderation/tools.py
+++ b/mediagoblin/moderation/tools.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
+
 from mediagoblin import mg_globals
 from mediagoblin.db.models import User, Privilege, UserBan
 from mediagoblin.db.base import Session
@@ -22,8 +24,9 @@ from mediagoblin.tools.response import redirect
 from datetime import datetime
 from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 
+
 def take_punitive_actions(request, form, report, user):
-    message_body =''
+    message_body = ''
 
     # The bulk of this action is running through all of the different
     # punitive actions that a moderator could take.
@@ -212,6 +215,6 @@ def parse_report_panel_settings(form):
         filters['reporter_id'] = form.reporter.data
 
     filters = dict((k, v)
-        for k, v in filters.iteritems() if v)
+        for k, v in six.iteritems(filters) if v)
 
     return filters
diff --git a/mediagoblin/oauth/oauth.py b/mediagoblin/oauth/oauth.py
index 8a60392c..c7951734 100644
--- a/mediagoblin/oauth/oauth.py
+++ b/mediagoblin/oauth/oauth.py
@@ -13,6 +13,7 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import datetime
 
 from oauthlib.common import Request
 from oauthlib.oauth1 import RequestValidator
@@ -27,6 +28,18 @@ class GMGRequestValidator(RequestValidator):
         self.POST = data
         super(GMGRequestValidator, self).__init__(*args, **kwargs)
 
+    def check_nonce(self, nonce):
+        """
+        This checks that the nonce given is a valid nonce
+
+        RequestValidator.check_nonce checks that it's between a maximum and
+        minimum length which, not only does pump.io not do this from what
+        I can see but there is nothing in rfc5849 which suggests a maximum or
+        minium length should be required so I'm removing that check
+        """
+        # Check the nonce only contains a subset of the safe characters.
+        return set(nonce) <= self.safe_characters
+
     def save_request_token(self, token, request):
         """ Saves request token in db """
         client_id = self.POST[u"oauth_consumer_key"]
@@ -64,6 +77,14 @@ class GMGRequestValidator(RequestValidator):
     def validate_timestamp_and_nonce(self, client_key, timestamp,
                                      nonce, request, request_token=None,
                                      access_token=None):
+        # RFC5849 (OAuth 1.0) section 3.3 says the timestamp is going
+        # to be seconds after the epoch, we need to convert for postgres
+        try:
+            timestamp = datetime.datetime.fromtimestamp(float(timestamp))
+        except ValueError:
+            # Well, the client must have passed up something ridiculous
+            return False
+
         nc = NonceTimestamp.query.filter_by(timestamp=timestamp, nonce=nonce)
         nc = nc.first()
         if nc is None:
diff --git a/mediagoblin/oauth/views.py b/mediagoblin/oauth/views.py
index 90ad5bbf..1b4787d6 100644
--- a/mediagoblin/oauth/views.py
+++ b/mediagoblin/oauth/views.py
@@ -15,7 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
-import string
+import urllib
+
+import six
 
 from oauthlib.oauth1.rfc5849.utils import UNICODE_ASCII_CHARACTER_SET
 from oauthlib.oauth1 import (RequestTokenEndpoint, AuthorizationEndpoint,
@@ -124,21 +126,21 @@ def client_register(request):
         error = "Invalid registration type"
         return json_response({"error": error}, status=400)
 
-    logo_url = data.get("logo_url", client.logo_url)
-    if logo_url is not None and not validate_url(logo_url):
-        error = "Logo URL {0} is not a valid URL.".format(logo_url)
+    logo_uri = data.get("logo_uri", client.logo_url)
+    if logo_uri is not None and not validate_url(logo_uri):
+        error = "Logo URI {0} is not a valid URI.".format(logo_uri)
         return json_response(
                 {"error": error},
                 status=400
                 )
     else:
-        client.logo_url = logo_url
+        client.logo_url = logo_uri
 
     client.application_name = data.get("application_name", None)
 
     contacts = data.get("contacts", None)
     if contacts is not None:
-        if type(contacts) is not unicode:
+        if not isinstance(contacts, six.text_type):
             error = "Contacts must be a string of space-seporated email addresses."
             return json_response({"error": error}, status=400)
 
@@ -154,7 +156,7 @@ def client_register(request):
 
     redirect_uris = data.get("redirect_uris", None)
     if redirect_uris is not None:
-        if type(redirect_uris) is not unicode:
+        if not isinstance(redirect_uris, six.text_type):
             error = "redirect_uris must be space-seporated URLs."
             return json_response({"error": error}, status=400)
 
@@ -189,10 +191,6 @@ def request_token(request):
         error = "Could not decode data."
         return json_response({"error": error}, status=400)
 
-    if data == "":
-        error = "Unknown Content-Type"
-        return json_response({"error": error}, status=400)
-
     if not data and request.headers:
         data = request.headers
 
@@ -316,10 +314,13 @@ def authorize_finish(request):
             oauth_request.verifier
             )
 
+    # It's come from the OAuth headers so it'll be encoded.
+    redirect_url = urllib.unquote(oauth_request.callback)
+
     return redirect(
             request,
             querystring=querystring,
-            location=oauth_request.callback
+            location=redirect_url
             )
 
 @csrf_exempt
diff --git a/mediagoblin/plugins/api/tools.py b/mediagoblin/plugins/api/tools.py
index d1b3ebb1..56256236 100644
--- a/mediagoblin/plugins/api/tools.py
+++ b/mediagoblin/plugins/api/tools.py
@@ -18,9 +18,11 @@ import logging
 import json
 
 from functools import wraps
-from urlparse import urljoin
 from werkzeug.exceptions import Forbidden
 from werkzeug.wrappers import Response
+
+from six.moves.urllib.parse import urljoin
+
 from mediagoblin import mg_globals
 from mediagoblin.tools.pluginapi import PluginManager
 from mediagoblin.storage.filestorage import BasicFileStorage
diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py
index e8af7988..23341065 100644
--- a/mediagoblin/plugins/api/views.py
+++ b/mediagoblin/plugins/api/views.py
@@ -17,6 +17,8 @@
 import json
 import logging
 
+import six
+
 from werkzeug.exceptions import BadRequest
 from werkzeug.wrappers import Response
 
@@ -24,8 +26,7 @@ from mediagoblin.tools.translate import pass_to_ugettext as _
 from mediagoblin.tools.response import json_response
 from mediagoblin.decorators import require_active_login
 from mediagoblin.meddleware.csrf import csrf_exempt
-from mediagoblin.media_types import \
-    InvalidFileType, FileTypeNotSupported
+from mediagoblin.media_types import FileTypeNotSupported
 from mediagoblin.plugins.api.tools import api_auth, get_entry_serializable
 from mediagoblin.submit.lib import \
     check_file_field, submit_media, get_upload_file_limits, \
@@ -55,16 +56,16 @@ def post_entry(request):
 
     callback_url = request.form.get('callback_url')
     if callback_url:
-        callback_url = unicode(callback_url)
+        callback_url = six.text_type(callback_url)
     try:
         entry = submit_media(
             mg_app=request.app, user=request.user,
             submitted_file=request.files['file'],
             filename=request.files['file'].filename,
-            title=unicode(request.form.get('title')),
-            description=unicode(request.form.get('description')),
-            license=unicode(request.form.get('license', '')),
-            tags_string=unicode(request.form.get('tags', '')),
+            title=six.text_type(request.form.get('title')),
+            description=six.text_type(request.form.get('description')),
+            license=six.text_type(request.form.get('license', '')),
+            tags_string=six.text_type(request.form.get('tags', '')),
             upload_limit=upload_limit, max_file_size=max_file_size,
             callback_url=callback_url)
 
@@ -81,17 +82,8 @@ def post_entry(request):
     except UserPastUploadLimit:
         raise BadRequest(
             _('Sorry, you have reached your upload limit.'))
-
-    except Exception as e:
-        '''
-        This section is intended to catch exceptions raised in
-        mediagoblin.media_types
-        '''
-        if isinstance(e, InvalidFileType) or \
-                isinstance(e, FileTypeNotSupported):
-            raise BadRequest(unicode(e))
-        else:
-            raise
+    except FileTypeNotSupported as e:
+        raise BadRequest(e)
 
 
 @api_auth
@@ -103,7 +95,7 @@ def api_test(request):
 
     # TODO: This is the *only* thing using Response() here, should that
     # not simply use json_response()?
-    return Response(json.dumps(user_data))
+    return Response(json.dumps(user_data, sort_keys=True))
 
 
 def get_entries(request):
diff --git a/mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_head.html b/mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_head.html
index a53694b3..d1ea0b9a 100644
--- a/mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_head.html
+++ b/mediagoblin/plugins/archivalook/templates/archivalook/feature_displays/audio_head.html
@@ -1,5 +1,3 @@
     <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/audio.css') }}" />
     <script type="text/javascript" src="{{ request.staticdirect(
-        '/js/extlib/html5slider.js') }}"></script>
-    <script type="text/javascript" src="{{ request.staticdirect(
         '/js/audio.js') }}"></script>
diff --git a/mediagoblin/plugins/basic_auth/forms.py b/mediagoblin/plugins/basic_auth/forms.py
index 42b84bf3..9a6db226 100644
--- a/mediagoblin/plugins/basic_auth/forms.py
+++ b/mediagoblin/plugins/basic_auth/forms.py
@@ -20,7 +20,7 @@ from mediagoblin.auth.tools import normalize_user_or_email_field
 
 
 class RegistrationForm(wtforms.Form):
-    username = wtforms.TextField(
+    username = wtforms.StringField(
         _('Username'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_email=False)])
@@ -28,14 +28,14 @@ class RegistrationForm(wtforms.Form):
         _('Password'),
         [wtforms.validators.InputRequired(),
          wtforms.validators.Length(min=5, max=1024)])
-    email = wtforms.TextField(
+    email = wtforms.StringField(
         _('Email address'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_user=False)])
 
 
 class LoginForm(wtforms.Form):
-    username = wtforms.TextField(
+    username = wtforms.StringField(
         _('Username or Email'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field()])
@@ -47,7 +47,7 @@ class LoginForm(wtforms.Form):
 
 
 class ForgotPassForm(wtforms.Form):
-    username = wtforms.TextField(
+    username = wtforms.StringField(
         _('Username or email'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field()])
diff --git a/mediagoblin/plugins/basic_auth/tools.py b/mediagoblin/plugins/basic_auth/tools.py
index f943bf39..13f240b2 100644
--- a/mediagoblin/plugins/basic_auth/tools.py
+++ b/mediagoblin/plugins/basic_auth/tools.py
@@ -16,6 +16,8 @@
 import bcrypt
 import random
 
+import six
+
 from mediagoblin import mg_globals
 from mediagoblin.tools.crypto import get_timed_signer_url
 from mediagoblin.tools.mail import send_email
@@ -66,7 +68,7 @@ def bcrypt_gen_password_hash(raw_pass, extra_salt=None):
     if extra_salt:
         raw_pass = u"%s:%s" % (extra_salt, raw_pass)
 
-    return unicode(
+    return six.text_type(
         bcrypt.hashpw(raw_pass.encode('utf-8'), bcrypt.gensalt()))
 
 
diff --git a/mediagoblin/plugins/geolocation/__init__.py b/mediagoblin/plugins/geolocation/__init__.py
index 5d14590e..06aab68e 100644
--- a/mediagoblin/plugins/geolocation/__init__.py
+++ b/mediagoblin/plugins/geolocation/__init__.py
@@ -21,13 +21,13 @@ PLUGIN_DIR = os.path.dirname(__file__)
 
 def setup_plugin():
     config = pluginapi.get_config('mediagoblin.plugins.geolocation')
-    
+
     # Register the template path.
     pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
 
     pluginapi.register_template_hooks(
-        {"image_sideinfo": "mediagoblin/plugins/geolocation/map.html",
-         "image_head": "mediagoblin/plugins/geolocation/map_js_head.html"})
+        {"location_info": "mediagoblin/plugins/geolocation/map.html",
+         "location_head": "mediagoblin/plugins/geolocation/map_js_head.html"})
 
 
 hooks = {
diff --git a/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html
index 70f837ff..87f790d1 100644
--- a/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html
+++ b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html
@@ -17,14 +17,13 @@
 #}
 
 {% block geolocation_map %}
-  {% if     media.media_data.gps_latitude is defined
-        and media.media_data.gps_latitude
-        and media.media_data.gps_longitude is defined
-        and media.media_data.gps_longitude %}
-    <h3>{% trans %}Location{% endtrans %}</h3>
+  {% if model.location
+        and model.get_location.position
+        and "latitude" in model.get_location.position
+        and "longitude" in model.get_location.position %}
     <div>
-      {%- set lon = media.media_data.gps_longitude %}
-      {%- set lat = media.media_data.gps_latitude %}
+      {%- set lon = model.get_location.position.longitude %}
+      {%- set lat = model.get_location.position.latitude %}
       {%- set osm_url = "http://openstreetmap.org/?mlat={lat}&mlon={lon}".format(lat=lat, lon=lon) %}
         <div id="tile-map" style="width: 100%; height: 196px;">
 	  <input type="hidden" id="gps-longitude"
diff --git a/mediagoblin/plugins/httpapiauth/__init__.py b/mediagoblin/plugins/httpapiauth/__init__.py
index 2b2d593c..d7180463 100644
--- a/mediagoblin/plugins/httpapiauth/__init__.py
+++ b/mediagoblin/plugins/httpapiauth/__init__.py
@@ -16,6 +16,8 @@
 
 import logging
 
+import six
+
 from werkzeug.exceptions import Unauthorized
 
 from mediagoblin.auth.tools import check_login_simple
@@ -40,7 +42,7 @@ class HTTPAuth(Auth):
         if not request.authorization:
             return False
 
-        user = check_login_simple(unicode(request.authorization['username']),
+        user = check_login_simple(six.text_type(request.authorization['username']),
                                   request.authorization['password'])
 
         if user:
diff --git a/mediagoblin/plugins/ldap/forms.py b/mediagoblin/plugins/ldap/forms.py
index 1f1439ab..3d966e03 100644
--- a/mediagoblin/plugins/ldap/forms.py
+++ b/mediagoblin/plugins/ldap/forms.py
@@ -24,14 +24,14 @@ class RegisterForm(wtforms.Form):
         '',
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_email=False)])
-    email = wtforms.TextField(
+    email = wtforms.StringField(
         _('Email address'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_user=False)])
 
 
 class LoginForm(wtforms.Form):
-    username = wtforms.TextField(
+    username = wtforms.StringField(
         _('Username'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field()])
diff --git a/mediagoblin/plugins/ldap/tools.py b/mediagoblin/plugins/ldap/tools.py
index 1c436792..2be2dcd7 100644
--- a/mediagoblin/plugins/ldap/tools.py
+++ b/mediagoblin/plugins/ldap/tools.py
@@ -16,6 +16,8 @@
 import ldap
 import logging
 
+import six
+
 from mediagoblin.tools import pluginapi
 
 _log = logging.getLogger(__name__)
@@ -47,7 +49,7 @@ class LDAP(object):
         return email
 
     def login(self, username, password):
-        for k, v in self.ldap_settings.iteritems():
+        for k, v in six.iteritems(self.ldap_settings):
             try:
                 self._connect(v)
                 user_dn = v['LDAP_USER_DN_TEMPLATE'].format(username=username)
diff --git a/mediagoblin/plugins/ldap/views.py b/mediagoblin/plugins/ldap/views.py
index aef1bf56..be434daf 100644
--- a/mediagoblin/plugins/ldap/views.py
+++ b/mediagoblin/plugins/ldap/views.py
@@ -13,6 +13,9 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import six
+
 from mediagoblin import mg_globals, messages
 from mediagoblin.auth.tools import register_user
 from mediagoblin.db.models import User
@@ -40,7 +43,7 @@ def login(request):
 
             if user:
                 # set up login in session
-                request.session['user_id'] = unicode(user.id)
+                request.session['user_id'] = six.text_type(user.id)
                 request.session.save()
 
                 if request.form.get('next'):
diff --git a/mediagoblin/plugins/oauth/README.rst b/mediagoblin/plugins/oauth/README.rst
deleted file mode 100644
index 753b180f..00000000
--- a/mediagoblin/plugins/oauth/README.rst
+++ /dev/null
@@ -1,148 +0,0 @@
-==============
- OAuth plugin
-==============
-
-.. warning::
-    In its current state. This plugin has received no security audit.
-    Development has been entirely focused on Making It Work(TM). Use this
-    plugin with caution.
-
-    Additionally, this and the API may break... consider it pre-alpha.
-    There's also a known issue that the OAuth client doesn't do
-    refresh tokens so this might result in issues for users.
-
-The OAuth plugin enables third party web applications to authenticate as one or
-more GNU MediaGoblin users in a safe way in order retrieve, create and update
-content stored on the GNU MediaGoblin instance.
-
-The OAuth plugin is based on the `oauth v2.25 draft`_ and is pointing by using
-the ``oauthlib.oauth2.draft25.WebApplicationClient`` from oauthlib_ to a
-mediagoblin instance and building the OAuth 2 provider logic around the client.
-
-There are surely some aspects of the OAuth v2.25 draft that haven't made it
-into this plugin due to the technique used to develop it.
-
-.. _`oauth v2.25 draft`: http://tools.ietf.org/html/draft-ietf-oauth-v2-25
-.. _oauthlib: http://pypi.python.org/pypi/oauthlib
-
-
-Set up the OAuth plugin
-=======================
-
-1. Add the following to your MediaGoblin .ini file in the ``[plugins]`` section::
-
-    [[mediagoblin.plugins.oauth]]
-
-2. Run::
-
-        gmg dbupdate
-
-   in order to create and apply migrations to any database tables that the
-   plugin requires.
-
-.. note::
-    This only enables the OAuth plugin. To be able to let clients fetch data
-    from the MediaGoblin instance you should also enable the API plugin or some
-    other plugin that supports authenticating with OAuth credentials.
-
-
-Authenticate against GNU MediaGoblin
-====================================
-
-.. note::
-    As mentioned in `capabilities`_ GNU MediaGoblin currently only supports the
-    `Authorization Code Grant`_ procedure for obtaining an OAuth access token.
-
-Authorization Code Grant
-------------------------
-
-.. note::
-    As mentioned in `incapabilities`_ GNU MediaGoblin currently does not
-    support `client registration`_
-
-The `authorization code grant`_ works in the following way:
-
-`Definitions`
-
-    Authorization server
-        The GNU MediaGoblin instance
-    Resource server
-        Also the GNU MediaGoblin instance ;)
-    Client
-        The web application intended to use the data
-    Redirect uri
-        An URI pointing to a page controlled by the *client*
-    Resource owner
-        The GNU MediaGoblin user who's resources the client requests access to
-    User agent
-        Commonly the GNU MediaGoblin user's web browser
-    Authorization code
-        An intermediate token that is exchanged for an *access token*
-    Access token
-        A secret token that the *client* uses to authenticate itself agains the
-        *resource server* as a specific *resource owner*.
-
-
-Brief description of the procedure
-++++++++++++++++++++++++++++++++++
-
-1. The *client* requests an *authorization code* from the *authorization
-   server* by redirecting the *user agent* to the `Authorization Endpoint`_.
-   Which parameters should be included in the redirect are covered later in
-   this document.
-2. The *authorization server* authenticates the *resource owner* and redirects
-   the *user agent* back to the *redirect uri* (covered later in this
-   document).
-3. The *client* receives the request from the *user agent*, attached is the
-   *authorization code*.
-4. The *client* requests an *access token* from the *authorization server*
-5. \?\?\?\?\?
-6. Profit!
-
-
-Detailed description of the procedure
-+++++++++++++++++++++++++++++++++++++
-
-TBD, in the meantime here is a proof-of-concept GNU MediaGoblin client:
-
-https://github.com/jwandborg/omgmg/
-
-and here are some detailed descriptions from other OAuth 2
-providers:
-
-- https://developers.google.com/accounts/docs/OAuth2WebServer
-- https://developers.facebook.com/docs/authentication/server-side/
-
-and if you're unsure about anything, there's the `OAuth v2.25 draft
-<http://tools.ietf.org/html/draft-ietf-oauth-v2-25>`_, the `OAuth plugin
-source code
-<http://gitorious.org/mediagoblin/mediagoblin/trees/master/mediagoblin/plugins/oauth>`_
-and the `#mediagoblin IRC channel <http://mediagoblin.org/pages/join.html#irc>`_.
-
-
-Capabilities
-============
-
-- `Authorization endpoint`_ - Located at ``/oauth/authorize``
-- `Token endpoint`_ - Located at ``/oauth/access_token``
-- `Authorization Code Grant`_
-- `Client Registration`_
-
-.. _`Authorization endpoint`: http://tools.ietf.org/html/draft-ietf-oauth-v2-25#section-3.1
-.. _`Token endpoint`: http://tools.ietf.org/html/draft-ietf-oauth-v2-25#section-3.2
-.. _`Authorization Code Grant`: http://tools.ietf.org/html/draft-ietf-oauth-v2-25#section-4.1
-.. _`Client Registration`: http://tools.ietf.org/html/draft-ietf-oauth-v2-25#section-2
-
-Incapabilities
-==============
-
-- Only `bearer tokens`_ are issued.
-- `Implicit Grant`_
-- `Force TLS for token endpoint`_ - This one is up the the siteadmin
-- Authorization `scope`_ and `state`
-- ...
-
-.. _`bearer tokens`: http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-08
-.. _`scope`: http://tools.ietf.org/html/draft-ietf-oauth-v2-25#section-3.3
-.. _`Implicit Grant`: http://tools.ietf.org/html/draft-ietf-oauth-v2-25#section-4.2
-.. _`Force TLS for token endpoint`: http://tools.ietf.org/html/draft-ietf-oauth-v2-25#section-3.2
diff --git a/mediagoblin/plugins/oauth/__init__.py b/mediagoblin/plugins/oauth/__init__.py
deleted file mode 100644
index 82c1f380..00000000
--- a/mediagoblin/plugins/oauth/__init__.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import logging
-
-from mediagoblin.tools import pluginapi
-from mediagoblin.plugins.oauth.models import OAuthToken, OAuthClient, \
-        OAuthUserClient
-from mediagoblin.plugins.api.tools import Auth
-
-_log = logging.getLogger(__name__)
-
-PLUGIN_DIR = os.path.dirname(__file__)
-
-
-def setup_plugin():
-    config = pluginapi.get_config('mediagoblin.plugins.oauth')
-
-    _log.info('Setting up OAuth...')
-    _log.debug('OAuth config: {0}'.format(config))
-
-    routes = [
-        ('mediagoblin.plugins.oauth.authorize',
-            '/oauth-2/authorize',
-            'mediagoblin.plugins.oauth.views:authorize'),
-        ('mediagoblin.plugins.oauth.authorize_client',
-            '/oauth-2/client/authorize',
-            'mediagoblin.plugins.oauth.views:authorize_client'),
-        ('mediagoblin.plugins.oauth.access_token',
-            '/oauth-2/access_token',
-            'mediagoblin.plugins.oauth.views:access_token'),
-        ('mediagoblin.plugins.oauth.list_connections',
-            '/oauth-2/client/connections',
-            'mediagoblin.plugins.oauth.views:list_connections'),
-        ('mediagoblin.plugins.oauth.register_client',
-            '/oauth-2/client/register',
-            'mediagoblin.plugins.oauth.views:register_client'),
-        ('mediagoblin.plugins.oauth.list_clients',
-            '/oauth-2/client/list',
-            'mediagoblin.plugins.oauth.views:list_clients')]
-
-    pluginapi.register_routes(routes)
-    pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
-
-
-class OAuthAuth(Auth):
-    def trigger(self, request):
-        if 'access_token' in request.GET:
-            return True
-
-        return False
-
-    def __call__(self, request, *args, **kw):
-        self.errors = []
-        # TODO: Add suport for client credentials authorization
-        client_id = request.GET.get('client_id')  # TODO: Not used
-        client_secret = request.GET.get('client_secret')  # TODO: Not used
-        access_token = request.GET.get('access_token')
-
-        _log.debug('Authorizing request {0}'.format(request.url))
-
-        if access_token:
-            token = OAuthToken.query.filter(OAuthToken.token == access_token)\
-                    .first()
-
-            if not token:
-                self.errors.append('Invalid access token')
-                return False
-
-            _log.debug('Access token: {0}'.format(token))
-            _log.debug('Client: {0}'.format(token.client))
-
-            relation = OAuthUserClient.query.filter(
-                    (OAuthUserClient.user == token.user)
-                    & (OAuthUserClient.client == token.client)
-                    & (OAuthUserClient.state == u'approved')).first()
-
-            _log.debug('Relation: {0}'.format(relation))
-
-            if not relation:
-                self.errors.append(
-                        u'Client has not been approved by the resource owner')
-                return False
-
-            request.user = token.user
-            return True
-
-        self.errors.append(u'No access_token specified')
-
-        return False
-
-hooks = {
-    'setup': setup_plugin,
-    'auth': OAuthAuth()
-    }
diff --git a/mediagoblin/plugins/oauth/forms.py b/mediagoblin/plugins/oauth/forms.py
deleted file mode 100644
index ddf4d390..00000000
--- a/mediagoblin/plugins/oauth/forms.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import wtforms
-
-from urlparse import urlparse
-
-from mediagoblin.tools.extlib.wtf_html5 import URLField
-from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
-
-
-class AuthorizationForm(wtforms.Form):
-    client_id = wtforms.HiddenField(u'',
-                                    validators=[wtforms.validators.InputRequired()])
-    next = wtforms.HiddenField(u'', validators=[wtforms.validators.InputRequired()])
-    allow = wtforms.SubmitField(_(u'Allow'))
-    deny = wtforms.SubmitField(_(u'Deny'))
-
-
-class ClientRegistrationForm(wtforms.Form):
-    name = wtforms.TextField(_('Name'), [wtforms.validators.InputRequired()],
-            description=_('The name of the OAuth client'))
-    description = wtforms.TextAreaField(_('Description'),
-            [wtforms.validators.Length(min=0, max=500)],
-            description=_('''This will be visible to users allowing your
-                application to authenticate as them.'''))
-    type = wtforms.SelectField(_('Type'),
-            [wtforms.validators.InputRequired()],
-            choices=[
-                ('confidential', 'Confidential'),
-                ('public', 'Public')],
-            description=_('''<strong>Confidential</strong> - The client can
-                make requests to the GNU MediaGoblin instance that can not be
-                intercepted by the user agent (e.g. server-side client).<br />
-                <strong>Public</strong> - The client can't make confidential
-                requests to the GNU MediaGoblin instance (e.g. client-side
-                JavaScript client).'''))
-
-    redirect_uri = URLField(_('Redirect URI'),
-            [wtforms.validators.Optional(), wtforms.validators.URL()],
-            description=_('''The redirect URI for the applications, this field
-            is <strong>required</strong> for public clients.'''))
-
-    def __init__(self, *args, **kw):
-        wtforms.Form.__init__(self, *args, **kw)
-
-    def validate(self):
-        if not wtforms.Form.validate(self):
-            return False
-
-        if self.type.data == 'public' and not self.redirect_uri.data:
-            self.redirect_uri.errors.append(
-                _('This field is required for public clients'))
-            return False
-
-        return True
diff --git a/mediagoblin/plugins/oauth/migrations.py b/mediagoblin/plugins/oauth/migrations.py
deleted file mode 100644
index d7b89da3..00000000
--- a/mediagoblin/plugins/oauth/migrations.py
+++ /dev/null
@@ -1,158 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from datetime import datetime, timedelta
-from sqlalchemy import (MetaData, Table, Column,
-                        Integer, Unicode, Enum, DateTime, ForeignKey)
-from sqlalchemy.ext.declarative import declarative_base
-
-from mediagoblin.db.migration_tools import RegisterMigration
-from mediagoblin.db.models import User
-
-
-MIGRATIONS = {}
-
-
-class OAuthClient_v0(declarative_base()):
-    __tablename__ = 'oauth__client'
-
-    id = Column(Integer, primary_key=True)
-    created = Column(DateTime, nullable=False,
-            default=datetime.now)
-
-    name = Column(Unicode)
-    description = Column(Unicode)
-
-    identifier = Column(Unicode, unique=True, index=True)
-    secret = Column(Unicode, index=True)
-
-    owner_id = Column(Integer, ForeignKey(User.id))
-    redirect_uri = Column(Unicode)
-
-    type = Column(Enum(
-        u'confidential',
-        u'public',
-        name=u'oauth__client_type'))
-
-
-class OAuthUserClient_v0(declarative_base()):
-    __tablename__ = 'oauth__user_client'
-    id = Column(Integer, primary_key=True)
-
-    user_id = Column(Integer, ForeignKey(User.id))
-    client_id = Column(Integer, ForeignKey(OAuthClient_v0.id))
-
-    state = Column(Enum(
-        u'approved',
-        u'rejected',
-        name=u'oauth__relation_state'))
-
-
-class OAuthToken_v0(declarative_base()):
-    __tablename__ = 'oauth__tokens'
-
-    id = Column(Integer, primary_key=True)
-    created = Column(DateTime, nullable=False,
-            default=datetime.now)
-    expires = Column(DateTime, nullable=False,
-            default=lambda: datetime.now() + timedelta(days=30))
-    token = Column(Unicode, index=True)
-    refresh_token = Column(Unicode, index=True)
-
-    user_id = Column(Integer, ForeignKey(User.id), nullable=False,
-            index=True)
-
-    client_id = Column(Integer, ForeignKey(OAuthClient_v0.id), nullable=False)
-
-    def __repr__(self):
-        return '<{0} #{1} expires {2} [{3}, {4}]>'.format(
-                self.__class__.__name__,
-                self.id,
-                self.expires.isoformat(),
-                self.user,
-                self.client)
-
-
-class OAuthCode_v0(declarative_base()):
-    __tablename__ = 'oauth__codes'
-
-    id = Column(Integer, primary_key=True)
-    created = Column(DateTime, nullable=False,
-            default=datetime.now)
-    expires = Column(DateTime, nullable=False,
-            default=lambda: datetime.now() + timedelta(minutes=5))
-    code = Column(Unicode, index=True)
-
-    user_id = Column(Integer, ForeignKey(User.id), nullable=False,
-            index=True)
-
-    client_id = Column(Integer, ForeignKey(OAuthClient_v0.id), nullable=False)
-
-
-class OAuthRefreshToken_v0(declarative_base()):
-    __tablename__ = 'oauth__refresh_tokens'
-
-    id = Column(Integer, primary_key=True)
-    created = Column(DateTime, nullable=False,
-                     default=datetime.now)
-
-    token = Column(Unicode, index=True)
-
-    user_id = Column(Integer, ForeignKey(User.id), nullable=False)
-
-    # XXX: Is it OK to use OAuthClient_v0.id in this way?
-    client_id = Column(Integer, ForeignKey(OAuthClient_v0.id), nullable=False)
-
-
-@RegisterMigration(1, MIGRATIONS)
-def remove_and_replace_token_and_code(db):
-    metadata = MetaData(bind=db.bind)
-
-    token_table = Table('oauth__tokens', metadata, autoload=True,
-            autoload_with=db.bind)
-
-    token_table.drop()
-
-    code_table = Table('oauth__codes', metadata, autoload=True,
-            autoload_with=db.bind)
-
-    code_table.drop()
-
-    OAuthClient_v0.__table__.create(db.bind)
-    OAuthUserClient_v0.__table__.create(db.bind)
-    OAuthToken_v0.__table__.create(db.bind)
-    OAuthCode_v0.__table__.create(db.bind)
-
-    db.commit()
-
-
-@RegisterMigration(2, MIGRATIONS)
-def remove_refresh_token_field(db):
-    metadata = MetaData(bind=db.bind)
-
-    token_table = Table('oauth__tokens', metadata, autoload=True,
-                        autoload_with=db.bind)
-
-    refresh_token = token_table.columns['refresh_token']
-
-    refresh_token.drop()
-    db.commit()
-
-@RegisterMigration(3, MIGRATIONS)
-def create_refresh_token_table(db):
-    OAuthRefreshToken_v0.__table__.create(db.bind)
-
-    db.commit()
diff --git a/mediagoblin/plugins/oauth/models.py b/mediagoblin/plugins/oauth/models.py
deleted file mode 100644
index 439424d3..00000000
--- a/mediagoblin/plugins/oauth/models.py
+++ /dev/null
@@ -1,192 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-from datetime import datetime, timedelta
-
-
-from sqlalchemy import (
-        Column, Unicode, Integer, DateTime, ForeignKey, Enum)
-from sqlalchemy.orm import relationship, backref
-from mediagoblin.db.base import Base
-from mediagoblin.db.models import User
-from mediagoblin.plugins.oauth.tools import generate_identifier, \
-    generate_secret, generate_token, generate_code, generate_refresh_token
-
-# Don't remove this, I *think* it applies sqlalchemy-migrate functionality onto
-# the models.
-from migrate import changeset
-
-
-class OAuthClient(Base):
-    __tablename__ = 'oauth__client'
-
-    id = Column(Integer, primary_key=True)
-    created = Column(DateTime, nullable=False,
-            default=datetime.now)
-
-    name = Column(Unicode)
-    description = Column(Unicode)
-
-    identifier = Column(Unicode, unique=True, index=True,
-                        default=generate_identifier)
-    secret = Column(Unicode, index=True, default=generate_secret)
-
-    owner_id = Column(Integer, ForeignKey(User.id))
-    owner = relationship(
-        User,
-        backref=backref('registered_clients', cascade='all, delete-orphan'))
-
-    redirect_uri = Column(Unicode)
-
-    type = Column(Enum(
-        u'confidential',
-        u'public',
-        name=u'oauth__client_type'))
-
-    def update_secret(self):
-        self.secret = generate_secret()
-
-    def __repr__(self):
-        return '<{0} {1}:{2} ({3})>'.format(
-                self.__class__.__name__,
-                self.id,
-                self.name.encode('ascii', 'replace'),
-                self.owner.username.encode('ascii', 'replace'))
-
-
-class OAuthUserClient(Base):
-    __tablename__ = 'oauth__user_client'
-    id = Column(Integer, primary_key=True)
-
-    user_id = Column(Integer, ForeignKey(User.id))
-    user = relationship(
-        User,
-        backref=backref('oauth_client_relations',
-                        cascade='all, delete-orphan'))
-
-    client_id = Column(Integer, ForeignKey(OAuthClient.id))
-    client = relationship(
-        OAuthClient,
-        backref=backref('oauth_user_relations', cascade='all, delete-orphan'))
-
-    state = Column(Enum(
-        u'approved',
-        u'rejected',
-        name=u'oauth__relation_state'))
-
-    def __repr__(self):
-        return '<{0} #{1} {2} [{3}, {4}]>'.format(
-                self.__class__.__name__,
-                self.id,
-                self.state.encode('ascii', 'replace'),
-                self.user,
-                self.client)
-
-
-class OAuthToken(Base):
-    __tablename__ = 'oauth__tokens'
-
-    id = Column(Integer, primary_key=True)
-    created = Column(DateTime, nullable=False,
-            default=datetime.now)
-    expires = Column(DateTime, nullable=False,
-            default=lambda: datetime.now() + timedelta(days=30))
-    token = Column(Unicode, index=True, default=generate_token)
-
-    user_id = Column(Integer, ForeignKey(User.id), nullable=False,
-            index=True)
-    user = relationship(
-        User,
-        backref=backref('oauth_tokens', cascade='all, delete-orphan'))
-
-    client_id = Column(Integer, ForeignKey(OAuthClient.id), nullable=False)
-    client = relationship(
-        OAuthClient,
-        backref=backref('oauth_tokens', cascade='all, delete-orphan'))
-
-    def __repr__(self):
-        return '<{0} #{1} expires {2} [{3}, {4}]>'.format(
-                self.__class__.__name__,
-                self.id,
-                self.expires.isoformat(),
-                self.user,
-                self.client)
-
-class OAuthRefreshToken(Base):
-    __tablename__ = 'oauth__refresh_tokens'
-
-    id = Column(Integer, primary_key=True)
-    created = Column(DateTime, nullable=False,
-                     default=datetime.now)
-
-    token = Column(Unicode, index=True,
-                   default=generate_refresh_token)
-
-    user_id = Column(Integer, ForeignKey(User.id), nullable=False)
-
-    user = relationship(User, backref=backref('oauth_refresh_tokens',
-                                              cascade='all, delete-orphan'))
-
-    client_id = Column(Integer, ForeignKey(OAuthClient.id), nullable=False)
-    client = relationship(OAuthClient,
-                          backref=backref(
-                              'oauth_refresh_tokens',
-                              cascade='all, delete-orphan'))
-
-    def __repr__(self):
-        return '<{0} #{1} [{3}, {4}]>'.format(
-                self.__class__.__name__,
-                self.id,
-                self.user,
-                self.client)
-
-
-class OAuthCode(Base):
-    __tablename__ = 'oauth__codes'
-
-    id = Column(Integer, primary_key=True)
-    created = Column(DateTime, nullable=False,
-            default=datetime.now)
-    expires = Column(DateTime, nullable=False,
-            default=lambda: datetime.now() + timedelta(minutes=5))
-    code = Column(Unicode, index=True, default=generate_code)
-
-    user_id = Column(Integer, ForeignKey(User.id), nullable=False,
-            index=True)
-    user = relationship(User, backref=backref('oauth_codes',
-                                              cascade='all, delete-orphan'))
-
-    client_id = Column(Integer, ForeignKey(OAuthClient.id), nullable=False)
-    client = relationship(OAuthClient, backref=backref(
-        'oauth_codes',
-        cascade='all, delete-orphan'))
-
-    def __repr__(self):
-        return '<{0} #{1} expires {2} [{3}, {4}]>'.format(
-                self.__class__.__name__,
-                self.id,
-                self.expires.isoformat(),
-                self.user,
-                self.client)
-
-
-MODELS = [
-        OAuthToken,
-        OAuthRefreshToken,
-        OAuthCode,
-        OAuthClient,
-        OAuthUserClient]
diff --git a/mediagoblin/plugins/oauth/templates/oauth/client/list.html b/mediagoblin/plugins/oauth/templates/oauth/client/list.html
deleted file mode 100644
index 21024bb7..00000000
--- a/mediagoblin/plugins/oauth/templates/oauth/client/list.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
--#}
-{% extends "mediagoblin/base.html" %}
-{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
-
-{% block mediagoblin_content %}
-<h1>{% trans %}Your OAuth clients{% endtrans %}</h1>
-{% if clients %}
-<ul>
-    {% for client in clients %}
-    <li>{{ client.name }}
-    <dl>
-        <dt>Type</dt>
-        <dd>{{ client.type }}</dd>
-        <dt>Description</dt>
-        <dd>{{ client.description }}</dd>
-        <dt>Identifier</dt>
-        <dd>{{ client.identifier }}</dd>
-        <dt>Secret</dt>
-        <dd>{{ client.secret }}</dd>
-        <dt>Redirect URI<dt>
-        <dd>{{ client.redirect_uri }}</dd>
-    </dl>
-    </li>
-    {% endfor %}
-</ul>
-{% else %}
-<p>You don't have any clients yet. <a href="{{ request.urlgen('mediagoblin.plugins.oauth.register_client') }}">Add one</a>.</p>
-{% endif %}
-{% endblock %}
diff --git a/mediagoblin/plugins/oauth/tools.py b/mediagoblin/plugins/oauth/tools.py
deleted file mode 100644
index af0a3305..00000000
--- a/mediagoblin/plugins/oauth/tools.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import uuid
-
-from random import getrandbits
-
-from datetime import datetime
-
-from functools import wraps
-
-from mediagoblin.tools.response import json_response
-
-
-def require_client_auth(controller):
-    '''
-    View decorator
-
-    - Requires the presence of ``?client_id``
-    '''
-    # Avoid circular import
-    from mediagoblin.plugins.oauth.models import OAuthClient
-
-    @wraps(controller)
-    def wrapper(request, *args, **kw):
-        if not request.GET.get('client_id'):
-            return json_response({
-                'status': 400,
-                'errors': [u'No client identifier in URL']},
-                _disable_cors=True)
-
-        client = OAuthClient.query.filter(
-                OAuthClient.identifier == request.GET.get('client_id')).first()
-
-        if not client:
-            return json_response({
-                'status': 400,
-                'errors': [u'No such client identifier']},
-                _disable_cors=True)
-
-        return controller(request, client)
-
-    return wrapper
-
-
-def create_token(client, user):
-    '''
-    Create an OAuthToken and an OAuthRefreshToken entry in the database
-
-    Returns the data structure expected by the OAuth clients.
-    '''
-    from mediagoblin.plugins.oauth.models import OAuthToken, OAuthRefreshToken
-
-    token = OAuthToken()
-    token.user = user
-    token.client = client
-    token.save()
-
-    refresh_token = OAuthRefreshToken()
-    refresh_token.user = user
-    refresh_token.client = client
-    refresh_token.save()
-
-    # expire time of token in full seconds
-    # timedelta.total_seconds is python >= 2.7 or we would use that
-    td = token.expires - datetime.now()
-    exp_in = 86400*td.days + td.seconds # just ignore µsec
-
-    return {'access_token': token.token, 'token_type': 'bearer',
-            'refresh_token': refresh_token.token, 'expires_in': exp_in}
-
-
-def generate_identifier():
-    ''' Generates a ``uuid.uuid4()`` '''
-    return unicode(uuid.uuid4())
-
-
-def generate_token():
-    ''' Uses generate_identifier '''
-    return generate_identifier()
-
-
-def generate_refresh_token():
-    ''' Uses generate_identifier '''
-    return generate_identifier()
-
-
-def generate_code():
-    ''' Uses generate_identifier '''
-    return generate_identifier()
-
-
-def generate_secret():
-    '''
-    Generate a long string of pseudo-random characters
-    '''
-    # XXX: We might not want it to use bcrypt, since bcrypt takes its time to
-    # generate the result.
-    return unicode(getrandbits(192))
-
diff --git a/mediagoblin/plugins/oauth/views.py b/mediagoblin/plugins/oauth/views.py
deleted file mode 100644
index de637d6b..00000000
--- a/mediagoblin/plugins/oauth/views.py
+++ /dev/null
@@ -1,253 +0,0 @@
-# -*- coding: utf-8 -*-
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import logging
-
-from urllib import urlencode
-
-from werkzeug.exceptions import BadRequest
-
-from mediagoblin.tools.response import render_to_response, redirect, json_response
-from mediagoblin.decorators import require_active_login
-from mediagoblin.messages import add_message, SUCCESS
-from mediagoblin.tools.translate import pass_to_ugettext as _
-from mediagoblin.plugins.oauth.models import OAuthCode, OAuthClient, \
-        OAuthUserClient, OAuthRefreshToken
-from mediagoblin.plugins.oauth.forms import ClientRegistrationForm, \
-        AuthorizationForm
-from mediagoblin.plugins.oauth.tools import require_client_auth, \
-        create_token
-
-_log = logging.getLogger(__name__)
-
-
-@require_active_login
-def register_client(request):
-    '''
-    Register an OAuth client
-    '''
-    form = ClientRegistrationForm(request.form)
-
-    if request.method == 'POST' and form.validate():
-        client = OAuthClient()
-        client.name = unicode(form.name.data)
-        client.description = unicode(form.description.data)
-        client.type = unicode(form.type.data)
-        client.owner_id = request.user.id
-        client.redirect_uri = unicode(form.redirect_uri.data)
-
-        client.save()
-
-        add_message(request, SUCCESS, _('The client {0} has been registered!')\
-                .format(
-                    client.name))
-
-        return redirect(request, 'mediagoblin.plugins.oauth.list_clients')
-
-    return render_to_response(
-            request,
-            'oauth/client/register.html',
-            {'form': form})
-
-
-@require_active_login
-def list_clients(request):
-    clients = request.db.OAuthClient.query.filter(
-            OAuthClient.owner_id == request.user.id).all()
-    return render_to_response(request, 'oauth/client/list.html',
-            {'clients': clients})
-
-
-@require_active_login
-def list_connections(request):
-    connections = OAuthUserClient.query.filter(
-            OAuthUserClient.user == request.user).all()
-    return render_to_response(request, 'oauth/client/connections.html',
-            {'connections': connections})
-
-
-@require_active_login
-def authorize_client(request):
-    form = AuthorizationForm(request.form)
-
-    client = OAuthClient.query.filter(OAuthClient.id ==
-        form.client_id.data).first()
-
-    if not client:
-        _log.error('No such client id as received from client authorization \
-form.')
-        raise BadRequest()
-
-    if form.validate():
-        relation = OAuthUserClient()
-        relation.user_id = request.user.id
-        relation.client_id = form.client_id.data
-        if form.allow.data:
-            relation.state = u'approved'
-        elif form.deny.data:
-            relation.state = u'rejected'
-        else:
-            raise BadRequest()
-
-        relation.save()
-
-        return redirect(request, location=form.next.data)
-
-    return render_to_response(
-        request,
-        'oauth/authorize.html',
-        {'form': form,
-            'client': client})
-
-
-@require_client_auth
-@require_active_login
-def authorize(request, client):
-    # TODO: Get rid of the JSON responses in this view, it's called by the
-    # user-agent, not the client.
-    user_client_relation = OAuthUserClient.query.filter(
-            (OAuthUserClient.user == request.user)
-            & (OAuthUserClient.client == client))
-
-    if user_client_relation.filter(OAuthUserClient.state ==
-            u'approved').count():
-        redirect_uri = None
-
-        if client.type == u'public':
-            if not client.redirect_uri:
-                return json_response({
-                    'status': 400,
-                    'errors':
-                        [u'Public clients should have a redirect_uri pre-set.']},
-                        _disable_cors=True)
-
-            redirect_uri = client.redirect_uri
-
-        if client.type == u'confidential':
-            redirect_uri = request.GET.get('redirect_uri', client.redirect_uri)
-            if not redirect_uri:
-                return json_response({
-                    'status': 400,
-                    'errors': [u'No redirect_uri supplied!']},
-                    _disable_cors=True)
-
-        code = OAuthCode()
-        code.user = request.user
-        code.client = client
-        code.save()
-
-        redirect_uri = ''.join([
-            redirect_uri,
-            '?',
-            urlencode({'code': code.code})])
-
-        _log.debug('Redirecting to {0}'.format(redirect_uri))
-
-        return redirect(request, location=redirect_uri)
-    else:
-        # Show prompt to allow client to access data
-        # - on accept: send the user agent back to the redirect_uri with the
-        # code parameter
-        # - on deny: send the user agent back to the redirect uri with error
-        # information
-        form = AuthorizationForm(request.form)
-        form.client_id.data = client.id
-        form.next.data = request.url
-        return render_to_response(
-                request,
-                'oauth/authorize.html',
-                {'form': form,
-                'client': client})
-
-
-def access_token(request):
-    '''
-    Access token endpoint provides access tokens to any clients that have the
-    right grants/credentials
-    '''
-
-    client = None
-    user = None
-
-    if request.GET.get('code'):
-        # Validate the code arg, then get the client object from the db.
-        code = OAuthCode.query.filter(OAuthCode.code ==
-                request.GET.get('code')).first()
-
-        if not code:
-            return json_response({
-                'error': 'invalid_request',
-                'error_description':
-                    'Invalid code.'})
-
-        client = code.client
-        user = code.user
-
-    elif request.args.get('refresh_token'):
-        # Validate a refresh token, then get the client object from the db.
-        refresh_token = OAuthRefreshToken.query.filter(
-            OAuthRefreshToken.token ==
-            request.args.get('refresh_token')).first()
-
-        if not refresh_token:
-            return json_response({
-                'error': 'invalid_request',
-                'error_description':
-                    'Invalid refresh token.'})
-
-        client = refresh_token.client
-        user = refresh_token.user
-
-    if client:
-        client_identifier = request.GET.get('client_id')
-
-        if not client_identifier:
-            return json_response({
-                'error': 'invalid_request',
-                'error_description':
-                    'Missing client_id in request.'})
-
-        if not client_identifier == client.identifier:
-            return json_response({
-                'error': 'invalid_client',
-                'error_description':
-                    'Mismatching client credentials.'})
-
-        if client.type == u'confidential':
-            client_secret = request.GET.get('client_secret')
-
-            if not client_secret:
-                return json_response({
-                    'error': 'invalid_request',
-                    'error_description':
-                        'Missing client_secret in request.'})
-
-            if not client_secret == client.secret:
-                return json_response({
-                    'error': 'invalid_client',
-                    'error_description':
-                        'Mismatching client credentials.'})
-
-
-        access_token_data = create_token(client, user)
-
-        return json_response(access_token_data, _disable_cors=True)
-
-    return json_response({
-        'error': 'invalid_request',
-        'error_description':
-            'Missing `code` or `refresh_token` parameter in request.'})
diff --git a/mediagoblin/plugins/openid/forms.py b/mediagoblin/plugins/openid/forms.py
index d47369dc..6dfde0c8 100644
--- a/mediagoblin/plugins/openid/forms.py
+++ b/mediagoblin/plugins/openid/forms.py
@@ -23,18 +23,18 @@ class RegistrationForm(wtforms.Form):
     openid = wtforms.HiddenField(
         '',
         [wtforms.validators.InputRequired()])
-    username = wtforms.TextField(
+    username = wtforms.StringField(
         _('Username'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_email=False)])
-    email = wtforms.TextField(
+    email = wtforms.StringField(
         _('Email address'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_user=False)])
 
 
 class LoginForm(wtforms.Form):
-    openid = wtforms.TextField(
+    openid = wtforms.StringField(
         _('OpenID'),
         [wtforms.validators.InputRequired(),
          # Can openid's only be urls?
diff --git a/mediagoblin/plugins/openid/store.py b/mediagoblin/plugins/openid/store.py
index 8f9a7012..24726814 100644
--- a/mediagoblin/plugins/openid/store.py
+++ b/mediagoblin/plugins/openid/store.py
@@ -16,6 +16,8 @@
 import base64
 import time
 
+import six
+
 from openid.association import Association as OIDAssociation
 from openid.store.interface import OpenIDStore
 from openid.store import nonce
@@ -34,12 +36,12 @@ class SQLAlchemyOpenIDStore(OpenIDStore):
 
         if not assoc:
             assoc = Association()
-            assoc.server_url = unicode(server_url)
+            assoc.server_url = six.text_type(server_url)
             assoc.handle = association.handle
 
         # django uses base64 encoding, python-openid uses a blob field for
         # secret
-        assoc.secret = unicode(base64.encodestring(association.secret))
+        assoc.secret = six.text_type(base64.encodestring(association.secret))
         assoc.issued = association.issued
         assoc.lifetime = association.lifetime
         assoc.assoc_type = association.assoc_type
diff --git a/mediagoblin/plugins/openid/views.py b/mediagoblin/plugins/openid/views.py
index bb2de7ab..71f444fa 100644
--- a/mediagoblin/plugins/openid/views.py
+++ b/mediagoblin/plugins/openid/views.py
@@ -13,6 +13,9 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import six
+
 from openid.consumer import consumer
 from openid.consumer.discover import DiscoveryFailure
 from openid.extensions.sreg import SRegRequest, SRegResponse
@@ -186,7 +189,7 @@ def finish_login(request):
 
     if user:
         # Set up login in session
-        request.session['user_id'] = unicode(user.id)
+        request.session['user_id'] = six.text_type(user.id)
         request.session.save()
 
         if request.session.get('next'):
diff --git a/mediagoblin/plugins/persona/forms.py b/mediagoblin/plugins/persona/forms.py
index 7d632344..f74d97fa 100644
--- a/mediagoblin/plugins/persona/forms.py
+++ b/mediagoblin/plugins/persona/forms.py
@@ -20,11 +20,11 @@ from mediagoblin.auth.tools import normalize_user_or_email_field
 
 
 class RegistrationForm(wtforms.Form):
-    username = wtforms.TextField(
+    username = wtforms.StringField(
         _('Username'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_email=False)])
-    email = wtforms.TextField(
+    email = wtforms.StringField(
         _('Email address'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_user=False)])
@@ -35,7 +35,7 @@ class RegistrationForm(wtforms.Form):
 
 
 class EditForm(wtforms.Form):
-    email = wtforms.TextField(
+    email = wtforms.StringField(
         _('Email address'),
         [wtforms.validators.InputRequired(),
          normalize_user_or_email_field(allow_user=False)])
diff --git a/mediagoblin/plugins/persona/views.py b/mediagoblin/plugins/persona/views.py
index 1bba3b8c..41d38353 100644
--- a/mediagoblin/plugins/persona/views.py
+++ b/mediagoblin/plugins/persona/views.py
@@ -17,6 +17,8 @@ import json
 import logging
 import requests
 
+import six
+
 from werkzeug.exceptions import BadRequest
 
 from mediagoblin import messages, mg_globals
@@ -63,7 +65,7 @@ def login(request):
         user = query.user if query else None
 
         if user:
-            request.session['user_id'] = unicode(user.id)
+            request.session['user_id'] = six.text_type(user.id)
             request.session['persona_login_email'] = email
             request.session.save()
 
diff --git a/mediagoblin/plugins/piwigo/forms.py b/mediagoblin/plugins/piwigo/forms.py
index fd545a3e..b501562b 100644
--- a/mediagoblin/plugins/piwigo/forms.py
+++ b/mediagoblin/plugins/piwigo/forms.py
@@ -20,10 +20,10 @@ import wtforms
 
 class AddSimpleForm(wtforms.Form):
     image = wtforms.FileField()
-    name = wtforms.TextField(
+    name = wtforms.StringField(
         validators=[wtforms.validators.Length(min=0, max=500)])
-    comment = wtforms.TextField()
-    # tags = wtforms.FieldList(wtforms.TextField())
+    comment = wtforms.StringField()
+    # tags = wtforms.FieldList(wtforms.StringField())
     category = wtforms.IntegerField()
     level = wtforms.IntegerField()
 
@@ -32,13 +32,13 @@ _md5_validator = wtforms.validators.Regexp(r"^[0-9a-fA-F]{32}$")
 
 
 class AddForm(wtforms.Form):
-    original_sum = wtforms.TextField(None,
+    original_sum = wtforms.StringField(None,
         [_md5_validator,
          wtforms.validators.InputRequired()])
-    thumbnail_sum = wtforms.TextField(None,
+    thumbnail_sum = wtforms.StringField(None,
         [wtforms.validators.Optional(),
          _md5_validator])
-    file_sum = wtforms.TextField(None, [_md5_validator])
-    name = wtforms.TextField()
-    date_creation = wtforms.TextField()
-    categories = wtforms.TextField()
+    file_sum = wtforms.StringField(None, [_md5_validator])
+    name = wtforms.StringField()
+    date_creation = wtforms.StringField()
+    categories = wtforms.StringField()
diff --git a/mediagoblin/plugins/piwigo/tools.py b/mediagoblin/plugins/piwigo/tools.py
index 484ea531..7b9b7af3 100644
--- a/mediagoblin/plugins/piwigo/tools.py
+++ b/mediagoblin/plugins/piwigo/tools.py
@@ -47,7 +47,7 @@ class PwgNamedArray(list):
 
 
 def _fill_element_dict(el, data, as_attr=()):
-    for k, v in data.iteritems():
+    for k, v in six.iteritems(data):
         if k in as_attr:
             if not isinstance(v, six.string_types):
                 v = str(v)
diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py
index f913a730..1fe1e576 100644
--- a/mediagoblin/plugins/piwigo/views.py
+++ b/mediagoblin/plugins/piwigo/views.py
@@ -17,6 +17,8 @@
 import logging
 import re
 
+import six
+
 from werkzeug.exceptions import MethodNotAllowed, BadRequest, NotImplemented
 from werkzeug.wrappers import BaseResponse
 
@@ -133,8 +135,8 @@ def pwg_images_addSimple(request):
             mg_app=request.app, user=request.user,
             submitted_file=request.files['image'],
             filename=request.files['image'].filename,
-            title=unicode(form.name.data),
-            description=unicode(form.comment.data),
+            title=six.text_type(form.name.data),
+            description=six.text_type(form.comment.data),
             upload_limit=upload_limit, max_file_size=max_file_size)
 
         collection_id = form.category.data
diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py
index 102fd5de..aa8f1447 100644
--- a/mediagoblin/processing/__init__.py
+++ b/mediagoblin/processing/__init__.py
@@ -24,6 +24,8 @@ except:
 import logging
 import os
 
+import six
+
 from mediagoblin import mg_globals as mgg
 from mediagoblin.db.util import atomic_update
 from mediagoblin.db.models import MediaEntry
@@ -46,7 +48,7 @@ class ProgressCallback(object):
 def create_pub_filepath(entry, filename):
     return mgg.public_store.get_unique_filepath(
             ['media_entries',
-             unicode(entry.id),
+             six.text_type(entry.id),
              filename])
 
 
@@ -307,8 +309,8 @@ def mark_entry_failed(entry_id, exc):
     store extra information that can be useful for users telling them
     why their media failed to process.
 
-    Args:
-     - entry_id: The id of the media entry
+    :param entry_id: The id of the media entry
+    :param exc: An instance of BaseProcessingFail
 
     """
     # Was this a BaseProcessingFail?  In other words, was this a
@@ -319,7 +321,7 @@ def mark_entry_failed(entry_id, exc):
         atomic_update(mgg.database.MediaEntry,
             {'id': entry_id},
             {u'state': u'failed',
-             u'fail_error': unicode(exc.exception_path),
+             u'fail_error': six.text_type(exc.exception_path),
              u'fail_metadata': exc.metadata})
     else:
         _log.warn("No idea what happened here, but it failed: %r", exc)
@@ -376,12 +378,11 @@ def store_public(entry, keyname, local_file, target_name=None,
                   entry.media_files[keyname], target_filepath)
         if delete_if_exists:
             mgg.public_store.delete_file(entry.media_files[keyname])
-
     try:
         mgg.public_store.copy_local_to_storage(local_file, target_filepath)
-    except:
+    except Exception as e:
+        _log.error(u'Exception happened: {0}'.format(e))
         raise PublicStoreFail(keyname=keyname)
-
     # raise an error if the file failed to copy
     if not mgg.public_store.file_exists(target_filepath):
         raise PublicStoreFail(keyname=keyname)
diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index 7f683485..5e0e772d 100644
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -15,8 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import urllib
-import urllib2
+
+from six.moves.urllib import request, parse
 
 import celery
 from celery.registry import tasks
@@ -42,15 +42,15 @@ def handle_push_urls(feed_url):
     hubparameters = {
         'hub.mode': 'publish',
         'hub.url': feed_url}
-    hubdata = urllib.urlencode(hubparameters)
+    hubdata = parse.urlencode(hubparameters)
     hubheaders = {
         "Content-type": "application/x-www-form-urlencoded",
         "Connection": "close"}
     for huburl in mgg.app_config["push_urls"]:
-        hubrequest = urllib2.Request(huburl, hubdata, hubheaders)
+        hubrequest = request.Request(huburl, hubdata, hubheaders)
         try:
-            hubresponse = urllib2.urlopen(hubrequest)
-        except (urllib2.HTTPError, urllib2.URLError) as exc:
+            hubresponse = request.urlopen(hubrequest)
+        except (request.HTTPError, request.URLError) as exc:
             # We retry by default 3 times before failing
             _log.info("PuSH url %r gave error %r", huburl, exc)
             try:
@@ -74,8 +74,11 @@ class ProcessMedia(celery.Task):
         Pass the media entry off to the appropriate processing function
         (for now just process_image...)
 
+        :param media_id: MediaEntry().id
         :param feed_url: The feed URL that the PuSH server needs to be
             updated for.
+        :param reprocess_action: What particular action should be run. For
+            example, 'initial'.
         :param reprocess: A dict containing all of the necessary reprocessing
             info for the media_type.
         """
@@ -155,5 +158,19 @@ class ProcessMedia(celery.Task):
 
         entry = mgg.database.MediaEntry.query.filter_by(id=entry_id).first()
         json_processing_callback(entry)
+        mgg.database.reset_after_request()
+
+    def after_return(self, *args, **kwargs):
+        """
+        This is called after the task has returned, we should clean up.
+
+        We need to rollback the database to prevent ProgrammingError exceptions
+        from being raised.
+        """
+        # In eager mode we get DetachedInstanceError, we do rollback on_failure
+        # to deal with that case though when in eager mode.
+        if not celery.app.default_app.conf['CELERY_ALWAYS_EAGER']:
+            mgg.database.reset_after_request()
+
 
 tasks.register(ProcessMedia)
diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index 3ec1dba0..1fbc6e9b 100644
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -38,7 +38,7 @@ def get_url_map():
     import mediagoblin.listings.routing
     import mediagoblin.notifications.routing
     import mediagoblin.oauth.routing
-    import mediagoblin.federation.routing
+    import mediagoblin.api.routing
 
     for route in PluginManager().get_routes():
         add_route(*route)
diff --git a/mediagoblin/static/css/audio.css b/mediagoblin/static/css/audio.css
index e007a0e1..5c50e727 100644
--- a/mediagoblin/static/css/audio.css
+++ b/mediagoblin/static/css/audio.css
@@ -1,6 +1,9 @@
 .audio-spectrogram {
     position: relative;
 }
+.audio-spectrogram > img {
+    width: 100%;
+}
 .playhead {
     position: absolute;
     top: 0;
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 0bd58738..f8726708 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -25,7 +25,7 @@
   src: local('Lato Regular'), local('Lato-Regular'), url('../fonts/Lato-Regular.ttf') format('truetype');
 }
 
-body {
+html, body {
   background-color: #161616;
   color: #C3C3C3;
   padding: 0;
@@ -110,6 +110,23 @@ input, textarea {
 
 /* website structure */
 
+#wrap {
+  min-height: 100%;
+  height: auto;
+
+  /* This must be equal to the footer height + 5px */
+  margin-bottom: -35px;
+}
+
+#wrap:after {
+  content: "";
+  display: block;
+}
+
+footer, #wrap:after {
+  height: 30px;
+}
+
 header {
   width: 100%;
   padding: 0;
@@ -176,9 +193,7 @@ a.logo {
 
 footer {
   width: 100%;
-  height: 30px;
   border-top: 1px solid #333;
-  bottom: 0px;
   padding: 8px 0;
   text-align: center;
   font-size: 0.875em;
@@ -196,14 +211,20 @@ footer {
 }
 
 .media_image_container {
-  display: flex;
-  justify-content: center;
 }
 
 .media_image {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
   max-width: 100%;
 }
 
+.media_other_container {
+  display: flex;
+  justify-content: center;
+}
+
 .media_pane {
 /* in place for possible future wide view */
 /*  border-bottom: 1px solid #333333;*/
@@ -872,7 +893,12 @@ pre {
     margin-left:3px;
     margin-right:3px;
   }
+  #thingy_view {
+    width:640px;
+    height:640px;
+  }
 }
+
 /* Tablet Portrait size to standard 960 (devices and browsers) */
 @media only screen and (min-width: 768px) and (max-width: 959px) {
   .container .three.columns.media_thumbnail {
@@ -881,7 +907,7 @@ pre {
     margin-right:2px;
   }
   .media_thumbnail.thumb_entry img {
-    margin-left: -16.5px;
+    max-width:100%;
   }
   .thumb_gallery {
     margin-left: 0;
@@ -889,7 +915,12 @@ pre {
   }
   .navigation_button {
   }
+  #thingy_view {
+    width:508px;
+    height:508px;
+  }
 }
+
 /* All Mobile Sizes (devices and browser) */
 @media screen and (max-width: 767px) {
   .thumb_row {
@@ -931,6 +962,22 @@ pre {
   }
 }
 
+/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
+@media only screen and (min-width: 480px) and (max-width: 767px) {
+  #thingy_view {
+    width:420px;
+    height:420px;
+  }
+}
+
+/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
+@media only screen and (max-width: 479px) {
+  #thingy_view {
+    width:300px;
+    height:300px;
+  }
+}
+
 p.verifier {
     text-align:center;
     font-size:50px;
@@ -950,3 +997,19 @@ table.metadata_editor tr td {
 table.metadata_editor tr td.form_field_input input {
     width:350px;
 }
+
+.application {
+  min-height: 30px;
+  margin-left: 70px;
+}
+
+.application-icon {
+  position: absolute;
+  left: 12px;
+  width: 50px;
+  height: 50px;
+}
+
+.application-button {
+  float: right;
+}
diff --git a/mediagoblin/static/extlib/video-js b/mediagoblin/static/extlib/video-js
index 65652d6e..58401be0 120000
--- a/mediagoblin/static/extlib/video-js
+++ b/mediagoblin/static/extlib/video-js
@@ -1 +1 @@
-../../../extlib/video-js/
\ No newline at end of file
+../../../extlib/video.js/dist/video-js
\ No newline at end of file
diff --git a/mediagoblin/static/images/small-gavroche.png b/mediagoblin/static/images/small-gavroche.png
new file mode 100644
index 00000000..13192d97
--- /dev/null
+++ b/mediagoblin/static/images/small-gavroche.png
diff --git a/mediagoblin/static/images/small-gavroche.xcf b/mediagoblin/static/images/small-gavroche.xcf
new file mode 100644
index 00000000..0291d2e1
--- /dev/null
+++ b/mediagoblin/static/images/small-gavroche.xcf
diff --git a/mediagoblin/static/js/extlib/html5slider.js b/mediagoblin/static/js/extlib/html5slider.js
deleted file mode 120000
index feae2cb8..00000000
--- a/mediagoblin/static/js/extlib/html5slider.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../extlib/html5slider/html5slider.js
\ No newline at end of file
diff --git a/mediagoblin/static/js/extlib/jquery.js b/mediagoblin/static/js/extlib/jquery.js
index d78f5cc3..8c711f27 120000
--- a/mediagoblin/static/js/extlib/jquery.js
+++ b/mediagoblin/static/js/extlib/jquery.js
@@ -1 +1 @@
-../../../../extlib/jquery/jquery.js
\ No newline at end of file
+../../../../extlib/jquery/dist/jquery.js
\ No newline at end of file
diff --git a/mediagoblin/storage/__init__.py b/mediagoblin/storage/__init__.py
index 51b46c07..14f13bd3 100644
--- a/mediagoblin/storage/__init__.py
+++ b/mediagoblin/storage/__init__.py
@@ -14,9 +14,13 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import absolute_import
+
 import shutil
 import uuid
 
+import six
+
 from werkzeug.utils import secure_filename
 
 from mediagoblin.tools import common
@@ -174,7 +178,7 @@ class StorageInterface(object):
             shutil.copy(self.get_local_path(filepath), dest_path)
         else:
             with self.get_file(filepath, 'rb') as source_file:
-                with file(dest_path, 'wb') as dest_file:
+                with open(dest_path, 'wb') as dest_file:
                     # Copy from remote storage in 4M chunks
                     shutil.copyfileobj(source_file, dest_file, length=4*1048576)
 
@@ -187,7 +191,7 @@ class StorageInterface(object):
         your storage system.
         """
         with self.get_file(filepath, 'wb') as dest_file:
-            with file(filename, 'rb') as source_file:
+            with open(filename, 'rb') as source_file:
                 # Copy to storage system in 4M chunks
                 shutil.copyfileobj(source_file, dest_file, length=4*1048576)
 
@@ -220,7 +224,7 @@ def clean_listy_filepath(listy_filepath):
       A cleaned list of unicode objects.
     """
     cleaned_filepath = [
-        unicode(secure_filename(filepath))
+        six.text_type(secure_filename(filepath))
         for filepath in listy_filepath]
 
     if u'' in cleaned_filepath:
@@ -257,7 +261,7 @@ def storage_system_from_config(config_section):
     """
     # This construct is needed, because dict(config) does
     # not replace the variables in the config items.
-    config_params = dict(config_section.iteritems())
+    config_params = dict(six.iteritems(config_section))
 
     if 'storage_class' in config_params:
         storage_class = config_params['storage_class']
@@ -268,4 +272,4 @@ def storage_system_from_config(config_section):
     storage_class = common.import_component(storage_class)
     return storage_class(**config_params)
 
-import filestorage
+from . import filestorage
diff --git a/mediagoblin/storage/cloudfiles.py b/mediagoblin/storage/cloudfiles.py
index 47c81ad6..61665ea0 100644
--- a/mediagoblin/storage/cloudfiles.py
+++ b/mediagoblin/storage/cloudfiles.py
@@ -143,7 +143,7 @@ class CloudFilesStorage(StorageInterface):
         """
         # Override this method, using the "stream" iterator for efficient streaming
         with self.get_file(filepath, 'rb') as source_file:
-            with file(dest_path, 'wb') as dest_file:
+            with open(dest_path, 'wb') as dest_file:
                 for data in source_file:
                     dest_file.write(data)
 
@@ -164,7 +164,7 @@ class CloudFilesStorage(StorageInterface):
         # TODO: Fixing write() still seems worthwhile though.
         _log.debug('Sending {0} to cloudfiles...'.format(filepath))
         with self.get_file(filepath, 'wb') as dest_file:
-            with file(filename, 'rb') as source_file:
+            with open(filename, 'rb') as source_file:
                 # Copy to storage system in 4096 byte chunks
                 dest_file.send(source_file)
 
@@ -193,27 +193,6 @@ class CloudFilesStorageObjectWrapper():
         return self.storage_object.read(*args, **kwargs)
 
     def write(self, data, *args, **kwargs):
-        """
-        write data to the cloudfiles storage object
-
-        The original motivation for this wrapper is to ensure
-        that buffered writing to a cloudfiles storage object does not overwrite
-        any preexisting data.
-
-        Currently this method does not support any write modes except "append".
-        However if we should need it it would be easy implement.
-        """
-        _log.warn(
-            '{0}.write() has bad performance! Use .send instead for now'\
-            .format(self.__class__.__name__))
-
-        if self.storage_object.size and type(data) == str:
-            _log.debug('{0} is > 0 in size, appending data'.format(
-                self.storage_object.name))
-            data = self.read() + data
-
-        _log.debug('Writing {0}'.format(
-            self.storage_object.name))
         self.storage_object.write(data, *args, **kwargs)
 
     def send(self, *args, **kw):
diff --git a/mediagoblin/storage/filestorage.py b/mediagoblin/storage/filestorage.py
index 29b8383b..89f43276 100644
--- a/mediagoblin/storage/filestorage.py
+++ b/mediagoblin/storage/filestorage.py
@@ -14,14 +14,25 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import io
+import os
+import shutil
+
+import six.moves.urllib.parse as urlparse
+
 from mediagoblin.storage import (
     StorageInterface,
     clean_listy_filepath,
     NoWebServing)
 
-import os
-import shutil
-import urlparse
+class FileObjectAwareFile(io.FileIO):
+    def write(self, data):
+        if hasattr(data, 'read'):
+            # We can call data.read(). It means that the data is a file-like
+            # object, which should be saved RAM-friendly way
+            shutil.copyfileobj(data, self)
+        else:
+            super(FileObjectAwareFile, self).write(data)
 
 
 class BasicFileStorage(StorageInterface):
@@ -59,7 +70,7 @@ class BasicFileStorage(StorageInterface):
                 os.makedirs(directory)
 
         # Grab and return the file in the mode specified
-        return open(self._resolve_filepath(filepath), mode)
+        return FileObjectAwareFile(self._resolve_filepath(filepath), mode)
 
     def delete_file(self, filepath):
         """Delete file at filepath
diff --git a/mediagoblin/storage/mountstorage.py b/mediagoblin/storage/mountstorage.py
index dffc619b..4125a88d 100644
--- a/mediagoblin/storage/mountstorage.py
+++ b/mediagoblin/storage/mountstorage.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
+
 from mediagoblin.storage import StorageInterface, clean_listy_filepath
 
 
@@ -120,7 +122,7 @@ class MountStorage(StorageInterface):
         v = table.get(None)
         if v:
             res.append("  " * len(indent) + repr(indent) + ": " + repr(v))
-        for k, v in table.iteritems():
+        for k, v in six.iteritems(table):
             if k == None:
                 continue
             res.append("  " * len(indent) + repr(k) + ":")
diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py
index 6c0e8e9c..c5bacc44 100644
--- a/mediagoblin/submit/forms.py
+++ b/mediagoblin/submit/forms.py
@@ -33,7 +33,7 @@ def get_submit_start_form(form, **kwargs):
         file = wtforms.FileField(
             _('File'),
             description=desc)
-        title = wtforms.TextField(
+        title = wtforms.StringField(
             _('Title'),
             [wtforms.validators.Length(min=0, max=500)])
         description = wtforms.TextAreaField(
@@ -41,7 +41,7 @@ def get_submit_start_form(form, **kwargs):
             description=_("""You can use
                         <a href="http://daringfireball.net/projects/markdown/basics">
                         Markdown</a> for formatting."""))
-        tags = wtforms.TextField(
+        tags = wtforms.StringField(
             _('Tags'),
             [tag_length_validator],
             description=_(
@@ -57,7 +57,7 @@ def get_submit_start_form(form, **kwargs):
     return SubmitStartForm(form, **kwargs)
 
 class AddCollectionForm(wtforms.Form):
-    title = wtforms.TextField(
+    title = wtforms.StringField(
         _('Title'),
         [wtforms.validators.Length(min=0, max=500), wtforms.validators.InputRequired()])
     description = wtforms.TextAreaField(
diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py
index aaa90ea0..a0e1cf90 100644
--- a/mediagoblin/submit/lib.py
+++ b/mediagoblin/submit/lib.py
@@ -18,12 +18,15 @@ import logging
 import uuid
 from os.path import splitext
 
+import six
+
 from werkzeug.utils import secure_filename
 from werkzeug.datastructures import FileStorage
 
 from mediagoblin import mg_globals
 from mediagoblin.tools.response import json_response
 from mediagoblin.tools.text import convert_to_tag_list_of_dicts
+from mediagoblin.tools.federation import create_activity, create_generator
 from mediagoblin.db.models import MediaEntry, ProcessingMetaData
 from mediagoblin.processing import mark_entry_failed
 from mediagoblin.processing.task import ProcessMedia
@@ -58,7 +61,7 @@ def get_upload_file_limits(user):
     """
     Get the upload_limit and max_file_size for this user
     """
-    if user.upload_limit >= 0:
+    if user.upload_limit is not None and user.upload_limit >= 0:  # TODO: debug this
         upload_limit = user.upload_limit
     else:
         upload_limit = mg_globals.app_config.get('upload_limit', None)
@@ -128,7 +131,7 @@ def submit_media(mg_app, user, submitted_file, filename,
 
     # If the filename contains non ascii generate a unique name
     if not all(ord(c) < 128 for c in filename):
-        filename = unicode(uuid.uuid4()) + splitext(filename)[-1]
+        filename = six.text_type(uuid.uuid4()) + splitext(filename)[-1]
 
     # Sniff the submitted media to determine which
     # media plugin should handle processing
@@ -137,7 +140,7 @@ def submit_media(mg_app, user, submitted_file, filename,
     # create entry and save in database
     entry = new_upload_entry(user)
     entry.media_type = media_type
-    entry.title = (title or unicode(splitext(filename)[0]))
+    entry.title = (title or six.text_type(splitext(filename)[0]))
 
     entry.description = description or u""
 
@@ -154,7 +157,7 @@ def submit_media(mg_app, user, submitted_file, filename,
     queue_file = prepare_queue_task(mg_app, entry, filename)
 
     with queue_file:
-        queue_file.write(submitted_file.read())
+        queue_file.write(submitted_file)
 
     # Get file size and round to 2 decimal places
     file_size = mg_app.queue_store.get_file_size(
@@ -192,14 +195,18 @@ def submit_media(mg_app, user, submitted_file, filename,
     else:
         feed_url = None
 
+    add_comment_subscription(user, entry)
+
+    # Create activity
+    create_activity("post", entry, entry.uploader)
+    entry.save()
+
     # Pass off to processing
     #
     # (... don't change entry after this point to avoid race
     # conditions with changes to the document via processing code)
     run_process_media(entry, feed_url)
 
-    add_comment_subscription(user, entry)
-
     return entry
 
 
@@ -213,7 +220,7 @@ def prepare_queue_task(app, entry, filename):
     # (If we got it off the task's auto-generation, there'd be
     # a risk of a race condition when we'd save after sending
     # off the task)
-    task_id = unicode(uuid.uuid4())
+    task_id = six.text_type(uuid.uuid4())
     entry.queued_task_id = task_id
 
     # Now store generate the queueing related filename
@@ -279,14 +286,21 @@ def api_upload_request(request, file_data, entry):
 
 def api_add_to_feed(request, entry):
     """ Add media to Feed """
-    if entry.title:
-        entry.generate_slug()
-
     feed_url = request.urlgen(
         'mediagoblin.user_pages.atom_feed',
         qualified=True, user=request.user.username
     )
 
-    run_process_media(entry, feed_url)
     add_comment_subscription(request.user, entry)
-    return json_response(entry.serialize(request))
+
+    # Create activity
+    activity = create_activity(
+        verb="post",
+        obj=entry,
+        actor=entry.uploader,
+        generator=create_generator(request)
+    )
+    entry.save()
+    run_process_media(entry, feed_url)
+
+    return activity
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 42c378a8..ccdd70bc 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
+
 from mediagoblin import messages
 import mediagoblin.mg_globals as mg_globals
 
@@ -27,8 +29,7 @@ from mediagoblin.tools.response import render_to_response, redirect
 from mediagoblin.decorators import require_active_login, user_has_privilege
 from mediagoblin.submit import forms as submit_forms
 from mediagoblin.messages import add_message, SUCCESS
-from mediagoblin.media_types import \
-    InvalidFileType, FileTypeNotSupported
+from mediagoblin.media_types import FileTypeNotSupported
 from mediagoblin.submit.lib import \
     check_file_field, submit_media, get_upload_file_limits, \
     FileUploadLimit, UserUploadLimit, UserPastUploadLimit
@@ -59,9 +60,9 @@ def submit_start(request):
                     mg_app=request.app, user=request.user,
                     submitted_file=request.files['file'],
                     filename=request.files['file'].filename,
-                    title=unicode(submit_form.title.data),
-                    description=unicode(submit_form.description.data),
-                    license=unicode(submit_form.license.data) or None,
+                    title=six.text_type(submit_form.title.data),
+                    description=six.text_type(submit_form.description.data),
+                    license=six.text_type(submit_form.license.data) or None,
                     tags_string=submit_form.tags.data,
                     upload_limit=upload_limit, max_file_size=max_file_size,
                     urlgen=request.urlgen)
@@ -87,18 +88,10 @@ def submit_start(request):
                     _('Sorry, you have reached your upload limit.'))
                 return redirect(request, "mediagoblin.user_pages.user_home",
                                 user=request.user.username)
-
+            except FileTypeNotSupported as e:
+                submit_form.file.errors.append(e)
             except Exception as e:
-                '''
-                This section is intended to catch exceptions raised in
-                mediagoblin.media_types
-                '''
-                if isinstance(e, InvalidFileType) or \
-                        isinstance(e, FileTypeNotSupported):
-                    submit_form.file.errors.append(
-                        e)
-                else:
-                    raise
+                raise
 
     return render_to_response(
         request,
@@ -117,8 +110,8 @@ def add_collection(request, media=None):
     if request.method == 'POST' and submit_form.validate():
         collection = request.db.Collection()
 
-        collection.title = unicode(submit_form.title.data)
-        collection.description = unicode(submit_form.description.data)
+        collection.title = six.text_type(submit_form.title.data)
+        collection.description = six.text_type(submit_form.description.data)
         collection.creator = request.user.id
         collection.generate_slug()
 
diff --git a/mediagoblin/templates/mediagoblin/api/oob.html b/mediagoblin/templates/mediagoblin/api/oob.html
index d290472a..97bdd9ca 100644
--- a/mediagoblin/templates/mediagoblin/api/oob.html
+++ b/mediagoblin/templates/mediagoblin/api/oob.html
@@ -25,7 +25,7 @@
 
 <h1>{% trans %}Authorization Complete{% endtrans %}</h1>
 
-<h4>{% trans %}Copy and paste this into your client:{% endtrans %}</h4>
+<h4>{% trans %}Copy and paste this <strong>verifier code</strong> into your client:{% endtrans %}</h4>
 
 <p class="verifier">
    {{ oauth_request.verifier }}
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 13cfb47b..ddc38b3e 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -62,138 +62,143 @@
   <body>
     {% include 'mediagoblin/bits/body_start.html' %}
     {% block mediagoblin_body %}
-      {% block mediagoblin_header %}
-        <div class="container">
-          <header>
-            <div class="row foot">
-            <div class="header_left">
-              {%- include "mediagoblin/bits/logo.html" -%}
-              {% block mediagoblin_header_title %}{% endblock %}
-            </div>
-            <div class="header_right">
-              {%- if request.user %}
-                {% if request.user and
-                      request.user.has_privilege('active') and
-                      not request.user.is_banned() %}
+      <div id="wrap">
+        {% block mediagoblin_header %}
+          <div class="container">
+            <header>
+              <div class="row foot">
+              <div class="header_left">
+                {%- include "mediagoblin/bits/logo.html" -%}
+                {% block mediagoblin_header_title %}{% endblock %}
+              </div>
+              <div class="header_right">
+                {% template_hook("header_extra") %}
+                {%- if request.user %}
+                  {% if request.user and
+                        request.user.has_privilege('active') and
+                        not request.user.is_banned() %}
 
-                  {% set notification_count = get_notification_count(request.user.id) %}
-                  {% if notification_count %}
+                    {% set notification_count = get_notification_count(request.user.id) %}
+                    {% if notification_count %}
+                      <a href="javascript:;"
+                         class="notification-gem button_action button_info"
+                         title="Notifications">
+                      {{ notification_count }}</a>
+                    {% endif %}
                     <a href="javascript:;"
-                       class="notification-gem button_action button_info"
-                       title="Notifications">
-                    {{ notification_count }}</a>
+                       class="button_action header_dropdown_down"
+                       aria-controls="header_dropdown">&#9660;</a>
+                    <a href="javascript:;"
+                       class="button_action header_dropdown_up"
+                       aria-controls="header_dropdown">&#9650;</a>
+                  {% elif request.user and not request.user.has_privilege('active') %}
+                  {# the following link should only appear when verification is needed #}
+                    <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
+                                     user=request.user.username) }}"
+                       class="button_action_highlight">
+                   {% trans %}Verify your email!{% endtrans %}</a>
+                   or <a id="logout" href=
+                   {% if persona is not defined %}
+                     "{{ request.urlgen('mediagoblin.auth.logout') }}"
+                   {% else %}
+                     "javascript:;"
+                   {% endif %}
+                   >{% trans %}log out{% endtrans %}</a>
+                  {% elif request.user and request.user.is_banned() %}
+                    <a id="logout" href=
+                   {% if persona is not defined %}
+                     "{{ request.urlgen('mediagoblin.auth.logout') }}"
+                   {% else %}
+                     "javascript:;"
+                   {% endif %}
+                   >{% trans %}log out{% endtrans %}</a>
+                  {% endif %}
+                {%- elif auth %}
+                <a href=
+                  {% if persona_auth is defined %}
+                    "javascript:;" id="persona_login"
+                  {% else %}
+                    "{{ request.urlgen('mediagoblin.auth.login') }}"
                   {% endif %}
-                  <a href="javascript:;"
-                     class="button_action header_dropdown_down"
-                     aria-controls="header_dropdown">&#9660;</a>
-                  <a href="javascript:;"
-                     class="button_action header_dropdown_up"
-                     aria-controls="header_dropdown">&#9650;</a>
-                {% elif request.user and not request.user.has_privilege('active') %}
-                {# the following link should only appear when verification is needed #}
-                  <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                                   user=request.user.username) }}"
-                     class="button_action_highlight">
-                 {% trans %}Verify your email!{% endtrans %}</a>
-                 or <a id="logout" href=
-                 {% if persona is not defined %}
-                   "{{ request.urlgen('mediagoblin.auth.logout') }}"
-                 {% else %}
-                   "javascript:;"
-                 {% endif %}
-                 >{% trans %}log out{% endtrans %}</a>
-                {% elif request.user and request.user.is_banned() %}
-                  <a id="logout" href=
-                 {% if persona is not defined %}
-                   "{{ request.urlgen('mediagoblin.auth.logout') }}"
-                 {% else %}
-                   "javascript:;"
-                 {% endif %}
-                 >{% trans %}log out{% endtrans %}</a>
-                {% endif %}
-              {%- elif auth %}
-              <a href=
-                {% if persona_auth is defined %}
-                  "javascript:;" id="persona_login"
-                {% else %}
-                  "{{ request.urlgen('mediagoblin.auth.login') }}"
-                {% endif %}
-                >
-                  {%- trans %}Log in{% endtrans -%}
-                </a>
-              {%- endif %}
-            </div>
-            <div class="clear"></div>
-            {% if request.user and request.user.has_privilege('active') %}
-              <div id="header_dropdown">
-                <p>
-                  <span class="dropdown_title">
-                    {% trans user_url=request.urlgen('mediagoblin.user_pages.user_home',
-                                                      user=request.user.username),
-                             user_name=request.user.username -%}
-                      <a href="{{ user_url }}">{{ user_name }}</a>'s account
-                    {%- endtrans %}
-                  </span>
-                  &middot;
-                  <a href="{{ request.urlgen('mediagoblin.edit.account') }}">{%- trans %}Change account settings{% endtrans -%}</a>
-                  &middot;
-                  <a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
-                                               user=request.user.username) }}">
-                    {%- trans %}Media processing panel{% endtrans -%}
+                  >
+                    {%- trans %}Log in{% endtrans -%}
                   </a>
-                  &middot;
-                  {% template_hook("blog_dashboard_home") %}
-                  <a id="logout" href=
-                    {% if persona is not defined %}
-                      "{{ request.urlgen('mediagoblin.auth.logout') }}"
-                    {% else %}
-                      "javascript:;"
-                    {% endif %}
-                    >{% trans %}Log out{% endtrans %}</a>
-                </p>
-                <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">
-                  {%- trans %}Add media{% endtrans -%}
-                </a>
-                <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}">
-                  {%- trans %}Create new collection{% endtrans -%}
-                </a>
-                {% template_hook("header_dropdown_buttons") %}
-                {% if request.user.has_privilege('moderator') %}
+                {%- endif %}
+              </div>
+              <div class="clear"></div>
+              {% if request.user and request.user.has_privilege('active') %}
+                <div id="header_dropdown">
                   <p>
-                    <span class="dropdown_title">{% trans %}Moderation powers:{% endtrans %}</span>
-                    <a href="{{ request.urlgen('mediagoblin.moderation.media_panel') }}">
-                      {%- trans %}Media processing panel{% endtrans -%}
-                    </a>
+                    <span class="dropdown_title">
+                      {% trans user_url=request.urlgen('mediagoblin.user_pages.user_home',
+                                                        user=request.user.username),
+                               user_name=request.user.username -%}
+                        <a href="{{ user_url }}">{{ user_name }}</a>'s account
+                      {%- endtrans %}
+                    </span>
                     &middot;
-                    <a href="{{ request.urlgen('mediagoblin.moderation.users') }}">
-                      {%- trans %}User management panel{% endtrans -%}
-                    </a>
+                    <a href="{{ request.urlgen('mediagoblin.edit.account') }}">{%- trans %}Change account settings{% endtrans -%}</a>
                     &middot;
-                    <a href="{{ request.urlgen('mediagoblin.moderation.reports') }}">
-                      {%- trans %}Report management panel{% endtrans -%}
+                    <a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
+                                                 user=request.user.username) }}">
+                      {%- trans %}Media processing panel{% endtrans -%}
                     </a>
-                    {% template_hook("moderation_powers") %}
+                    &middot;
+                    {% template_hook("blog_dashboard_home") %}
+                    <a id="logout" href=
+                      {% if persona is not defined %}
+                        "{{ request.urlgen('mediagoblin.auth.logout') }}"
+                      {% else %}
+                        "javascript:;"
+                      {% endif %}
+                      >{% trans %}Log out{% endtrans %}</a>
                   </p>
-                {% endif %}
-                {% include 'mediagoblin/fragments/header_notifications.html' %}
-              </div>
+                  <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">
+                    {%- trans %}Add media{% endtrans -%}
+                  </a>
+                  <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}">
+                    {%- trans %}Create new collection{% endtrans -%}
+                  </a>
+                  {% template_hook("header_dropdown_buttons") %}
+                  {% if request.user.has_privilege('moderator') %}
+                    <p>
+                      <span class="dropdown_title">{% trans %}Moderation powers:{% endtrans %}</span>
+                      <a href="{{ request.urlgen('mediagoblin.moderation.media_panel') }}">
+                        {%- trans %}Media processing panel{% endtrans -%}
+                      </a>
+                      &middot;
+                      <a href="{{ request.urlgen('mediagoblin.moderation.users') }}">
+                        {%- trans %}User management panel{% endtrans -%}
+                      </a>
+                      &middot;
+                      <a href="{{ request.urlgen('mediagoblin.moderation.reports') }}">
+                        {%- trans %}Report management panel{% endtrans -%}
+                      </a>
+                      {% template_hook("moderation_powers") %}
+                    </p>
+                  {% endif %}
+                  {% include 'mediagoblin/fragments/header_notifications.html' %}
+                </div>
+              {% endif %}
+              </div><!-- end row -->
+            </header>
+          </div>
+        {% endblock %}
+        <div class="container">
+          {% include 'mediagoblin/bits/above_content.html' %}
+          <div class="mediagoblin_content">
+            {% include "mediagoblin/utils/messages.html" %}
+            {% block mediagoblin_content %}
+            {% endblock mediagoblin_content %}
+            {% if csrf_token is defined %}
+              {% template_hook("persona_form") %}
             {% endif %}
-            </div><!-- end row -->
-          </header>
-        </div>
-      {% endblock %}
-      <div class="container">
-        {% include 'mediagoblin/bits/above_content.html' %}
-        <div class="mediagoblin_content">
-          {% include "mediagoblin/utils/messages.html" %}
-          {% block mediagoblin_content %}
-          {% endblock mediagoblin_content %}
-          {% if csrf_token is defined %}
-            {% template_hook("persona_form") %}
-          {% endif %}
+          </div>
         </div>
-        {%- include "mediagoblin/bits/base_footer.html" %}
       </div>
+    <div class="container">
+      {%- include "mediagoblin/bits/base_footer.html" %}
+    </div>
     {%- endblock mediagoblin_body %}
     {% include 'mediagoblin/bits/body_end.html' %}
   </body>
diff --git a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
index 3d93ea52..ec53159f 100644
--- a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
+++ b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
@@ -44,7 +44,7 @@
           {%- endtrans %}
       </div>
       <div class="four columns offset-by-one">
-        <img class="welcomeimage" src="/mgoblin_static/images/home_goblin.png">
+        <img class="welcomeimage" src="{{ request.staticdirect('/images/home_goblin.png') }}">
       </div>
     </div>
     <div class="clear"></div>
diff --git a/mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html b/mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html
new file mode 100644
index 00000000..f3b83e4e
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/edit/deauthorize_applications.html
@@ -0,0 +1,69 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{%- extends "mediagoblin/base.html" %}
+
+{% block title -%}
+  {% trans -%}
+    Deauthorize applications
+  {%- endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
+{% block mediagoblin_content %}
+  <h2>{% trans -%}Deauthorize Applications{%- endtrans %}</h2>
+  <p>{% trans -%}
+    These applications can access your GNU MediaGoblin account. Deauthorizing the
+    application will prevent the application from accessing your account.
+    {%- endtrans %}
+  </p>
+
+  <form method="POST" action="{{ request.urlgen('mediagoblin.edit.deauthorize_applications') }}">
+  {{ csrf_token }}
+  {% if not applications %}
+    <em>{% trans -%}There are no applications authorized.{%- endtrans %}</em>
+  {% endif %}
+  {% for application, access in applications %}
+    <div class="application">
+      <div class="application-button">
+        <button class="button_action" name="application" value="{{ access.token }}">Deauthorize</button>
+      </div>
+      {% if application.get_client.logo_url %}
+        <img class="application-icon" src="{{ application.get_client.logo_url }}">
+      {% else %}
+        <img class="application-icon" src="{{ request.staticdirect('/images/small-gavroche.png') }}">
+      {% endif %}
+      <div class="application-content">
+        <strong>{{ application.get_client.application_name }}</strong>
+        <p class="application-data">
+          <small>
+            {% trans -%}Type:{%- endtrans %}
+            &nbsp;
+            {{ application.get_client.application_type }}</small>
+          <br />
+          <small>
+            {% trans -%}Authorized:{%- endtrans %}
+            &nbsp;
+            {%- trans formatted_time=timesince(access.created) -%}
+              {{ formatted_time }} ago
+            {%- endtrans -%}
+          </small>
+        </p>
+      </div>
+    </div>
+  {% endfor %}
+  </form>
+{% endblock %}
\ No newline at end of file
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index 574fe459..14a66482 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -53,7 +53,10 @@
     <a href="{{ request.urlgen('mediagoblin.edit.delete_account') }}">
       {%- trans %}Delete my account{% endtrans -%}
     </a>
-    &middot;
+    <br />
+    <a href="{{ request.urlgen('mediagoblin.edit.deauthorize_applications') }}">
+      {%- trans %}Deauthorize applications{% endtrans -%}
+    </a>
     {% template_hook("edit_link") %}
     <a href="{{ request.urlgen('mediagoblin.edit.email') }}">
       {% trans %}Email{% endtrans %}
diff --git a/mediagoblin/templates/mediagoblin/media_displays/ascii.html b/mediagoblin/templates/mediagoblin/media_displays/ascii.html
index 3cc5e0ab..56039980 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/ascii.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/ascii.html
@@ -19,13 +19,15 @@
 {% extends 'mediagoblin/user_pages/media.html' %}
 
 {% block mediagoblin_media %}
-  <div class="ascii-wrapper">
-    <pre>
-      {%- autoescape False -%}
-      {{- request.app.public_store.get_file(
-             media.media_files['unicode']).read()|string -}}
-      {%- endautoescape -%}
-    </pre>
+  <div class="media_image_container">
+    <div class="ascii-wrapper">
+      <pre>
+        {%- autoescape False -%}
+        {{- request.app.public_store.get_file(
+               media.media_files['unicode']).read()|string -}}
+        {%- endautoescape -%}
+      </pre>
+    </div>
   </div>
 {% endblock %}
 
diff --git a/mediagoblin/templates/mediagoblin/media_displays/audio.html b/mediagoblin/templates/mediagoblin/media_displays/audio.html
index 95bc6e88..7571f863 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/audio.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/audio.html
@@ -22,33 +22,33 @@
     {{ super() }}
     <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/audio.css') }}" />
     <script type="text/javascript" src="{{ request.staticdirect(
-        '/js/extlib/html5slider.js') }}"></script>
-    <script type="text/javascript" src="{{ request.staticdirect(
         '/js/audio.js') }}"></script>
 {% endblock %}
 
 {% block mediagoblin_media %}
-  <div class="audio-media">
-    {% if 'spectrogram' in media.media_files %}
-      <div class="audio-spectrogram">
-	<img src="{{ request.app.public_store.file_url(
-		      media.media_files.spectrogram) }}"
-	     alt="Spectrogram" />
-      </div>
-    {% endif %}
-    <audio class="audio-player" controls="controls"
-	   preload="metadata">
-      <source src="{{ request.app.public_store.file_url(
-		       media.media_files.webm_audio) }}" type="audio/webm; codecs=vorbis" />
-      <div class="no_html5">
-	{%- trans -%}Sorry, this audio will not work because 
-	your web browser does not support HTML5 
-	audio.{%- endtrans -%}<br/>
-	{%- trans -%}You can get a modern web browser that 
-	can play the audio at <a href="http://getfirefox.com">
-	  http://getfirefox.com</a>!{%- endtrans -%}
-      </div>
-    </audio>
+  <div class="media_other_container">
+    <div class="audio-media">
+      {% if 'spectrogram' in media.media_files %}
+        <div class="audio-spectrogram">
+	  <img src="{{ request.app.public_store.file_url(
+		        media.media_files.spectrogram) }}"
+	       alt="Spectrogram" />
+        </div>
+      {% endif %}
+      <audio class="audio-player" controls="controls"
+	     preload="metadata">
+        <source src="{{ request.app.public_store.file_url(
+		         media.media_files.webm_audio) }}" type="audio/webm; codecs=vorbis" />
+        <div class="no_html5">
+	  {%- trans -%}Sorry, this audio will not work because
+	  your web browser does not support HTML5
+	  audio.{%- endtrans -%}<br/>
+	  {%- trans -%}You can get a modern web browser that
+	  can play the audio at <a href="http://getfirefox.com">
+	    http://getfirefox.com</a>!{%- endtrans -%}
+        </div>
+      </audio>
+    </div>
   </div>
 {% endblock %}
 
diff --git a/mediagoblin/templates/mediagoblin/media_displays/blogpost.html b/mediagoblin/templates/mediagoblin/media_displays/blogpost.html
index ca3441b9..4b0f53a6 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/blogpost.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/blogpost.html
@@ -23,9 +23,10 @@
 {% endblock %}
 
 {% block mediagoblin_media %}
-<h1> {{media.title}}</h1>
-<p>{{media.description|safe}}</p>
-
+<div class="media_other_container">
+  <h1> {{media.title}}</h1>
+  <p>{{media.description|safe}}</p>
+</div>
 {% endblock %}
   
 
diff --git a/mediagoblin/templates/mediagoblin/media_displays/pdf.html b/mediagoblin/templates/mediagoblin/media_displays/pdf.html
index a615cba6..b39dad50 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/pdf.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/pdf.html
@@ -46,21 +46,23 @@
 {%- endblock %}
 
 {% block mediagoblin_media %}
-  {% if pdf_js %}
-    <iframe width="640px" height="480px"
-        src="{{ request.staticdirect('/extlib/pdf.js/web/viewer.html') }}?file={{ pdf_view }} ">
-    </iframe>
-  {% else %}
-    <a href="{{ pdf_view }}">
-    <img id="medium"
-         class="media_image"
-         src="{{ medium_view }}"
-         alt="
-           {%- trans media_title=media.title -%}
-             Image for {{ media_title}}
-           {%- endtrans %}"/>
-    </a>
-  {% endif %}
+  <div class="media_other_container">
+    {% if pdf_js %}
+      <iframe width="640px" height="480px"
+          src="{{ request.staticdirect('/extlib/pdf.js/web/viewer.html') }}?file={{ pdf_view }} ">
+      </iframe>
+    {% else %}
+      <a href="{{ pdf_view }}">
+      <img id="medium"
+           class="media_image"
+           src="{{ medium_view }}"
+           alt="
+             {%- trans media_title=media.title -%}
+               Image for {{ media_title}}
+             {%- endtrans %}"/>
+      </a>
+    {% endif %}
+  </div>
 {% endblock %}
 
 {% block mediagoblin_sidebar %}
diff --git a/mediagoblin/templates/mediagoblin/media_displays/stl.html b/mediagoblin/templates/mediagoblin/media_displays/stl.html
index ca0479ce..a95a1845 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/stl.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/stl.html
@@ -107,7 +107,8 @@ window.show_things = function () {
    src="{{ front_view }}"
    alt="{% trans media_title=media.title -%}
         Image for {{ media_title }}{% endtrans %}" />
-<div id="thingy_view" style="width:640px;height:640px;"></div>
+<!--<div id="thingy_view" style="width:640px;height:640px;"></div>-->
+<div id="thingy_view"></div>
 
 </div>
 
@@ -146,4 +147,5 @@ window.show_things = function () {
 <p>{{ media.media_data.file_type }}</p>
 <h3>{% trans %}Object Height{% endtrans %}</h3>
 <p>~{{ media.media_data.height|int }} mm</p>
+{% template_hook("stl_sideinfo") %}
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html
index 9386ffcf..cc06ba21 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/video.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/video.html
@@ -46,6 +46,7 @@
 {%- endblock %}
 
 {% block mediagoblin_media %}
+<div class="media_other_container">
   {% set display_type, display_path = media.get_display_media() %}
 
   <video controls
@@ -68,6 +69,7 @@
       http://getfirefox.com</a>!{%- endtrans -%}
     </div>
   </video>
+</div>
 {% endblock %}
 
 {% block mediagoblin_sidebar %}
diff --git a/mediagoblin/templates/mediagoblin/moderation/report.html b/mediagoblin/templates/mediagoblin/moderation/report.html
index 2028f74c..496610ad 100644
--- a/mediagoblin/templates/mediagoblin/moderation/report.html
+++ b/mediagoblin/templates/mediagoblin/moderation/report.html
@@ -130,11 +130,11 @@
   {% if not report.is_archived_report() and 
         not (report.reported_user.has_privilege('admin') and 
         not request.user.has_privilege('admin')) %}
-    <input type=button value="{% trans %}Resolve{% endtrans %}" id=open_resolution_form />
+    <input type=button class="button_action" value="{% trans %}Resolve{% endtrans %}" id=open_resolution_form />
     <form action="" method="POST" id=resolution_form>
       {{ wtforms_util.render_divs(form) }}
       {{ csrf_token }}
-      <input type=submit id="submit_this_report" value="{% trans %}Resolve This Report{% endtrans %}"/>
+      <input type=submit class="button_action_highlight" id="submit_this_report" value="{% trans %}Resolve This Report{% endtrans %}"/>
     </form>
   <script>
   $(document).ready(function() {
diff --git a/mediagoblin/plugins/oauth/templates/oauth/client/register.html b/mediagoblin/templates/mediagoblin/user_pages/activity.html
index 6fd700d3..14377a48 100644
--- a/mediagoblin/plugins/oauth/templates/oauth/client/register.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/activity.html
@@ -1,6 +1,6 @@
 {#
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2014 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -14,21 +14,29 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
--#}
-{% extends "mediagoblin/base.html" %}
-{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+#}
+{%- extends "mediagoblin/base.html" %}
+
+{% block mediagoblin_head %}
+	{% template_hook("media_head") %}
+{% endblock mediagoblin_head %}
 
 {% block mediagoblin_content %}
-<form action="{{ request.urlgen('mediagoblin.plugins.oauth.register_client') }}"
-    method="POST">
-    <div class="form_box_xl">
-        <h1>Register OAuth client</h1>
-        {{ wtforms_util.render_divs(form) }}
-        <div class="form_submit_buttons">
-            {{ csrf_token }}
-            <input type="submit" value="{% trans %}Add{% endtrans %}"
-            class="button_form" />
-        </div>
-    </div>
-</form>
-{% endblock %}
+<div class="media_pane eleven columns">
+  <h2 class="media_title">
+    {% if activity.title %}{{ activity.title }}{% endif %}
+  </h2>
+  {% autoescape False %}
+    <p> {{ activity.content }} </p>
+  {% endautoescape %}
+
+  <div class="media_sidebar">
+    {% block mediagoblin_after_added_sidebar %}
+      <a href="{{ activity.url(request) }}"
+         class="button_action"
+         id="button_reportmedia">
+            View {{ activity.get_object.object_type }}
+      </a>
+    {% endblock %}
+  </div>
+{% endblock %}
\ No newline at end of file
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 0b2ae898..16ddd62c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -30,6 +30,7 @@
   <script type="text/javascript"
           src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script>
 
+  {% template_hook("location_head") %}
   {% template_hook("media_head") %}
 {% endblock mediagoblin_head %}
 {% block mediagoblin_content %}
@@ -47,8 +48,8 @@
   </div>
 </div>
   <div class="media_pane eleven columns">
-    <div class="media_image_container">
-      {% block mediagoblin_media %}
+    {% block mediagoblin_media %}
+      <div class="media_image_container">
         {% set display_media = request.app.public_store.file_url(
                  media.get_display_media()[1]) %}
         {# if there's a medium file size, that means the medium size
@@ -68,8 +69,8 @@
                alt="{% trans media_title=media.title -%}
                       Image for {{ media_title }}{% endtrans %}" />
         {% endif %}
-      {% endblock %}
-    </div>
+      </div>
+    {% endblock %}
     <div class="row head foot">
     <h2 class="media_title">
       {{ media.title }}
@@ -231,6 +232,8 @@
     {% block mediagoblin_sidebar %}
     {% endblock %}
 
+    {%- set model = media %}
+    {% template_hook("location_info") %}
     {% template_hook("media_sideinfo") %}
 
   </div><!--end media_sidebar-->
diff --git a/mediagoblin/templates/mediagoblin/user_pages/report.html b/mediagoblin/templates/mediagoblin/user_pages/report.html
index ce0fb1bc..6f25b996 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/report.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/report.html
@@ -78,6 +78,6 @@
 
     {{- wtforms_util.render_divs(form) }}
 	{{ csrf_token }}
-    <input type=submit value="{% trans %}File Report {% endtrans %}" />
+    <input type=submit class="button_action" value="{% trans %}File Report {% endtrans %}" />
 </form>
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 51baa9bb..9ac96f80 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -46,7 +46,7 @@
     {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
   </h1>
 
-  {% if not user.url and not user.bio %}
+  {% if not user.url and not user.bio and not user.location %}
     {% if request.user and (request.user.id == user.id) %}
       <div class="profile_sidebar empty_space">
         <p>
diff --git a/mediagoblin/templates/mediagoblin/utils/profile.html b/mediagoblin/templates/mediagoblin/utils/profile.html
index 7a3af01c..5cc38487 100644
--- a/mediagoblin/templates/mediagoblin/utils/profile.html
+++ b/mediagoblin/templates/mediagoblin/utils/profile.html
@@ -16,6 +16,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
+{% block mediagoblin_head %}
+  {% template_hook("location_head") %}
+{% endblock mediagoblin_head %}
+
 {% block profile_content -%}
   {% if user.bio %}
     {% autoescape False %}
@@ -27,4 +31,12 @@
       <a href="{{ user.url }}">{{ user.url }}</a>
     </p>
   {% endif %}
+  {% if user.location %}
+      {%- set model = user %}
+      <h3>{% trans %}Location{% endtrans %}</h3>
+      {% if model.get_location.name %}
+        <p>{{ model.get_location.name }}</p>
+      {% endif %}
+      {% template_hook("location_info") %}
+  {% endif %}
 {% endblock %}
diff --git a/mediagoblin/tests/media_tools.py b/mediagoblin/tests/media_tools.py
new file mode 100644
index 00000000..8d58c024
--- /dev/null
+++ b/mediagoblin/tests/media_tools.py
@@ -0,0 +1,61 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2013 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from contextlib import contextmanager
+import tempfile
+
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import Gst
+Gst.init(None)
+
+@contextmanager
+def create_av(make_video=False, make_audio=False):
+    'creates audio/video in `path`, throws AssertionError on any error'
+    media = tempfile.NamedTemporaryFile(suffix='.ogg')
+    pipeline = Gst.Pipeline()
+    mux = Gst.ElementFactory.make('oggmux', 'mux')
+    pipeline.add(mux)
+    if make_video:
+        video_src = Gst.ElementFactory.make('videotestsrc', 'video_src')
+        video_src.set_property('num-buffers', 20)
+        video_enc = Gst.ElementFactory.make('theoraenc', 'video_enc')
+        pipeline.add(video_src)
+        pipeline.add(video_enc)
+        assert video_src.link(video_enc)
+        assert video_enc.link(mux)
+    if make_audio:
+        audio_src = Gst.ElementFactory.make('audiotestsrc', 'audio_src')
+        audio_src.set_property('num-buffers', 20)
+        audio_enc = Gst.ElementFactory.make('vorbisenc', 'audio_enc')
+        pipeline.add(audio_src)
+        pipeline.add(audio_enc)
+        assert audio_src.link(audio_enc)
+        assert audio_enc.link(mux)
+    sink = Gst.ElementFactory.make('filesink', 'sink')
+    sink.set_property('location', media.name)
+    pipeline.add(sink)
+    mux.link(sink)
+    pipeline.set_state(Gst.State.PLAYING)
+    state = pipeline.get_state(Gst.SECOND)
+    assert state[0] == Gst.StateChangeReturn.SUCCESS
+    bus = pipeline.get_bus()
+    message = bus.timed_pop_filtered(
+            Gst.SECOND,  # one second should be more than enough for 50-buf vid
+            Gst.MessageType.ERROR | Gst.MessageType.EOS)
+    assert message.type == Gst.MessageType.EOS
+    pipeline.set_state(Gst.State.NULL)
+    yield media.name
diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py
index 93e82f18..83003875 100644
--- a/mediagoblin/tests/test_api.py
+++ b/mediagoblin/tests/test_api.py
@@ -15,7 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import json
 
-import mock
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 import pytest
 
 from webtest import AppError
@@ -23,6 +26,7 @@ from webtest import AppError
 from .resources import GOOD_JPG
 from mediagoblin import mg_globals
 from mediagoblin.db.models import User, MediaEntry, MediaComment
+from mediagoblin.tools.routing import extract_url_arguments
 from mediagoblin.tests.tools import fixture_add_user
 from mediagoblin.moderation.tools import take_away_privileges
 
@@ -55,7 +59,7 @@ class TestAPI(object):
                 headers=headers
             )
 
-        return response, json.loads(response.body)
+        return response, json.loads(response.body.decode())
 
     def _upload_image(self, test_app, image):
         """ Uploads and image to MediaGoblin via pump.io API """
@@ -72,7 +76,7 @@ class TestAPI(object):
                 data,
                 headers=headers
             )
-            image = json.loads(response.body)
+            image = json.loads(response.body.decode())
 
         return response, image
 
@@ -142,7 +146,7 @@ class TestAPI(object):
                     headers=headers
                 )
 
-            assert "403 FORBIDDEN" in excinfo.value.message
+            assert "403 FORBIDDEN" in excinfo.value.args[0]
 
     def test_unable_to_post_feed_as_someone_else(self, test_app):
         """ Tests that can't post an image to someone else's feed """
@@ -165,7 +169,7 @@ class TestAPI(object):
                     headers=headers
                 )
 
-            assert "403 FORBIDDEN" in excinfo.value.message
+            assert "403 FORBIDDEN" in excinfo.value.args[0]
 
     def test_only_able_to_update_own_image(self, test_app):
         """ Test's that the uploader is the only person who can update an image """
@@ -184,7 +188,8 @@ class TestAPI(object):
         # Lets change the image uploader to be self.other_user, this is easier
         # than uploading the image as someone else as the way self.mocked_oauth_required
         # and self._upload_image.
-        media = MediaEntry.query.filter_by(id=data["object"]["id"]).first()
+        id = int(data["object"]["id"].split("/")[-2])
+        media = MediaEntry.query.filter_by(id=id).first()
         media.uploader = self.other_user.id
         media.save()
 
@@ -197,7 +202,7 @@ class TestAPI(object):
                     headers=headers
                 )
 
-            assert "403 FORBIDDEN" in excinfo.value.message
+            assert "403 FORBIDDEN" in excinfo.value.args[0]
 
     def test_upload_image_with_filename(self, test_app):
         """ Tests that you can upload an image with filename and description """
@@ -224,16 +229,17 @@ class TestAPI(object):
                 headers={"Content-Type": "application/json"}
             )
 
-        image = json.loads(response.body)["object"]
+        image = json.loads(response.body.decode())["object"]
 
         # Check everything has been set on the media correctly
-        media = MediaEntry.query.filter_by(id=image["id"]).first()
+        id = int(image["id"].split("/")[-2])
+        media = MediaEntry.query.filter_by(id=id).first()
         assert media.title == title
         assert media.description == description
         assert media.license == license
 
         # Check we're being given back everything we should on an update
-        assert image["id"] == media.id
+        assert int(image["id"].split("/")[-2]) == media.id
         assert image["displayName"] == title
         assert image["content"] == description
         assert image["license"] == license
@@ -260,7 +266,7 @@ class TestAPI(object):
                 )
 
             # Assert that we've got a 403
-            assert "403 FORBIDDEN" in excinfo.value.message
+            assert "403 FORBIDDEN" in excinfo.value.args[0]
 
     def test_object_endpoint(self, test_app):
         """ Tests that object can be looked up at endpoint """
@@ -281,11 +287,11 @@ class TestAPI(object):
         with self.mock_oauth():
             request = test_app.get(object_uri)
 
-        image = json.loads(request.body)
-        entry = MediaEntry.query.filter_by(id=image["id"]).first()
+        image = json.loads(request.body.decode())
+        entry_id = int(image["id"].split("/")[-2])
+        entry = MediaEntry.query.filter_by(id=entry_id).first()
 
         assert request.status_code == 200
-        assert entry.id == image["id"]
 
         assert "image" in image
         assert "fullImage" in image
@@ -313,7 +319,8 @@ class TestAPI(object):
         assert response.status_code == 200
 
         # Find the objects in the database
-        media = MediaEntry.query.filter_by(id=data["object"]["id"]).first()
+        media_id = int(data["object"]["id"].split("/")[-2])
+        media = MediaEntry.query.filter_by(id=media_id).first()
         comment = media.get_comments()[0]
 
         # Tests that it matches in the database
@@ -321,7 +328,6 @@ class TestAPI(object):
         assert comment.content == content
 
         # Test that the response is what we should be given
-        assert comment.id == comment_data["object"]["id"]
         assert comment.content == comment_data["object"]["content"]
 
     def test_unable_to_post_comment_as_someone_else(self, test_app):
@@ -351,7 +357,7 @@ class TestAPI(object):
                     headers=headers
                 )
 
-            assert "403 FORBIDDEN" in excinfo.value.message
+            assert "403 FORBIDDEN" in excinfo.value.args[0]
 
     def test_unable_to_update_someone_elses_comment(self, test_app):
         """ Test that you're able to update someoen elses comment. """
@@ -376,7 +382,7 @@ class TestAPI(object):
         response, comment_data = self._activity_to_feed(test_app, activity)
 
         # change who uploaded the comment as it's easier than changing
-        comment_id = comment_data["object"]["id"]
+        comment_id = int(comment_data["object"]["id"].split("/")[-2])
         comment = MediaComment.query.filter_by(id=comment_id).first()
         comment.author = self.other_user.id
         comment.save()
@@ -396,14 +402,14 @@ class TestAPI(object):
                     headers=headers
                 )
 
-            assert "403 FORBIDDEN" in excinfo.value.message
+            assert "403 FORBIDDEN" in excinfo.value.args[0]
 
     def test_profile(self, test_app):
         """ Tests profile endpoint """
         uri = "/api/user/{0}/profile".format(self.user.username)
         with self.mock_oauth():
             response = test_app.get(uri)
-            profile = json.loads(response.body)
+            profile = json.loads(response.body.decode())
 
             assert response.status_code == 200
 
@@ -417,7 +423,7 @@ class TestAPI(object):
         uri = "/api/user/{0}/".format(self.user.username)
         with self.mock_oauth():
             response = test_app.get(uri)
-            user = json.loads(response.body)
+            user = json.loads(response.body.decode())
 
             assert response.status_code == 200
 
@@ -433,7 +439,7 @@ class TestAPI(object):
         with pytest.raises(AppError) as excinfo:
             response = test_app.get("/api/whoami")
 
-        assert "401 UNAUTHORIZED" in excinfo.value.message
+        assert "401 UNAUTHORIZED" in excinfo.value.args[0]
 
     def test_read_feed(self, test_app):
         """ Test able to read objects from the feed """
@@ -443,7 +449,7 @@ class TestAPI(object):
         uri = "/api/user/{0}/feed".format(self.active_user.username)
         with self.mock_oauth():
             response = test_app.get(uri)
-            feed = json.loads(response.body)
+            feed = json.loads(response.body.decode())
 
             assert response.status_code == 200
 
@@ -468,9 +474,9 @@ class TestAPI(object):
             with pytest.raises(AppError) as excinfo:
                 self._post_image_to_feed(test_app, data)
 
-            assert "403 FORBIDDEN" in excinfo.value.message
+            assert "403 FORBIDDEN" in excinfo.value.args[0]
 
-    def test_object_endpoint(self, test_app):
+    def test_object_endpoint_requestable(self, test_app):
         """ Test that object endpoint can be requested """
         response, data = self._upload_image(test_app, GOOD_JPG)
         response, data = self._post_image_to_feed(test_app, data)
@@ -478,7 +484,7 @@ class TestAPI(object):
 
         with self.mock_oauth():
             response = test_app.get(data["object"]["links"]["self"]["href"])
-            data = json.loads(response.body)
+            data = json.loads(response.body.decode())
 
             assert response.status_code == 200
 
@@ -486,3 +492,109 @@ class TestAPI(object):
             assert "url" in data
             assert "links" in data
             assert data["objectType"] == "image"
+
+    def test_delete_media_by_activity(self, test_app):
+        """ Test that an image can be deleted by a delete activity to feed """
+        response, data = self._upload_image(test_app, GOOD_JPG)
+        response, data = self._post_image_to_feed(test_app, data)
+        object_id = data["object"]["id"]
+
+        activity = {
+            "verb": "delete",
+            "object": {
+                "id": object_id,
+                "objectType": "image",
+            }
+        }
+
+        response = self._activity_to_feed(test_app, activity)[1]
+
+        # Check the media is no longer in the database
+        media_id = int(object_id.split("/")[-2])
+        media = MediaEntry.query.filter_by(id=media_id).first()
+
+        assert media is None
+
+        # Check we've been given the full delete activity back
+        assert "id" in response
+        assert response["verb"] == "delete"
+        assert "object" in response
+        assert response["object"]["id"] == object_id
+        assert response["object"]["objectType"] == "image"
+
+    def test_delete_comment_by_activity(self, test_app):
+        """ Test that a comment is deleted by a delete activity to feed """
+        # First upload an image to comment against
+        response, data = self._upload_image(test_app, GOOD_JPG)
+        response, data = self._post_image_to_feed(test_app, data)
+
+        # Post a comment to delete
+        activity = {
+            "verb": "post",
+            "object": {
+                "objectType": "comment",
+                "content": "This is a comment.",
+                "inReplyTo": data["object"],
+            }
+        }
+
+        comment = self._activity_to_feed(test_app, activity)[1]
+
+        # Now delete the image
+        activity = {
+            "verb": "delete",
+            "object": {
+                "id": comment["object"]["id"],
+                "objectType": "comment",
+            }
+        }
+
+        delete = self._activity_to_feed(test_app, activity)[1]
+
+        # Verify the comment no longer exists
+        comment_id = int(comment["object"]["id"].split("/")[-2])
+        assert MediaComment.query.filter_by(id=comment_id).first() is None
+
+        # Check we've got a delete activity back
+        assert "id" in delete
+        assert delete["verb"] == "delete"
+        assert "object" in delete
+        assert delete["object"]["id"] == comment["object"]["id"]
+        assert delete["object"]["objectType"] == "comment"
+
+    def test_edit_comment(self, test_app):
+        """ Test that someone can update their own comment """
+        # First upload an image to comment against
+        response, data = self._upload_image(test_app, GOOD_JPG)
+        response, data = self._post_image_to_feed(test_app, data)
+
+        # Post a comment to edit
+        activity = {
+            "verb": "post",
+            "object": {
+                "objectType": "comment",
+                "content": "This is a comment",
+                "inReplyTo": data["object"],
+            }
+        }
+
+        comment = self._activity_to_feed(test_app, activity)[1]
+
+        # Now create an update activity to change the content
+        activity = {
+            "verb": "update",
+            "object": {
+                "id": comment["object"]["id"],
+                "content": "This is my fancy new content string!",
+                "objectType": "comment",
+            },
+        }
+
+        comment = self._activity_to_feed(test_app, activity)[1]
+
+        # Verify the comment reflects the changes
+        comment_id = int(comment["object"]["id"].split("/")[-2])
+        model = MediaComment.query.filter_by(id=comment_id).first()
+
+        assert model.content == activity["object"]["content"]
+
diff --git a/mediagoblin/tests/test_audio.py b/mediagoblin/tests/test_audio.py
new file mode 100644
index 00000000..9826ceb1
--- /dev/null
+++ b/mediagoblin/tests/test_audio.py
@@ -0,0 +1,105 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2013 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import tempfile
+import shutil
+import os
+import pytest
+from contextlib import contextmanager
+import logging
+import imghdr
+
+#os.environ['GST_DEBUG'] = '4,python:4'
+
+pytest.importorskip("gi.repository.Gst")
+pytest.importorskip("scikits.audiolab")
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import Gst
+Gst.init(None)
+
+from mediagoblin.media_types.audio.transcoders import (AudioTranscoder,
+        AudioThumbnailer)
+from mediagoblin.media_types.tools import discover
+
+
+@contextmanager
+def create_audio():
+    audio = tempfile.NamedTemporaryFile()
+    src = Gst.ElementFactory.make('audiotestsrc', None)
+    src.set_property('num-buffers', 50)
+    enc = Gst.ElementFactory.make('flacenc', None)
+    dst = Gst.ElementFactory.make('filesink', None)
+    dst.set_property('location', audio.name)
+    pipeline = Gst.Pipeline()
+    pipeline.add(src)
+    pipeline.add(enc)
+    pipeline.add(dst)
+    src.link(enc)
+    enc.link(dst)
+    pipeline.set_state(Gst.State.PLAYING)
+    state = pipeline.get_state(3 * Gst.SECOND)
+    assert state[0] == Gst.StateChangeReturn.SUCCESS
+    bus = pipeline.get_bus()
+    bus.timed_pop_filtered(
+            3 * Gst.SECOND,
+            Gst.MessageType.ERROR | Gst.MessageType.EOS)
+    pipeline.set_state(Gst.State.NULL)
+    yield (audio.name)
+
+
+@contextmanager
+def create_data_for_test():
+    with create_audio() as audio_name:
+        second_file = tempfile.NamedTemporaryFile()
+        yield (audio_name, second_file.name)
+
+
+def test_transcoder():
+    '''
+    Tests AudioTransocder's transcode method
+    '''
+    transcoder = AudioTranscoder()
+    with create_data_for_test() as (audio_name, result_name):
+        transcoder.transcode(audio_name, result_name, quality=0.3,
+                             progress_callback=None)
+        info = discover(result_name)
+        assert len(info.get_audio_streams()) == 1
+        transcoder.transcode(audio_name, result_name, quality=0.3,
+                             mux_name='oggmux', progress_callback=None)
+        info = discover(result_name)
+        assert len(info.get_audio_streams()) == 1
+
+
+def test_thumbnails():
+    '''Test thumbnails generation.
+
+    The code below heavily repeats
+    audio.processing.CommonAudioProcessor.create_spectrogram
+    1. Create test audio
+    2. Convert it to OGG source for spectogram using transcoder
+    3. Create spectogram in jpg
+
+    '''
+    thumbnailer = AudioThumbnailer()
+    transcoder = AudioTranscoder()
+    with create_data_for_test() as (audio_name, new_name):
+        transcoder.transcode(audio_name, new_name, mux_name='oggmux')
+        thumbnail = tempfile.NamedTemporaryFile(suffix='.jpg')
+        # fft_size below is copypasted from config_spec.ini
+        thumbnailer.spectrogram(new_name, thumbnail.name, width=100,
+                                fft_size=4096)
+        assert imghdr.what(thumbnail.name) == 'jpeg'
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index 1bbc3d01..5ce67688 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -14,10 +14,14 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import urlparse
+
 import pkg_resources
 import pytest
 
+import six
+
+import six.moves.urllib.parse as urlparse
+
 from mediagoblin import mg_globals
 from mediagoblin.db.models import User
 from mediagoblin.tests.tools import get_app, fixture_add_user
@@ -107,7 +111,7 @@ def test_register_views(test_app):
     ## Make sure user is logged in
     request = template.TEMPLATE_TEST_CONTEXT[
         'mediagoblin/user_pages/user_nonactive.html']['request']
-    assert request.session['user_id'] == unicode(new_user.id)
+    assert request.session['user_id'] == six.text_type(new_user.id)
 
     ## Make sure we get email confirmation, and try verifying
     assert len(mail.EMAIL_TEST_INBOX) == 1
@@ -115,7 +119,7 @@ def test_register_views(test_app):
     assert message['To'] == 'angrygrrl@example.org'
     email_context = template.TEMPLATE_TEST_CONTEXT[
         'mediagoblin/auth/verification_email.txt']
-    assert email_context['verification_url'] in message.get_payload(decode=True)
+    assert email_context['verification_url'].encode('ascii') in message.get_payload(decode=True)
 
     path = urlparse.urlsplit(email_context['verification_url'])[2]
     get_params = urlparse.urlsplit(email_context['verification_url'])[3]
@@ -186,7 +190,7 @@ def test_register_views(test_app):
     email_context = template.TEMPLATE_TEST_CONTEXT[
         'mediagoblin/plugins/basic_auth/fp_verification_email.txt']
     #TODO - change the name of verification_url to something forgot-password-ish
-    assert email_context['verification_url'] in message.get_payload(decode=True)
+    assert email_context['verification_url'].encode('ascii') in message.get_payload(decode=True)
 
     path = urlparse.urlsplit(email_context['verification_url'])[2]
     get_params = urlparse.urlsplit(email_context['verification_url'])[3]
@@ -229,7 +233,6 @@ def test_register_views(test_app):
     assert urlparse.urlsplit(response.location)[2] == '/'
     assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT
 
-
 def test_authentication_views(test_app):
     """
     Test logging in and logging out
@@ -305,7 +308,7 @@ def test_authentication_views(test_app):
     # Make sure user is in the session
     context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html']
     session = context['request'].session
-    assert session['user_id'] == unicode(test_user.id)
+    assert session['user_id'] == six.text_type(test_user.id)
 
     # Successful logout
     # -----------------
@@ -332,6 +335,19 @@ def test_authentication_views(test_app):
             'next' : '/u/chris/'})
     assert urlparse.urlsplit(response.location)[2] == '/u/chris/'
 
+    ## Verify that username is lowercased on login attempt
+    template.clear_test_template_context()
+    response = test_app.post(
+        '/auth/login/', {
+            'username': u'ANDREW',
+            'password': 'fuselage'})
+    context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/auth/login.html']
+    form = context['login_form']
+
+    # Username should no longer be uppercased; it should be lowercased
+    assert not form.username.data == u'ANDREW'
+    assert form.username.data == u'andrew'
+
 @pytest.fixture()
 def authentication_disabled_app(request):
     return get_app(
diff --git a/mediagoblin/tests/test_basic_auth.py b/mediagoblin/tests/test_basic_auth.py
index 828f0515..e7157bee 100644
--- a/mediagoblin/tests/test_basic_auth.py
+++ b/mediagoblin/tests/test_basic_auth.py
@@ -13,7 +13,8 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import urlparse
+
+import six.moves.urllib.parse as urlparse
 
 from mediagoblin.db.models import User
 from mediagoblin.plugins.basic_auth import tools as auth_tools
diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py
index dc9c422f..384929cb 100644
--- a/mediagoblin/tests/test_edit.py
+++ b/mediagoblin/tests/test_edit.py
@@ -14,7 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import urlparse, os, pytest
+import six
+import six.moves.urllib.parse as urlparse
+import pytest
 
 from mediagoblin import mg_globals
 from mediagoblin.db.models import User, MediaEntry
@@ -142,8 +144,7 @@ class TestUserEdit(object):
         assert message['To'] == 'new@example.com'
         email_context = template.TEMPLATE_TEST_CONTEXT[
             'mediagoblin/edit/verification.txt']
-        assert email_context['verification_url'] in \
-            message.get_payload(decode=True)
+        assert email_context['verification_url'].encode('ascii') in message.get_payload(decode=True)
 
         path = urlparse.urlsplit(email_context['verification_url'])[2]
         assert path == u'/edit/verify_email/'
@@ -250,5 +251,11 @@ class TestMetaDataEdit:
         old_metadata = new_metadata
         new_metadata = media_entry.media_metadata
         assert new_metadata == old_metadata
-        assert ("u&#39;On the worst day&#39; is not a &#39;date-time&#39;" in
-            response.body)
+        context = template.TEMPLATE_TEST_CONTEXT[
+            'mediagoblin/edit/metadata.html']
+        if six.PY2:
+            expected = "u'On the worst day' is not a 'date-time'"
+        else:
+            expected = "'On the worst day' is not a 'date-time'"
+        assert context['form'].errors[
+            'media_metadata'][0]['identifier'][0] == expected
diff --git a/mediagoblin/tests/test_exif.py b/mediagoblin/tests/test_exif.py
index af301818..e3869ec8 100644
--- a/mediagoblin/tests/test_exif.py
+++ b/mediagoblin/tests/test_exif.py
@@ -20,6 +20,8 @@ try:
 except ImportError:
     import Image
 
+from collections import OrderedDict
+
 from mediagoblin.tools.exif import exif_fix_image_orientation, \
     extract_exif, clean_exif, get_gps_data, get_useful
 from .resources import GOOD_JPG, EMPTY_JPG, BAD_JPG, GPS_JPG
@@ -39,31 +41,32 @@ def test_exif_extraction():
     gps = get_gps_data(result)
 
     # Do we have the result?
-    assert len(result) == 55
+    assert len(result) >= 50
 
     # Do we have clean data?
-    assert len(clean) == 53
+    assert len(clean) >= 50
 
     # GPS data?
     assert gps == {}
 
     # Do we have the "useful" tags?
-    assert useful == {'EXIF CVAPattern': {'field_length': 8,
+
+    expected = OrderedDict({'EXIF CVAPattern': {'field_length': 8,
                      'field_offset': 26224,
                      'field_type': 7,
-                     'printable': u'[0, 2, 0, 2, 1, 2, 0, 1]',
+                     'printable': '[0, 2, 0, 2, 1, 2, 0, 1]',
                      'tag': 41730,
                      'values': [0, 2, 0, 2, 1, 2, 0, 1]},
  'EXIF ColorSpace': {'field_length': 2,
                      'field_offset': 476,
                      'field_type': 3,
-                     'printable': u'sRGB',
+                     'printable': 'sRGB',
                      'tag': 40961,
                      'values': [1]},
  'EXIF ComponentsConfiguration': {'field_length': 4,
                                   'field_offset': 308,
                                   'field_type': 7,
-                                  'printable': u'YCbCr',
+                                  'printable': 'YCbCr',
                                   'tag': 37121,
                                   'values': [1, 2, 3, 0]},
  'EXIF CompressedBitsPerPixel': {'field_length': 8,
@@ -365,7 +368,10 @@ def test_exif_extraction():
                            'field_type': 5,
                            'printable': u'300',
                            'tag': 283,
-                           'values': [[300, 1]]}}
+                           'values': [[300, 1]]}})
+
+    for key in expected.keys():
+        assert useful[key] == expected[key]
 
 
 def test_exif_image_orientation():
@@ -379,7 +385,7 @@ def test_exif_image_orientation():
         result)
 
     # Are the dimensions correct?
-    assert image.size == (428, 640)
+    assert image.size in ((428, 640), (640, 428))
 
     # If this pixel looks right, the rest of the image probably will too.
     assert_in(image.getdata()[10000],
diff --git a/mediagoblin/tests/test_http_callback.py b/mediagoblin/tests/test_http_callback.py
deleted file mode 100644
index 64b7ee8f..00000000
--- a/mediagoblin/tests/test_http_callback.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import json
-
-import pytest
-from urlparse import urlparse, parse_qs
-
-from mediagoblin import mg_globals
-from mediagoblin.tools import processing
-from mediagoblin.tests.tools import fixture_add_user
-from mediagoblin.tests.test_submission import GOOD_PNG
-from mediagoblin.tests import test_oauth2 as oauth
-
-
-class TestHTTPCallback(object):
-    @pytest.fixture(autouse=True)
-    def setup(self, test_app):
-        self.test_app = test_app
-
-        self.db = mg_globals.database
-
-        self.user_password = u'secret'
-        self.user = fixture_add_user(u'call_back', self.user_password)
-
-        self.login()
-
-    def login(self):
-        self.test_app.post('/auth/login/', {
-            'username': self.user.username,
-            'password': self.user_password})
-
-    def get_access_token(self, client_id, client_secret, code):
-        response = self.test_app.get('/oauth-2/access_token', {
-                'code': code,
-                'client_id': client_id,
-                'client_secret': client_secret})
-
-        response_data = json.loads(response.body)
-
-        return response_data['access_token']
-
-    def test_callback(self):
-        ''' Test processing HTTP callback '''
-        self.oauth = oauth.TestOAuth()
-        self.oauth.setup(self.test_app)
-
-        redirect, client_id = self.oauth.test_4_authorize_confidential_client()
-
-        code = parse_qs(urlparse(redirect.location).query)['code'][0]
-
-        client = self.db.OAuthClient.query.filter(
-                self.db.OAuthClient.identifier == unicode(client_id)).first()
-
-        client_secret = client.secret
-
-        access_token = self.get_access_token(client_id, client_secret, code)
-
-        callback_url = 'https://foo.example?secrettestmediagoblinparam'
-
-        self.test_app.post('/api/submit?client_id={0}&access_token={1}\
-&client_secret={2}'.format(
-                    client_id,
-                    access_token,
-                    client_secret), {
-            'title': 'Test',
-            'callback_url': callback_url},
-            upload_files=[('file', GOOD_PNG)])
-
-        assert processing.TESTS_CALLBACKS[callback_url]['state'] == u'processed'
diff --git a/mediagoblin/tests/test_ldap.py b/mediagoblin/tests/test_ldap.py
index 7e20d059..f251d150 100644
--- a/mediagoblin/tests/test_ldap.py
+++ b/mediagoblin/tests/test_ldap.py
@@ -13,10 +13,16 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import urlparse
+
 import pkg_resources
 import pytest
-import mock
+import six
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
+
+import six.moves.urllib.parse as urlparse
 
 from mediagoblin import mg_globals
 from mediagoblin.db.base import Session
@@ -126,6 +132,6 @@ def test_ldap_plugin(ldap_plugin_app):
         # Make sure user is in the session
         context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html']
         session = context['request'].session
-        assert session['user_id'] == unicode(test_user.id)
+        assert session['user_id'] == six.text_type(test_user.id)
 
     _test_authentication()
diff --git a/mediagoblin/tests/test_legacy_api.py b/mediagoblin/tests/test_legacy_api.py
index 4e0cbd8f..b3b2fcec 100644
--- a/mediagoblin/tests/test_legacy_api.py
+++ b/mediagoblin/tests/test_legacy_api.py
@@ -17,6 +17,7 @@
 
 import logging
 import base64
+import json
 
 import pytest
 
@@ -48,10 +49,10 @@ class TestAPI(object):
         return template.TEMPLATE_TEST_CONTEXT[template_name]
 
     def http_auth_headers(self):
-        return {'Authorization': 'Basic {0}'.format(
-                base64.b64encode(':'.join([
+        return {'Authorization': ('Basic {0}'.format(
+                base64.b64encode((':'.join([
                     self.user.username,
-                    self.user_password])))}
+                    self.user_password])).encode('ascii')).decode()))}
 
     def do_post(self, data, test_app, **kwargs):
         url = kwargs.pop('url', '/api/submit')
@@ -77,8 +78,8 @@ class TestAPI(object):
             '/api/test',
             headers=self.http_auth_headers())
 
-        assert response.body == \
-                '{"username": "joapi", "email": "joapi@example.com"}'
+        assert json.loads(response.body.decode()) == {
+            "username": "joapi", "email": "joapi@example.com"}
 
     def test_2_test_submission(self, test_app):
         self.login(test_app)
diff --git a/mediagoblin/tests/test_metadata.py b/mediagoblin/tests/test_metadata.py
index b4ea646e..a10e00ec 100644
--- a/mediagoblin/tests/test_metadata.py
+++ b/mediagoblin/tests/test_metadata.py
@@ -56,7 +56,7 @@ class TestMetadataFunctionality:
         jsonld_fail_1 = None
         try:
             jsonld_fail_1 = compact_and_validate(metadata_fail_1)
-        except ValidationError, e:
+        except ValidationError as e:
             assert e.message == "'All Rights Reserved.' is not a 'uri'"
         assert jsonld_fail_1 == None
         #,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,
@@ -72,7 +72,7 @@ class TestMetadataFunctionality:
         jsonld_fail_2 = None
         try:
             jsonld_fail_2 = compact_and_validate(metadata_fail_2)
-        except ValidationError, e:
+        except ValidationError as e:
             assert e.message == "'The other day' is not a 'date-time'"
         assert jsonld_fail_2 == None
 
diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini
index 4cd3d9b6..6ac64321 100644
--- a/mediagoblin/tests/test_mgoblin_app.ini
+++ b/mediagoblin/tests/test_mgoblin_app.ini
@@ -31,10 +31,11 @@ BROKER_URL = "sqlite:///%(here)s/test_user_dev/kombu.db"
 
 [plugins]
 [[mediagoblin.plugins.api]]
-[[mediagoblin.plugins.oauth]]
 [[mediagoblin.plugins.httpapiauth]]
 [[mediagoblin.plugins.piwigo]]
 [[mediagoblin.plugins.basic_auth]]
 [[mediagoblin.plugins.openid]]
 [[mediagoblin.media_types.image]]
+[[mediagoblin.media_types.video]]
+[[mediagoblin.media_types.audio]]
 [[mediagoblin.media_types.pdf]]
diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py
index 32d5dce0..1ab0c476 100644
--- a/mediagoblin/tests/test_modelmethods.py
+++ b/mediagoblin/tests/test_modelmethods.py
@@ -17,13 +17,20 @@
 # Maybe not every model needs a test, but some models have special
 # methods, and so it makes sense to test them here.
 
+from __future__ import print_function
+
 from mediagoblin.db.base import Session
-from mediagoblin.db.models import MediaEntry, User, Privilege
+from mediagoblin.db.models import MediaEntry, User, Privilege, Activity, \
+                                  Generator
 
 from mediagoblin.tests import MGClientTestCase
-from mediagoblin.tests.tools import fixture_add_user
+from mediagoblin.tests.tools import fixture_add_user, fixture_media_entry, \
+                                    fixture_add_activity
 
-import mock
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 import pytest
 
 
@@ -202,7 +209,7 @@ def test_media_data_init(test_app):
     obj_in_session = 0
     for obj in Session():
         obj_in_session += 1
-        print repr(obj)
+        print(repr(obj))
     assert obj_in_session == 0
 
 
@@ -225,3 +232,55 @@ class TestUserUrlForSelf(MGClientTestCase):
             self.user(u'lindsay').url_for_self(fake_urlgen())
         assert excinfo.errisinstance(TypeError)
         assert 'object is not callable' in str(excinfo)
+
+class TestActivitySetGet(object):
+    """ Test methods on the Activity and ActivityIntermediator models """
+
+    @pytest.fixture(autouse=True)
+    def setup(self, test_app):
+        self.app = test_app
+        self.user = fixture_add_user()
+        self.obj = fixture_media_entry()
+        self.target = fixture_media_entry()
+
+    def test_set_activity_object(self):
+        """ Activity.set_object should produce ActivityIntermediator """
+        # The fixture will set self.obj as the object on the activity.
+        activity = fixture_add_activity(self.obj, actor=self.user)
+
+        # Assert the media has been associated with an AI
+        assert self.obj.activity is not None
+
+        # Assert the AI on the media and object are the same
+        assert activity.object == self.obj.activity
+
+    def test_activity_set_target(self):
+        """ Activity.set_target should produce ActivityIntermediator """
+        # This should set everything needed on the target
+        activity = fixture_add_activity(self.obj, actor=self.user)
+        activity.set_target(self.target)
+
+        # Assert the media has been associated with the AI
+        assert self.target.activity is not None
+
+        # assert the AI on the media and target are the same
+        assert activity.target == self.target.activity
+
+    def test_get_activity_object(self):
+        """ Activity.get_object should return a set object """
+        activity = fixture_add_activity(self.obj, actor=self.user)
+
+        print("self.obj.activity = {0}".format(self.obj.activity))
+
+        # check we now can get the object
+        assert activity.get_object is not None
+        assert activity.get_object.id == self.obj.id
+
+    def test_get_activity_target(self):
+        """ Activity.set_target should return a set target """
+        activity = fixture_add_activity(self.obj, actor=self.user)
+        activity.set_target(self.target)
+
+        # check we can get the target
+        assert activity.get_target is not None
+        assert activity.get_target.id == self.target.id
diff --git a/mediagoblin/tests/test_notifications.py b/mediagoblin/tests/test_notifications.py
index 3bf36f5f..385da569 100644
--- a/mediagoblin/tests/test_notifications.py
+++ b/mediagoblin/tests/test_notifications.py
@@ -16,7 +16,7 @@
 
 import pytest
 
-import urlparse
+import six.moves.urllib.parse as urlparse
 
 from mediagoblin.tools import template, mail
 
@@ -135,13 +135,13 @@ otherperson@example.com\n\nSGkgb3RoZXJwZXJzb24sCmNocmlzIGNvbW1lbnRlZCBvbiB5b3VyI
         self.logout()
         self.login('otherperson', 'nosreprehto')
 
-        self.test_app.get(media_uri_slug + '/c/{0}/'.format(comment_id))
+        self.test_app.get(media_uri_slug + 'c/{0}/'.format(comment_id))
 
         notification = Notification.query.filter_by(id=notification_id).first()
 
         assert notification.seen == True
 
-        self.test_app.get(media_uri_slug + '/notifications/silence/')
+        self.test_app.get(media_uri_slug + 'notifications/silence/')
 
         subscription = CommentSubscription.query.filter_by(id=subscription_id)\
                 .first()
diff --git a/mediagoblin/tests/test_oauth1.py b/mediagoblin/tests/test_oauth1.py
index 568036e5..e41a68c7 100644
--- a/mediagoblin/tests/test_oauth1.py
+++ b/mediagoblin/tests/test_oauth1.py
@@ -14,10 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import cgi
-
 import pytest
-from urlparse import parse_qs, urlparse
+
+from six.moves.urllib.parse import parse_qs, urlparse
 
 from oauthlib.oauth1 import Client
 
@@ -73,7 +72,7 @@ class TestOAuth(object):
                 "application_name": "Testificate MD",
                 "application_type": "web",
                 "contacts": "someone@someplace.com tuteo@tsengeo.lu",
-                "logo_url": "http://ayrel.com/utral.png",
+                "logo_uri": "http://ayrel.com/utral.png",
                 "redirect_uris": "http://navi-kosman.lu http://gmg-yawne-oeru.lu",
                 }
 
@@ -86,7 +85,7 @@ class TestOAuth(object):
         assert client.secret == client_info["client_secret"]
         assert client.application_type == query["application_type"]
         assert client.redirect_uri == query["redirect_uris"].split()
-        assert client.logo_url == query["logo_url"]
+        assert client.logo_url == query["logo_uri"]
         assert client.contacts == query["contacts"].split()
 
 
@@ -103,7 +102,7 @@ class TestOAuth(object):
                 "type": "client_update",
                 "application_name": "neytiri",
                 "contacts": "someone@someplace.com abc@cba.com",
-                "logo_url": "http://place.com/picture.png",
+                "logo_uri": "http://place.com/picture.png",
                 "application_type": "web",
                 "redirect_uris": "http://blah.gmg/whatever https://inboxen.org/",
                 }
@@ -118,7 +117,7 @@ class TestOAuth(object):
         assert client.application_type == update_query["application_type"]
         assert client.application_name == update_query["application_name"]
         assert client.contacts == update_query["contacts"].split()
-        assert client.logo_url == update_query["logo_url"]
+        assert client.logo_url == update_query["logo_uri"]
         assert client.redirect_uri == update_query["redirect_uris"].split()
 
     def to_authorize_headers(self, data):
@@ -146,7 +145,7 @@ class TestOAuth(object):
         headers["Content-Type"] = self.MIME_FORM
 
         response = self.test_app.post(endpoint, headers=headers)
-        response = cgi.parse_qs(response.body)
+        response = parse_qs(response.body.decode())
 
         # each element is a list, reduce it to a string
         for key, value in response.items():
diff --git a/mediagoblin/tests/test_oauth2.py b/mediagoblin/tests/test_oauth2.py
deleted file mode 100644
index 957f4e65..00000000
--- a/mediagoblin/tests/test_oauth2.py
+++ /dev/null
@@ -1,223 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import json
-import logging
-
-import pytest
-from urlparse import parse_qs, urlparse
-
-from mediagoblin import mg_globals
-from mediagoblin.tools import template, pluginapi
-from mediagoblin.tests.tools import fixture_add_user
-
-
-_log = logging.getLogger(__name__)
-
-
-class TestOAuth(object):
-    @pytest.fixture(autouse=True)
-    def setup(self, test_app):
-        self.test_app = test_app
-
-        self.db = mg_globals.database
-
-        self.pman = pluginapi.PluginManager()
-
-        self.user_password = u'4cc355_70k3N'
-        self.user = fixture_add_user(u'joauth', self.user_password,
-            privileges=[u'active'])
-
-        self.login()
-
-    def login(self):
-        self.test_app.post(
-            '/auth/login/', {
-                'username': self.user.username,
-                'password': self.user_password})
-
-    def register_client(self, name, client_type, description=None,
-                        redirect_uri=''):
-        return self.test_app.post(
-                '/oauth-2/client/register', {
-                    'name': name,
-                    'description': description,
-                    'type': client_type,
-                    'redirect_uri': redirect_uri})
-
-    def get_context(self, template_name):
-        return template.TEMPLATE_TEST_CONTEXT[template_name]
-
-    def test_1_public_client_registration_without_redirect_uri(self):
-        ''' Test 'public' OAuth client registration without any redirect uri '''
-        response = self.register_client(
-            u'OMGOMGOMG', 'public', 'OMGOMG Apache License v2')
-
-        ctx = self.get_context('oauth/client/register.html')
-
-        client = self.db.OAuthClient.query.filter(
-                self.db.OAuthClient.name == u'OMGOMGOMG').first()
-
-        assert response.status_int == 200
-
-        # Should display an error
-        assert len(ctx['form'].redirect_uri.errors)
-
-        # Should not pass through
-        assert not client
-
-    def test_2_successful_public_client_registration(self):
-        ''' Successfully register a public client '''
-        uri = 'http://foo.example'
-        self.register_client(
-            u'OMGOMG', 'public', 'OMG!', uri)
-
-        client = self.db.OAuthClient.query.filter(
-                self.db.OAuthClient.name == u'OMGOMG').first()
-
-        # redirect_uri should be set
-        assert client.redirect_uri == uri
-
-        # Client should have been registered
-        assert client
-
-    def test_3_successful_confidential_client_reg(self):
-        ''' Register a confidential OAuth client '''
-        response = self.register_client(
-            u'GMOGMO', 'confidential', 'NO GMO!')
-
-        assert response.status_int == 302
-
-        client = self.db.OAuthClient.query.filter(
-                self.db.OAuthClient.name == u'GMOGMO').first()
-
-        # Client should have been registered
-        assert client
-
-        return client
-
-    def test_4_authorize_confidential_client(self):
-        ''' Authorize a confidential client as a logged in user '''
-        client = self.test_3_successful_confidential_client_reg()
-
-        client_identifier = client.identifier
-
-        redirect_uri = 'https://foo.example'
-        response = self.test_app.get('/oauth-2/authorize', {
-                'client_id': client.identifier,
-                'scope': 'all',
-                'redirect_uri': redirect_uri})
-
-        # User-agent should NOT be redirected
-        assert response.status_int == 200
-
-        ctx = self.get_context('oauth/authorize.html')
-
-        form = ctx['form']
-
-        # Short for client authorization post reponse
-        capr = self.test_app.post(
-                '/oauth-2/client/authorize', {
-                    'client_id': form.client_id.data,
-                    'allow': 'Allow',
-                    'next': form.next.data})
-
-        assert capr.status_int == 302
-
-        authorization_response = capr.follow()
-
-        assert authorization_response.location.startswith(redirect_uri)
-
-        return authorization_response, client_identifier
-
-    def get_code_from_redirect_uri(self, uri):
-        ''' Get the value of ?code= from an URI '''
-        return parse_qs(urlparse(uri).query)['code'][0]
-
-    def test_token_endpoint_successful_confidential_request(self):
-        ''' Successful request against token endpoint '''
-        code_redirect, client_id = self.test_4_authorize_confidential_client()
-
-        code = self.get_code_from_redirect_uri(code_redirect.location)
-
-        client = self.db.OAuthClient.query.filter(
-                self.db.OAuthClient.identifier == unicode(client_id)).first()
-
-        token_res = self.test_app.get('/oauth-2/access_token?client_id={0}&\
-code={1}&client_secret={2}'.format(client_id, code, client.secret))
-
-        assert token_res.status_int == 200
-
-        token_data = json.loads(token_res.body)
-
-        assert not 'error' in token_data
-        assert 'access_token' in token_data
-        assert 'token_type' in token_data
-        assert 'expires_in' in token_data
-        assert type(token_data['expires_in']) == int
-        assert token_data['expires_in'] > 0
-
-        # There should be a refresh token provided in the token data
-        assert len(token_data['refresh_token'])
-
-        return client_id, token_data
-
-    def test_token_endpont_missing_id_confidential_request(self):
-        ''' Unsuccessful request against token endpoint, missing client_id '''
-        code_redirect, client_id = self.test_4_authorize_confidential_client()
-
-        code = self.get_code_from_redirect_uri(code_redirect.location)
-
-        client = self.db.OAuthClient.query.filter(
-                self.db.OAuthClient.identifier == unicode(client_id)).first()
-
-        token_res = self.test_app.get('/oauth-2/access_token?\
-code={0}&client_secret={1}'.format(code, client.secret))
-
-        assert token_res.status_int == 200
-
-        token_data = json.loads(token_res.body)
-
-        assert 'error' in token_data
-        assert not 'access_token' in token_data
-        assert token_data['error'] == 'invalid_request'
-        assert len(token_data['error_description'])
-
-    def test_refresh_token(self):
-        ''' Try to get a new access token using the refresh token '''
-        # Get an access token and a refresh token
-        client_id, token_data =\
-            self.test_token_endpoint_successful_confidential_request()
-
-        client = self.db.OAuthClient.query.filter(
-            self.db.OAuthClient.identifier == client_id).first()
-
-        token_res = self.test_app.get('/oauth-2/access_token',
-                     {'refresh_token': token_data['refresh_token'],
-                      'client_id': client_id,
-                      'client_secret': client.secret
-                      })
-
-        assert token_res.status_int == 200
-
-        new_token_data = json.loads(token_res.body)
-
-        assert not 'error' in new_token_data
-        assert 'access_token' in new_token_data
-        assert 'token_type' in new_token_data
-        assert 'expires_in' in new_token_data
-        assert type(new_token_data['expires_in']) == int
-        assert new_token_data['expires_in'] > 0
diff --git a/mediagoblin/tests/test_openid.py b/mediagoblin/tests/test_openid.py
index 0424fdda..a3ab176a 100644
--- a/mediagoblin/tests/test_openid.py
+++ b/mediagoblin/tests/test_openid.py
@@ -14,10 +14,14 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import urlparse
 import pkg_resources
 import pytest
-import mock
+import six
+import six.moves.urllib.parse as urlparse
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 
 openid_consumer = pytest.importorskip(
     "openid.consumer.consumer")
@@ -206,7 +210,7 @@ class TestOpenIDPlugin(object):
             # Make sure user is in the session
             context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html']
             session = context['request'].session
-            assert session['user_id'] == unicode(test_user.id)
+            assert session['user_id'] == six.text_type(test_user.id)
 
         _test_new_user()
 
diff --git a/mediagoblin/tests/test_paste.ini b/mediagoblin/tests/test_paste.ini
index a9595432..8d75c3cb 100644
--- a/mediagoblin/tests/test_paste.ini
+++ b/mediagoblin/tests/test_paste.ini
@@ -1,40 +1,18 @@
 [DEFAULT]
 debug = true
 
-[composite:main]
-use = egg:Paste#urlmap
-/ = mediagoblin
-/mgoblin_media/ = publicstore_serve
-/test_static/ = mediagoblin_static
-/theme_static/ = theme_static
-/plugin_static/ = plugin_static
-
-[app:mediagoblin]
+[app:main]
 use = egg:mediagoblin#app
 config = %(here)s/mediagoblin.ini
-
-[app:publicstore_serve]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/media/public
-
-[app:mediagoblin_static]
-use = egg:Paste#static
-document_root = %(here)s/mediagoblin/static/
-
-[app:theme_static]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/theme_static/
-cache_max_age = 86400
-
-[app:plugin_static]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/plugin_static/
-cache_max_age = 86400
+/mgoblin_media = %(here)s/user_dev/media/public
+/test_static = %(here)s/mediagoblin/static
+/theme_static = %(here)s/user_dev/theme_static
+/plugin_static = %(here)s/user_dev/plugin_static
 
 [celery]
 CELERY_ALWAYS_EAGER = true
 
 [server:main]
-use = egg:Paste#http
+use = egg:gunicorn
 host = 127.0.0.1
 port = 6543
diff --git a/mediagoblin/tests/test_pdf.py b/mediagoblin/tests/test_pdf.py
index b4d1940a..7107dc9a 100644
--- a/mediagoblin/tests/test_pdf.py
+++ b/mediagoblin/tests/test_pdf.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import collections
 import tempfile
 import shutil
 import os
@@ -21,19 +22,25 @@ import pytest
 
 from mediagoblin.media_types.pdf.processing import (
     pdf_info, check_prerequisites, create_pdf_thumb)
-from .resources import GOOD_PDF as GOOD
+from .resources import GOOD_PDF
 
 
-@pytest.mark.skipif("not check_prerequisites()")
+@pytest.mark.skipif("not os.path.exists(GOOD_PDF) or not check_prerequisites()")
 def test_pdf():
-    good_dict = {'pdf_version_major': 1, 'pdf_title': '',
-        'pdf_page_size_width': 612, 'pdf_author': '',
-        'pdf_keywords': '', 'pdf_pages': 10,
-        'pdf_producer': 'dvips + GNU Ghostscript 7.05',
-        'pdf_version_minor': 3,
-        'pdf_creator': 'LaTeX with hyperref package',
-        'pdf_page_size_height': 792}
-    assert pdf_info(GOOD) == good_dict
+    expected_dict = {'pdf_author': -1,
+                     'pdf_creator': -1,
+                     'pdf_keywords': -1,
+                     'pdf_page_size_height': -1,
+                     'pdf_page_size_width': -1,
+                     'pdf_pages': -1,
+                     'pdf_producer': -1,
+                     'pdf_title': -1,
+                     'pdf_version_major': 1,
+                     'pdf_version_minor': -1}
+    good_info = pdf_info(GOOD_PDF)
+    for k, v in expected_dict.items():
+        assert(k in good_info)
+        assert(v == -1 or v == good_info[k])
     temp_dir = tempfile.mkdtemp()
-    create_pdf_thumb(GOOD, os.path.join(temp_dir, 'good_256_256.png'), 256, 256)
+    create_pdf_thumb(GOOD_PDF, os.path.join(temp_dir, 'good_256_256.png'), 256, 256)
     shutil.rmtree(temp_dir)
diff --git a/mediagoblin/tests/test_persona.py b/mediagoblin/tests/test_persona.py
index a1cd30eb..a8466b8a 100644
--- a/mediagoblin/tests/test_persona.py
+++ b/mediagoblin/tests/test_persona.py
@@ -13,10 +13,16 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-import urlparse
+
 import pkg_resources
 import pytest
-import mock
+import six
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
+
+import six.moves.urllib.parse as urlparse
 
 pytest.importorskip("requests")
 
@@ -140,7 +146,7 @@ class TestPersonaPlugin(object):
             # Make sure user is in the session
             context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html']
             session = context['request'].session
-            assert session['user_id'] == unicode(test_user.id)
+            assert session['user_id'] == six.text_type(test_user.id)
 
         _test_registration()
 
diff --git a/mediagoblin/tests/test_piwigo.py b/mediagoblin/tests/test_piwigo.py
index 16ad0111..33aea580 100644
--- a/mediagoblin/tests/test_piwigo.py
+++ b/mediagoblin/tests/test_piwigo.py
@@ -44,28 +44,23 @@ class Test_PWG(object):
     def test_session(self):
         resp = self.do_post("pwg.session.login",
             {"username": u"nouser", "password": "wrong"})
-        assert resp.body == XML_PREFIX \
-            + '<rsp stat="fail"><err code="999" msg="Invalid username/password"/></rsp>'
+        assert resp.body == (XML_PREFIX + '<rsp stat="fail"><err code="999" msg="Invalid username/password"/></rsp>').encode('ascii')
 
         resp = self.do_post("pwg.session.login",
             {"username": self.username, "password": "wrong"})
-        assert resp.body == XML_PREFIX \
-            + '<rsp stat="fail"><err code="999" msg="Invalid username/password"/></rsp>'
+        assert resp.body == (XML_PREFIX + '<rsp stat="fail"><err code="999" msg="Invalid username/password"/></rsp>').encode('ascii')
 
         resp = self.do_get("pwg.session.getStatus")
-        assert resp.body == XML_PREFIX \
-            + '<rsp stat="ok"><username>guest</username></rsp>'
+        assert resp.body == (XML_PREFIX + '<rsp stat="ok"><username>guest</username></rsp>').encode('ascii')
 
         resp = self.do_post("pwg.session.login",
             {"username": self.username, "password": self.password})
-        assert resp.body == XML_PREFIX + '<rsp stat="ok">1</rsp>'
+        assert resp.body == (XML_PREFIX + '<rsp stat="ok">1</rsp>').encode('ascii')
 
         resp = self.do_get("pwg.session.getStatus")
-        assert resp.body == XML_PREFIX \
-            + '<rsp stat="ok"><username>chris</username></rsp>'
+        assert resp.body == (XML_PREFIX + '<rsp stat="ok"><username>chris</username></rsp>').encode('ascii')
 
         self.do_get("pwg.session.logout")
 
         resp = self.do_get("pwg.session.getStatus")
-        assert resp.body == XML_PREFIX \
-            + '<rsp stat="ok"><username>guest</username></rsp>'
+        assert resp.body == (XML_PREFIX + '<rsp stat="ok"><username>guest</username></rsp>').encode('ascii')
diff --git a/mediagoblin/tests/test_pluginapi.py b/mediagoblin/tests/test_pluginapi.py
index eae0ce15..2fd6df39 100644
--- a/mediagoblin/tests/test_pluginapi.py
+++ b/mediagoblin/tests/test_pluginapi.py
@@ -224,7 +224,7 @@ def test_hook_handle():
     assert pluginapi.hook_handle(
         "nothing_handling", call_log, unhandled_okay=True) is None
     assert call_log == []
-    
+
     # Multiple provided, go with the first!
     call_log = []
     assert pluginapi.hook_handle(
@@ -348,7 +348,7 @@ def test_modify_context(context_modified_app):
     """
     # Specific thing passed into a page
     result = context_modified_app.get("/modify_context/specific/")
-    assert result.body.strip() == """Specific page!
+    assert result.body.strip() == b"""Specific page!
 
 specific thing: in yer specificpage
 global thing: globally appended!
@@ -357,7 +357,7 @@ doubleme: happyhappy"""
 
     # General test, should have global context variable only
     result = context_modified_app.get("/modify_context/")
-    assert result.body.strip() == """General page!
+    assert result.body.strip() == b"""General page!
 
 global thing: globally appended!
 lol: cats
@@ -421,7 +421,7 @@ def test_plugin_assetlink(static_plugin_app):
     junk_file_path = os.path.join(
         linked_assets_dir.rstrip(os.path.sep),
         'junk.txt')
-    with file(junk_file_path, 'w') as junk_file:
+    with open(junk_file_path, 'w') as junk_file:
         junk_file.write('barf')
 
     os.unlink(plugin_link_dir)
@@ -440,14 +440,14 @@ to:
 
     # link dir exists, but is a non-symlink
     os.unlink(plugin_link_dir)
-    with file(plugin_link_dir, 'w') as clobber_file:
+    with open(plugin_link_dir, 'w') as clobber_file:
         clobber_file.write('clobbered!')
 
     result = run_assetlink().collection[0]
     assert result == 'Could not link "staticstuff": %s exists and is not a symlink\n' % (
         plugin_link_dir)
 
-    with file(plugin_link_dir, 'r') as clobber_file:
+    with open(plugin_link_dir, 'r') as clobber_file:
         assert clobber_file.read() == 'clobbered!'
 
 
@@ -456,11 +456,10 @@ def test_plugin_staticdirect(static_plugin_app):
     Test that the staticdirect utilities pull up the right things
     """
     result = json.loads(
-        static_plugin_app.get('/staticstuff/').body)
+        static_plugin_app.get('/staticstuff/').body.decode())
 
     assert len(result) == 2
 
     assert result['mgoblin_bunny_pic'] == '/test_static/images/bunny_pic.png'
     assert result['plugin_bunny_css'] == \
         '/plugin_static/staticstuff/css/bunnify.css'
-
diff --git a/mediagoblin/tests/test_privileges.py b/mediagoblin/tests/test_privileges.py
index 05829b34..8ea3d754 100644
--- a/mediagoblin/tests/test_privileges.py
+++ b/mediagoblin/tests/test_privileges.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
 import pytest
 from datetime import date, timedelta
 from webtest import AppError
@@ -79,7 +80,7 @@ class TestPrivilegeFunctionality:
 
         response = self.test_app.get('/')
         assert response.status == "200 OK"
-        assert "You are Banned" in response.body
+        assert b"You are Banned" in response.body
         # Then test what happens when that ban has an expiration date which
         # hasn't happened yet
         #----------------------------------------------------------------------
@@ -92,7 +93,7 @@ class TestPrivilegeFunctionality:
 
         response = self.test_app.get('/')
         assert response.status == "200 OK"
-        assert "You are Banned" in response.body
+        assert b"You are Banned" in response.body
 
         # Then test what happens when that ban has an expiration date which
         # has already happened
@@ -107,7 +108,7 @@ class TestPrivilegeFunctionality:
 
         response = self.test_app.get('/')
         assert response.status == "302 FOUND"
-        assert not "You are Banned" in response.body
+        assert not b"You are Banned" in response.body
 
     def testVariousPrivileges(self):
         # The various actions that require privileges (ex. reporting,
@@ -127,14 +128,16 @@ class TestPrivilegeFunctionality:
         #----------------------------------------------------------------------
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get('/submit/')
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
 
         with pytest.raises(AppError) as excinfo:
             response = self.do_post({'upload_files':[('file',GOOD_JPG)],
                 'title':u'Normal Upload 1'},
                 url='/submit/')
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         # Test that a user cannot comment without the commenter privilege
         #----------------------------------------------------------------------
@@ -149,50 +152,58 @@ class TestPrivilegeFunctionality:
         media_uri_slug = '/u/{0}/m/{1}/'.format(self.admin_user.username,
                                                 media_entry.slug)
         response = self.test_app.get(media_uri_slug)
-        assert not "Add a comment" in response.body
+        assert not b"Add a comment" in response.body
 
         self.query_for_users()
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.post(
                 media_uri_id + 'comment/add/',
                 {'comment_content': u'Test comment #42'})
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         # Test that a user cannot report without the reporter privilege
         #----------------------------------------------------------------------
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get(media_uri_slug+"report/")
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
             response = self.do_post(
                 {'report_reason':u'Testing Reports #1',
                 'reporter_id':u'3'},
                 url=(media_uri_slug+"report/"))
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         # Test that a user cannot access the moderation pages w/o moderator
         # or admin privileges
         #----------------------------------------------------------------------
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/users/")
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/reports/")
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/media/")
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/users/1/")
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         with pytest.raises(AppError) as excinfo:
             response = self.test_app.get("/mod/reports/1/")
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
 
         self.query_for_users()
 
@@ -202,4 +213,5 @@ class TestPrivilegeFunctionality:
                 'targeted_user':self.admin_user.id},
                 url='/mod/reports/1/')
             self.query_for_users()
-        assert 'Bad response: 403 FORBIDDEN' in str(excinfo)
+        excinfo = str(excinfo) if six.PY2 else str(excinfo).encode('ascii')
+        assert b'Bad response: 403 FORBIDDEN' in excinfo
diff --git a/mediagoblin/tests/test_reporting.py b/mediagoblin/tests/test_reporting.py
index a154a061..6a9fe205 100644
--- a/mediagoblin/tests/test_reporting.py
+++ b/mediagoblin/tests/test_reporting.py
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
+import six
 
 from mediagoblin.tools import template
 from mediagoblin.tests.tools import (fixture_add_user, fixture_media_entry,
@@ -75,7 +76,7 @@ class TestReportFiling:
 
         response, context = self.do_post(
             {'report_reason':u'Testing Media Report',
-            'reporter_id':unicode(allie_id)},url= media_uri_slug + "report/")
+            'reporter_id':six.text_type(allie_id)},url= media_uri_slug + "report/")
 
         assert response.status == "302 FOUND"
 
@@ -110,7 +111,7 @@ class TestReportFiling:
 
         response, context = self.do_post({
             'report_reason':u'Testing Comment Report',
-            'reporter_id':unicode(allie_id)},url= comment_uri_slug + "report/")
+            'reporter_id':six.text_type(allie_id)},url= comment_uri_slug + "report/")
 
         assert response.status == "302 FOUND"
 
diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py
index 3d67fdf6..7e0569ad 100644
--- a/mediagoblin/tests/test_sql_migrations.py
+++ b/mediagoblin/tests/test_sql_migrations.py
@@ -14,6 +14,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
+import pytest
+
+pytestmark = pytest.mark.skipif(six.PY3, reason='needs sqlalchemy.migrate')
+
 import copy
 
 from sqlalchemy import (
@@ -23,7 +28,8 @@ from sqlalchemy import (
 from sqlalchemy.orm import sessionmaker, relationship
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.sql import select, insert
-from migrate import changeset
+if six.PY2:
+    from migrate import changeset
 
 from mediagoblin.db.base import GMGTableBase
 from mediagoblin.db.migration_tools import MigrationManager, RegisterMigration
@@ -190,7 +196,7 @@ def level_exits_new_table(db_conn):
 
     for level in result:
 
-        for exit_name, to_level in level['exits'].iteritems():
+        for exit_name, to_level in six.iteritems(level['exits']):
             # Insert the level exit
             db_conn.execute(
                 level_exits.insert().values(
diff --git a/mediagoblin/tests/test_storage.py b/mediagoblin/tests/test_storage.py
index f6f1d18f..5cb1672b 100644
--- a/mediagoblin/tests/test_storage.py
+++ b/mediagoblin/tests/test_storage.py
@@ -19,6 +19,8 @@ import os
 import tempfile
 
 import pytest
+import six
+
 from werkzeug.utils import secure_filename
 
 from mediagoblin import storage
@@ -45,7 +47,7 @@ def test_clean_listy_filepath():
         storage.clean_listy_filepath(['../../', 'linooks.jpg'])
 
 
-class FakeStorageSystem():
+class FakeStorageSystem(object):
     def __init__(self, foobie, blech, **kwargs):
         self.foobie = foobie
         self.blech = blech
@@ -78,8 +80,8 @@ def test_storage_system_from_config():
              'mediagoblin.tests.test_storage:FakeStorageSystem'})
     assert this_storage.foobie == 'eiboof'
     assert this_storage.blech == 'hcelb'
-    assert unicode(this_storage.__class__) == \
-        u'mediagoblin.tests.test_storage.FakeStorageSystem'
+    assert six.text_type(this_storage.__class__) == \
+        u"<class 'mediagoblin.tests.test_storage.FakeStorageSystem'>"
 
 
 ##########################
@@ -172,7 +174,7 @@ def test_basic_storage_get_file():
     with this_storage.get_file(filepath, 'r') as our_file:
         assert our_file.read() == 'First file'
     assert os.path.exists(os.path.join(tmpdir, 'dir1/dir2/ourfile.txt'))
-    with file(os.path.join(tmpdir, 'dir1/dir2/ourfile.txt'), 'r') as our_file:
+    with open(os.path.join(tmpdir, 'dir1/dir2/ourfile.txt'), 'r') as our_file:
         assert our_file.read() == 'First file'
 
     # Write to the same path but try to get a unique file.
@@ -184,13 +186,13 @@ def test_basic_storage_get_file():
     with this_storage.get_file(new_filepath, 'r') as our_file:
         assert our_file.read() == 'Second file'
     assert os.path.exists(os.path.join(tmpdir, *new_filepath))
-    with file(os.path.join(tmpdir, *new_filepath), 'r') as our_file:
+    with open(os.path.join(tmpdir, *new_filepath), 'r') as our_file:
         assert our_file.read() == 'Second file'
 
     # Read from an existing file
     manually_written_file = os.makedirs(
         os.path.join(tmpdir, 'testydir'))
-    with file(os.path.join(tmpdir, 'testydir/testyfile.txt'), 'w') as testyfile:
+    with open(os.path.join(tmpdir, 'testydir/testyfile.txt'), 'w') as testyfile:
         testyfile.write('testy file!  so testy.')
 
     with this_storage.get_file(['testydir', 'testyfile.txt']) as testyfile:
@@ -286,7 +288,7 @@ def test_basic_storage_copy_locally():
     this_storage.copy_locally(filepath, new_file_dest)
     this_storage.delete_file(filepath)
     
-    assert file(new_file_dest).read() == 'Testing this file'
+    assert open(new_file_dest).read() == 'Testing this file'
 
     os.remove(new_file_dest)
     os.rmdir(dest_tmpdir)
@@ -295,7 +297,7 @@ def test_basic_storage_copy_locally():
 
 def _test_copy_local_to_storage_works(tmpdir, this_storage):
     local_filename = tempfile.mktemp()
-    with file(local_filename, 'w') as tmpfile:
+    with open(local_filename, 'w') as tmpfile:
         tmpfile.write('haha')
 
     this_storage.copy_local_to_storage(
@@ -303,7 +305,7 @@ def _test_copy_local_to_storage_works(tmpdir, this_storage):
 
     os.remove(local_filename)
 
-    assert file(
+    assert open(
         os.path.join(tmpdir, 'dir1/dir2/copiedto.txt'),
         'r').read() == 'haha'
 
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index b5b13ed3..65c4b3a3 100644
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -14,15 +14,26 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
-reload(sys)
-sys.setdefaultencoding('utf-8')
+import six
+
+if six.PY2:  # this hack only work in Python 2
+    import sys
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
 
-import urlparse
 import os
 import pytest
 
+import six.moves.urllib.parse as urlparse
+
+# this gst initialization stuff is really required here
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import Gst
+Gst.init(None)
+
 from mediagoblin.tests.tools import fixture_add_user
+from .media_tools import create_av
 from mediagoblin import mg_globals
 from mediagoblin.db.models import MediaEntry, User
 from mediagoblin.db.base import Session
@@ -34,7 +45,7 @@ from .resources import GOOD_JPG, GOOD_PNG, EVIL_FILE, EVIL_JPG, EVIL_PNG, \
     BIG_BLUE, GOOD_PDF, GPS_JPG, MED_PNG, BIG_PNG
 
 GOOD_TAG_STRING = u'yin,yang'
-BAD_TAG_STRING = unicode('rage,' + 'f' * 26 + 'u' * 26)
+BAD_TAG_STRING = six.text_type('rage,' + 'f' * 26 + 'u' * 26)
 
 FORM_CONTEXT = ['mediagoblin/submit/start.html', 'submit_form']
 REQUEST_CONTEXT = ['mediagoblin/user_pages/user.html', 'request']
@@ -145,7 +156,7 @@ class TestSubmission:
     def test_normal_png(self):
         self.check_normal_upload(u'Normal upload 2', GOOD_PNG)
 
-    @pytest.mark.skipif("not pdf_check_prerequisites()")
+    @pytest.mark.skipif("not os.path.exists(GOOD_PDF) or not pdf_check_prerequisites()")
     def test_normal_pdf(self):
         response, context = self.do_post({'title': u'Normal upload 3 (pdf)'},
                                          do_follow=True,
@@ -359,7 +370,19 @@ class TestSubmission:
     def test_media_data(self):
         self.check_normal_upload(u"With GPS data", GPS_JPG)
         media = self.check_media(None, {"title": u"With GPS data"}, 1)
-        assert media.media_data.gps_latitude == 59.336666666666666
+        assert media.get_location.position["latitude"] == 59.336666666666666
+
+    def test_audio(self):
+        with create_av(make_audio=True) as path:
+            self.check_normal_upload('Audio', path)
+
+    def test_video(self):
+        with create_av(make_video=True) as path:
+            self.check_normal_upload('Video', path)
+
+    def test_audio_and_video(self):
+        with create_av(make_audio=True, make_video=True) as path:
+            self.check_normal_upload('Audio and Video', path)
 
     def test_processing(self):
         public_store_dir = mg_globals.global_config[
diff --git a/mediagoblin/tests/test_submission/good.pdf b/mediagoblin/tests/test_submission/good.pdf
index ab5db006..d7029f36 100644..120000
--- a/mediagoblin/tests/test_submission/good.pdf
+++ b/mediagoblin/tests/test_submission/good.pdf
diff --git a/mediagoblin/tests/test_timesince.py b/mediagoblin/tests/test_timesince.py
index 6579eb09..99ae31da 100644
--- a/mediagoblin/tests/test_timesince.py
+++ b/mediagoblin/tests/test_timesince.py
@@ -16,7 +16,7 @@
 
 from datetime import datetime, timedelta
 
-from mediagoblin.tools.timesince import is_aware, timesince
+from mediagoblin.tools.timesince import timesince
 
 
 def test_timesince():
diff --git a/mediagoblin/tests/test_util.py b/mediagoblin/tests/test_util.py
index 36563e75..8193233f 100644
--- a/mediagoblin/tests/test_util.py
+++ b/mediagoblin/tests/test_util.py
@@ -14,12 +14,17 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import mock
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
 import email
 import pytest
 import smtplib
 import pkg_resources
 
+import six
+
 from mediagoblin.tests.tools import get_app
 from mediagoblin.tools import common, url, translate, mail, text, testing
 
@@ -57,7 +62,7 @@ I hope you like unit tests JUST AS MUCH AS I DO!""")
     assert message['From'] == "sender@mediagoblin.example.org"
     assert message['To'] == "amanda@example.org, akila@example.org"
     assert message['Subject'] == "Testing is so much fun!"
-    assert message.get_payload(decode=True) == """HAYYY GUYS!
+    assert message.get_payload(decode=True) == b"""HAYYY GUYS!
 
 I hope you like unit tests JUST AS MUCH AS I DO!"""
 
@@ -70,7 +75,7 @@ I hope you like unit tests JUST AS MUCH AS I DO!"""
     assert mbox_message['From'] == "sender@mediagoblin.example.org"
     assert mbox_message['To'] == "amanda@example.org, akila@example.org"
     assert mbox_message['Subject'] == "Testing is so much fun!"
-    assert mbox_message.get_payload(decode=True) == """HAYYY GUYS!
+    assert mbox_message.get_payload(decode=True) == b"""HAYYY GUYS!
 
 I hope you like unit tests JUST AS MUCH AS I DO!"""
 
@@ -144,13 +149,13 @@ def test_gettext_lazy_proxy():
     orig = u"Password"
 
     set_thread_locale("es")
-    p1 = unicode(proxy)
+    p1 = six.text_type(proxy)
     p1_should = pass_to_ugettext(orig)
     assert p1_should != orig, "Test useless, string not translated"
     assert p1 == p1_should
 
     set_thread_locale("sv")
-    p2 = unicode(proxy)
+    p2 = six.text_type(proxy)
     p2_should = pass_to_ugettext(orig)
     assert p2_should != orig, "Test broken, string not translated"
     assert p2 == p2_should
diff --git a/mediagoblin/tests/test_video.py b/mediagoblin/tests/test_video.py
new file mode 100644
index 00000000..79244515
--- /dev/null
+++ b/mediagoblin/tests/test_video.py
@@ -0,0 +1,132 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2013 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import tempfile
+import os
+from contextlib import contextmanager
+import imghdr
+
+#os.environ['GST_DEBUG'] = '4,python:4'
+import pytest
+pytest.importorskip("gi.repository.Gst")
+
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import Gst
+Gst.init(None)
+
+from mediagoblin.media_types.video.transcoders import (capture_thumb,
+        VideoTranscoder)
+from mediagoblin.media_types.tools import discover
+
+@contextmanager
+def create_data(suffix=None, make_audio=False):
+    video = tempfile.NamedTemporaryFile()
+    src = Gst.ElementFactory.make('videotestsrc', None)
+    src.set_property('num-buffers', 10)
+    videorate = Gst.ElementFactory.make('videorate', None)
+    enc = Gst.ElementFactory.make('theoraenc', None)
+    mux = Gst.ElementFactory.make('oggmux', None)
+    dst = Gst.ElementFactory.make('filesink', None)
+    dst.set_property('location', video.name)
+    pipeline = Gst.Pipeline()
+    pipeline.add(src)
+    pipeline.add(videorate)
+    pipeline.add(enc)
+    pipeline.add(mux)
+    pipeline.add(dst)
+    src.link(videorate)
+    videorate.link(enc)
+    enc.link(mux)
+    mux.link(dst)
+    if make_audio:
+        audio_src = Gst.ElementFactory.make('audiotestsrc', None)
+        audio_src.set_property('num-buffers', 10)
+        audiorate = Gst.ElementFactory.make('audiorate', None)
+        audio_enc = Gst.ElementFactory.make('vorbisenc', None)
+        pipeline.add(audio_src)
+        pipeline.add(audio_enc)
+        pipeline.add(audiorate)
+        audio_src.link(audiorate)
+        audiorate.link(audio_enc)
+        audio_enc.link(mux)
+    pipeline.set_state(Gst.State.PLAYING)
+    state = pipeline.get_state(3 * Gst.SECOND)
+    assert state[0] == Gst.StateChangeReturn.SUCCESS
+    bus = pipeline.get_bus()
+    message = bus.timed_pop_filtered(
+            3 * Gst.SECOND,
+            Gst.MessageType.ERROR | Gst.MessageType.EOS)
+    pipeline.set_state(Gst.State.NULL)
+    if suffix:
+        result = tempfile.NamedTemporaryFile(suffix=suffix)
+    else:
+        result = tempfile.NamedTemporaryFile()
+    yield (video.name, result.name)
+
+
+#TODO: this should be skipped if video plugin is not enabled
+def test_thumbnails():
+    '''
+    Test thumbnails generation.
+    1. Create a video (+audio) from gst's videotestsrc
+    2. Capture thumbnail
+    3. Everything should get removed because of temp files usage
+    '''
+    #data  create_data() as (video_name, thumbnail_name):
+    test_formats = [('.png', 'png'), ('.jpg', 'jpeg'), ('.gif', 'gif')]
+    for suffix, format in test_formats:
+        with create_data(suffix) as (video_name, thumbnail_name):
+            capture_thumb(video_name, thumbnail_name, width=40)
+            # check result file format
+            assert imghdr.what(thumbnail_name) == format
+            # TODO: check height and width
+            # FIXME: it doesn't work with small width, say, 10px. This should be
+            # fixed somehow
+    suffix, format = test_formats[0]
+    with create_data(suffix, True) as (video_name, thumbnail_name):
+        capture_thumb(video_name, thumbnail_name, width=40)
+        assert imghdr.what(thumbnail_name) == format
+    with create_data(suffix, True) as (video_name, thumbnail_name):
+        capture_thumb(video_name, thumbnail_name, width=10)  # smaller width
+        assert imghdr.what(thumbnail_name) == format
+    with create_data(suffix, True) as (video_name, thumbnail_name):
+        capture_thumb(video_name, thumbnail_name, width=100)  # bigger width
+        assert imghdr.what(thumbnail_name) == format
+
+
+def test_transcoder():
+    # test without audio
+    with create_data() as (video_name, result_name):
+        transcoder = VideoTranscoder()
+        transcoder.transcode(
+                video_name, result_name,
+                vp8_quality=8,
+                vp8_threads=0,  # autodetect
+                vorbis_quality=0.3,
+                dimensions=(640, 640))
+        assert len(discover(result_name).get_video_streams()) == 1
+    # test with audio
+    with create_data(make_audio=True) as (video_name, result_name):
+        transcoder = VideoTranscoder()
+        transcoder.transcode(
+                video_name, result_name,
+                vp8_quality=8,
+                vp8_threads=0,  # autodetect
+                vorbis_quality=0.3,
+                dimensions=(640, 640))
+        assert len(discover(result_name).get_video_streams()) == 1
+        assert len(discover(result_name).get_audio_streams()) == 1
diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index 6695618b..f3ff57ed 100644
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -50,7 +50,7 @@ class TestWorkbench(object):
         # kill a workbench
         this_workbench = self.workbench_manager.create()
         tmpfile_name = this_workbench.joinpath('temp.txt')
-        tmpfile = file(tmpfile_name, 'w')
+        tmpfile = open(tmpfile_name, 'w')
         with tmpfile:
             tmpfile.write('lollerskates')
 
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 34392bf1..dec95e83 100644
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -19,6 +19,7 @@ import os
 import pkg_resources
 import shutil
 
+import six
 
 from paste.deploy import loadapp
 from webtest import TestApp
@@ -26,7 +27,7 @@ from webtest import TestApp
 from mediagoblin import mg_globals
 from mediagoblin.db.models import User, MediaEntry, Collection, MediaComment, \
     CommentSubscription, CommentNotification, Privilege, CommentReport, Client, \
-    RequestToken, AccessToken
+    RequestToken, AccessToken, Activity, Generator
 from mediagoblin.tools import testing
 from mediagoblin.init.config import read_mediagoblin_config
 from mediagoblin.db.base import Session
@@ -144,7 +145,7 @@ def install_fixtures_simple(db, fixtures):
     """
     Very simply install fixtures in the database
     """
-    for collection_name, collection_fixtures in fixtures.iteritems():
+    for collection_name, collection_fixtures in six.iteritems(fixtures):
         collection = db[collection_name]
         for fixture in collection_fixtures:
             collection.insert(fixture)
@@ -164,7 +165,7 @@ def assert_db_meets_expected(db, expected):
              {'id': 'foo',
               'some_field': 'some_value'},]}
     """
-    for collection_name, collection_data in expected.iteritems():
+    for collection_name, collection_data in six.iteritems(expected):
         collection = db[collection_name]
         for expected_document in collection_data:
             document = collection.query.filter_by(id=expected_document['id']).first()
@@ -345,3 +346,28 @@ def fixture_add_comment_report(comment=None, reported_user=None,
     Session.expunge(comment_report)
 
     return comment_report
+
+def fixture_add_activity(obj, verb="post", target=None, generator=None, actor=None):
+    if generator is None:
+        generator = Generator(
+            name="GNU MediaGoblin",
+            object_type="service"
+        )
+        generator.save()
+
+    if actor is None:
+        actor = fixture_add_user()
+
+    activity = Activity(
+        verb=verb,
+        actor=actor.id,
+        generator=generator.id,
+    )
+
+    activity.set_object(obj)
+
+    if target is not None:
+        activity.set_target(target)
+
+    activity.save()
+    return activity
\ No newline at end of file
diff --git a/mediagoblin/themes/airy/assets/css/airy.css b/mediagoblin/themes/airy/assets/css/airy.css
index 03d2cab8..7539997e 100644
--- a/mediagoblin/themes/airy/assets/css/airy.css
+++ b/mediagoblin/themes/airy/assets/css/airy.css
@@ -1,4 +1,4 @@
-body {
+html, body {
   color: #4a4a4a;
   background-color: #F7F7F7;
 }
@@ -38,6 +38,10 @@ header {
   color: #4a4a4a;
 }
 
+#code_of_conduct_list strong {
+  color: #4a4a4a;
+}
+
 @media screen and (max-width: 940px) {
     header {
         width: 100%;
diff --git a/mediagoblin/tools/crypto.py b/mediagoblin/tools/crypto.py
index b219a484..1107e200 100644
--- a/mediagoblin/tools/crypto.py
+++ b/mediagoblin/tools/crypto.py
@@ -36,7 +36,7 @@ try:
 except AttributeError:
     getrandbits = random.getrandbits
 
-
+# TODO: This should be attached to the MediaGoblinApp
 __itsda_secret = None
 
 
@@ -51,7 +51,7 @@ def load_key(filename):
 
 def create_key(key_dir, key_filepath):
     global __itsda_secret
-    old_umask = os.umask(077)
+    old_umask = os.umask(0o77)
     key_file = None
     try:
         if not os.path.isdir(key_dir):
@@ -60,7 +60,7 @@ def create_key(key_dir, key_filepath):
         key = str(getrandbits(192))
         key_file = tempfile.NamedTemporaryFile(dir=key_dir, suffix='.bin',
                                                delete=False)
-        key_file.write(key)
+        key_file.write(key.encode('ascii'))
         key_file.flush()
         os.rename(key_file.name, key_filepath)
         key_file.close()
@@ -73,13 +73,13 @@ def create_key(key_dir, key_filepath):
     _log.info("Saved new key for It's Dangerous")
 
 
-def setup_crypto():
+def setup_crypto(app_config):
     global __itsda_secret
-    key_dir = mg_globals.app_config["crypto_path"]
+    key_dir = app_config["crypto_path"]
     key_filepath = os.path.join(key_dir, 'itsdangeroussecret.bin')
     try:
         load_key(key_filepath)
-    except IOError, error:
+    except IOError as error:
         if error.errno != errno.ENOENT:
             raise
         create_key(key_dir, key_filepath)
diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py
index 50f1aabf..ec83f43c 100644
--- a/mediagoblin/tools/exif.py
+++ b/mediagoblin/tools/exif.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
+
 from exifread import process_file
 from exifread.utils import Ratio
 
@@ -75,7 +77,7 @@ def extract_exif(filename):
     Returns EXIF tags found in file at ``filename``
     """
     try:
-        with file(filename) as image:
+        with open(filename, 'rb') as image:
             return process_file(image, details=False)
     except IOError:
         raise BadMediaFail(_('Could not read the image file.'))
@@ -94,7 +96,7 @@ def clean_exif(exif):
         'Thumbnail JPEGInterchangeFormat']
 
     return dict((key, _ifd_tag_to_dict(value)) for (key, value)
-            in exif.iteritems() if key not in disabled_tags)
+            in six.iteritems(exif) if key not in disabled_tags)
 
 
 def _ifd_tag_to_dict(tag):
@@ -110,7 +112,7 @@ def _ifd_tag_to_dict(tag):
         'field_length': tag.field_length,
         'values': None}
 
-    if isinstance(tag.printable, str):
+    if isinstance(tag.printable, six.binary_type):
         # Force it to be decoded as UTF-8 so that it'll fit into the DB
         data['printable'] = tag.printable.decode('utf8', 'replace')
 
@@ -118,7 +120,7 @@ def _ifd_tag_to_dict(tag):
         data['values'] = [_ratio_to_list(val) if isinstance(val, Ratio) else val
                 for val in tag.values]
     else:
-        if isinstance(tag.values, str):
+        if isinstance(tag.values, six.binary_type):
             # Force UTF-8, so that it fits into the DB
             data['values'] = tag.values.decode('utf8', 'replace')
         else:
@@ -132,7 +134,8 @@ def _ratio_to_list(ratio):
 
 
 def get_useful(tags):
-    return dict((key, tag) for (key, tag) in tags.iteritems())
+    from collections import OrderedDict
+    return OrderedDict((key, tag) for (key, tag) in six.iteritems(tags))
 
 
 def get_gps_data(tags):
@@ -149,7 +152,7 @@ def get_gps_data(tags):
             'latitude': tags['GPS GPSLatitude'],
             'longitude': tags['GPS GPSLongitude']}
 
-        for key, dat in dms_data.iteritems():
+        for key, dat in six.iteritems(dms_data):
             gps_data[key] = (
                 lambda v:
                     float(v[0].num) / float(v[0].den) \
diff --git a/mediagoblin/tools/federation.py b/mediagoblin/tools/federation.py
new file mode 100644
index 00000000..6c2d27da
--- /dev/null
+++ b/mediagoblin/tools/federation.py
@@ -0,0 +1,91 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2014 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from mediagoblin.db.models import Activity, Generator, User
+
+def create_generator(request):
+    """
+    This creates a Generator object based on the Client associated with the
+    OAuth credentials used. If the request has invalid OAuth credentials or
+    no OAuth credentials None is returned.
+    """
+    if not hasattr(request, "access_token"):
+        return None
+
+    client = request.access_token.get_requesttoken.get_client
+    
+    # Check if there is a generator already
+    generator = Generator.query.filter_by(
+        name=client.application_name,
+        object_type="client"
+    ).first()
+    if generator is None:
+        generator = Generator(
+            name=client.application_name,
+            object_type="client"
+        )
+        generator.save()
+
+    return generator
+    
+     
+
+def create_activity(verb, obj, actor, target=None, generator=None):
+    """
+    This will create an Activity object which for the obj if possible
+    and save it. The verb should be one of the following:
+        add, author, create, delete, dislike, favorite, follow
+        like, post, share, unfollow, unfavorite, unlike, unshare,
+        update, tag.
+
+    If none of those fit you might not want/need to create an activity for
+    the object. The list is in mediagoblin.db.models.Activity.VALID_VERBS
+    """
+    # exception when we try and generate an activity with an unknow verb
+    # could change later to allow arbitrary verbs but at the moment we'll play
+    # it safe.
+
+    if verb not in Activity.VALID_VERBS:
+        raise ValueError("A invalid verb type has been supplied.")
+
+    if generator is None:
+        # This should exist as we're creating it by the migration for Generator
+        generator = Generator.query.filter_by(name="GNU MediaGoblin").first()
+        if generator is None:
+            generator = Generator(
+                name="GNU MediaGoblin",
+                object_type="service"
+            )
+            generator.save()
+
+    activity = Activity(verb=verb)
+    activity.set_object(obj)
+
+    if target is not None:
+        activity.set_target(target)
+
+   # If they've set it override the actor from the obj.
+    activity.actor = actor.id if isinstance(actor, User) else actor
+
+    activity.generator = generator.id
+    activity.save()
+
+    # Sigh want to do this prior to save but I can't figure a way to get
+    # around relationship() not looking up object when model isn't saved.
+    if activity.generate_content():
+        activity.save()
+
+    return activity
diff --git a/mediagoblin/tools/mail.py b/mediagoblin/tools/mail.py
index ab355835..ab3e0eaa 100644
--- a/mediagoblin/tools/mail.py
+++ b/mediagoblin/tools/mail.py
@@ -14,11 +14,13 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function, unicode_literals
+
 import six
 import smtplib
 import sys
-from email.MIMEText import MIMEText
 from mediagoblin import mg_globals, messages
+from mediagoblin._compat import MIMEText
 from mediagoblin.tools import common
 
 ### ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -130,12 +132,12 @@ def send_email(from_addr, to_addrs, subject, message_body):
         EMAIL_TEST_INBOX.append(message)
 
     elif mg_globals.app_config['email_debug_mode']:
-        print u"===== Email ====="
-        print u"From address: %s" % message['From']
-        print u"To addresses: %s" % message['To']
-        print u"Subject: %s" % message['Subject']
-        print u"-- Body: --"
-        print message.get_payload(decode=True)
+        print("===== Email =====")
+        print("From address: %s" % message['From'])
+        print("To addresses: %s" % message['To'])
+        print("Subject: %s" % message['Subject'])
+        print("-- Body: --")
+        print(message.get_payload(decode=True))
 
     return mhost.sendmail(from_addr, to_addrs, message.as_string())
 
@@ -162,5 +164,5 @@ def email_debug_message(request):
     if mg_globals.app_config['email_debug_mode']:
         # DEBUG message, no need to translate
         messages.add_message(request, messages.DEBUG,
-            u"This instance is running in email debug mode. "
-            u"The email will be on the console of the server process.")
+            "This instance is running in email debug mode. "
+            "The email will be on the console of the server process.")
diff --git a/mediagoblin/tools/metadata.py b/mediagoblin/tools/metadata.py
index bfefcac9..aeb4f829 100644
--- a/mediagoblin/tools/metadata.py
+++ b/mediagoblin/tools/metadata.py
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+from io import open
 import os
 import copy
 import json
@@ -102,7 +103,7 @@ def load_resource(package, resource_path):
       os.path.sep.
     """
     filename = resource_filename(package, os.path.sep.join(resource_path))
-    return file(filename).read()
+    return open(filename, encoding="utf-8").read()
 
 def load_resource_json(package, resource_path):
     """
diff --git a/mediagoblin/tools/pagination.py b/mediagoblin/tools/pagination.py
index 855878e0..a525caf7 100644
--- a/mediagoblin/tools/pagination.py
+++ b/mediagoblin/tools/pagination.py
@@ -17,9 +17,11 @@
 import urllib
 import copy
 from math import ceil, floor
-from itertools import izip, count
+from itertools import count
 from werkzeug.datastructures import MultiDict
 
+from six.moves import zip
+
 PAGINATION_DEFAULT_PER_PAGE = 30
 
 
@@ -52,7 +54,7 @@ class Pagination(object):
         if jump_to_id:
             cursor = copy.copy(self.cursor)
 
-            for (doc, increment) in izip(cursor, count(0)):
+            for (doc, increment) in list(zip(cursor, count(0))):
                 if doc.id == jump_to_id:
                     self.page = 1 + int(floor(increment / self.per_page))
 
diff --git a/mediagoblin/tools/processing.py b/mediagoblin/tools/processing.py
index 2abe6452..26d7bb9b 100644
--- a/mediagoblin/tools/processing.py
+++ b/mediagoblin/tools/processing.py
@@ -18,8 +18,7 @@ import logging
 import json
 import traceback
 
-from urllib2 import urlopen, Request, HTTPError
-from urllib import urlencode
+from six.moves.urllib import request, parse
 
 _log = logging.getLogger(__name__)
 
@@ -37,10 +36,10 @@ def create_post_request(url, data, **kw):
         data_parser: The parser function that is used to parse the `data`
             argument
     '''
-    data_parser = kw.get('data_parser', urlencode)
+    data_parser = kw.get('data_parser', parse.urlencode)
     headers = kw.get('headers', {})
 
-    return Request(url, data_parser(data), headers=headers)
+    return request.Request(url, data_parser(data), headers=headers)
 
 
 def json_processing_callback(entry):
@@ -48,12 +47,12 @@ def json_processing_callback(entry):
     Send an HTTP post to the registered callback url, if any.
     '''
     if not entry.processing_metadata:
-        _log.debug('No processing callback for {0}'.format(entry))
+        _log.debug('No processing callback URL for {0}'.format(entry))
         return
 
     url = entry.processing_metadata[0].callback_url
 
-    _log.debug('Sending processing callback for {0} ({1})'.format(
+    _log.debug('Sending processing callback for {0} to {1}'.format(
         entry,
         url))
 
@@ -76,11 +75,11 @@ def json_processing_callback(entry):
             data_parser=json.dumps)
 
     try:
-        urlopen(request)
+        request.urlopen(request)
         _log.debug('Processing callback for {0} sent'.format(entry))
 
         return True
-    except HTTPError:
+    except request.HTTPError:
         _log.error('Failed to send callback: {0}'.format(
             traceback.format_exc()))
 
diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py
index 88270265..889938a8 100644
--- a/mediagoblin/tools/response.py
+++ b/mediagoblin/tools/response.py
@@ -16,6 +16,7 @@
 
 import json
 
+import six
 import werkzeug.utils
 from werkzeug.wrappers import Response as wz_Response
 from mediagoblin.tools.template import render_template
@@ -153,7 +154,7 @@ def json_response(serializable, _disable_cors=False, *args, **kw):
                 'Access-Control-Allow-Origin': '*',
                 'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
                 'Access-Control-Allow-Headers': 'Content-Type, X-Requested-With'}
-        for key, value in cors_headers.iteritems():
+        for key, value in six.iteritems(cors_headers):
             response.headers.set(key, value)
 
     return response
diff --git a/mediagoblin/tools/routing.py b/mediagoblin/tools/routing.py
index a15795fe..ae7c7154 100644
--- a/mediagoblin/tools/routing.py
+++ b/mediagoblin/tools/routing.py
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+import urlparse
 
 import six
 from werkzeug.routing import Map, Rule
@@ -27,15 +28,22 @@ url_map = Map()
 
 
 class MGRoute(Rule):
-    def __init__(self, endpoint, url, controller):
+    def __init__(self, endpoint, url, controller, match_slash=True):
         Rule.__init__(self, url, endpoint=endpoint)
         self.gmg_controller = controller
+        self.match_slash = match_slash
 
     def empty(self):
         new_rule = Rule.empty(self)
         new_rule.gmg_controller = self.gmg_controller
         return new_rule
 
+    def match(self, path, *args, **kwargs):
+        if not (self.match_slash or path.endswith("/")):
+            path = path + "/"
+
+        return super(MGRoute, self).match(path, *args, **kwargs)
+
 
 def endpoint_to_controller(rule):
     endpoint = rule.endpoint
@@ -51,11 +59,11 @@ def endpoint_to_controller(rule):
     return view_func
 
 
-def add_route(endpoint, url, controller):
+def add_route(endpoint, url, controller, *args, **kwargs):
     """
     Add a route to the url mapping
     """
-    url_map.add(MGRoute(endpoint, url, controller))
+    url_map.add(MGRoute(endpoint, url, controller, *args, **kwargs))
 
 
 def mount(mountpoint, routes):
@@ -65,3 +73,17 @@ def mount(mountpoint, routes):
     for endpoint, url, controller in routes:
         url = "%s/%s" % (mountpoint.rstrip('/'), url.lstrip('/'))
         add_route(endpoint, url, controller)
+
+def extract_url_arguments(url, urlmap):
+    """
+    This extracts the URL arguments from a given URL
+    """
+    parsed_url = urlparse.urlparse(url)
+    map_adapter = urlmap.bind(
+        server_name=parsed_url.netloc,
+        script_name=parsed_url.path,
+        url_scheme=parsed_url.scheme,
+        path_info=parsed_url.path
+    )
+
+    return map_adapter.match()[1]
diff --git a/mediagoblin/tools/staticdirect.py b/mediagoblin/tools/staticdirect.py
index 8381b8b6..881dd20e 100644
--- a/mediagoblin/tools/staticdirect.py
+++ b/mediagoblin/tools/staticdirect.py
@@ -24,6 +24,8 @@
 
 import logging
 
+import six
+
 _log = logging.getLogger(__name__)
 
 
@@ -48,7 +50,7 @@ class StaticDirect(object):
     def __init__(self, domains):
         self.domains = dict(
             [(key, value.rstrip('/'))
-             for key, value in domains.iteritems()])
+             for key, value in six.iteritems(domains)])
         self.cache = {}
 
     def __call__(self, filepath, domain=None):
diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py
index e5acdf45..f2619808 100644
--- a/mediagoblin/tools/template.py
+++ b/mediagoblin/tools/template.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
 
 import jinja2
 from jinja2.ext import Extension
@@ -28,16 +29,14 @@ from mediagoblin import _version
 from mediagoblin.tools import common
 from mediagoblin.tools.translate import is_rtl
 from mediagoblin.tools.translate import set_thread_locale
-from mediagoblin.tools.translate import get_locale_from_request
 from mediagoblin.tools.pluginapi import get_hook_templates, hook_transform
 from mediagoblin.tools.timesince import timesince
 from mediagoblin.meddleware.csrf import render_csrf_form_token
 
-
 SETUP_JINJA_ENVS = {}
 
 
-def get_jinja_env(template_loader, locale):
+def get_jinja_env(app, template_loader, locale):
     """
     Set up the Jinja environment,
 
@@ -54,7 +53,7 @@ def get_jinja_env(template_loader, locale):
     # The default config does not require a [jinja2] block.
     # You may create one if you wish to enable additional jinja2 extensions,
     # see example in config_spec.ini 
-    jinja2_config = mg_globals.global_config.get('jinja2', {})
+    jinja2_config = app.global_config.get('jinja2', {})
     local_exts = jinja2_config.get('extensions', [])
 
     # jinja2.StrictUndefined will give exceptions on references
@@ -66,9 +65,12 @@ def get_jinja_env(template_loader, locale):
             'jinja2.ext.i18n', 'jinja2.ext.autoescape',
             TemplateHookExtension] + local_exts)
 
-    template_env.install_gettext_callables(
-        mg_globals.thread_scope.translations.ugettext,
-        mg_globals.thread_scope.translations.ungettext)
+    if six.PY2:
+        template_env.install_gettext_callables(mg_globals.thread_scope.translations.ugettext,
+                                           mg_globals.thread_scope.translations.ungettext)
+    else:
+        template_env.install_gettext_callables(mg_globals.thread_scope.translations.gettext,
+                                           mg_globals.thread_scope.translations.ngettext)
 
     # All templates will know how to ...
     # ... fetch all waiting messages and remove them from the queue
@@ -76,10 +78,10 @@ def get_jinja_env(template_loader, locale):
     # ... have access to the global and app config
     # ... determine if the language is rtl or ltr
     template_env.globals['fetch_messages'] = messages.fetch_messages
-    template_env.globals['app_config'] = mg_globals.app_config
-    template_env.globals['global_config'] = mg_globals.global_config
+    template_env.globals['app_config'] = app.app_config
+    template_env.globals['global_config'] = app.global_config
     template_env.globals['version'] = _version.__version__
-    template_env.globals['auth'] = mg_globals.app.auth
+    template_env.globals['auth'] = app.auth
     template_env.globals['is_rtl'] = is_rtl(locale)
     template_env.filters['urlencode'] = url_quote_plus
 
diff --git a/mediagoblin/tools/timesince.py b/mediagoblin/tools/timesince.py
index b761c1be..7a8b3ff0 100644
--- a/mediagoblin/tools/timesince.py
+++ b/mediagoblin/tools/timesince.py
@@ -33,18 +33,6 @@ import pytz
 
 from mediagoblin.tools.translate import pass_to_ugettext, lazy_pass_to_ungettext as _
 
-"""UTC time zone as a tzinfo instance."""
-utc = pytz.utc if pytz else UTC()
-
-def is_aware(value):
-    """
-    Determines if a given datetime.datetime is aware.
-
-    The logic is described in Python's docs:
-    http://docs.python.org/library/datetime.html#datetime.tzinfo
-    """
-    return value.tzinfo is not None and value.tzinfo.utcoffset(value) is not None
-
 def timesince(d, now=None, reversed=False):
     """
     Takes two datetime objects and returns the time between d and now
@@ -73,7 +61,7 @@ def timesince(d, now=None, reversed=False):
         now = datetime.datetime(now.year, now.month, now.day)
 
     if not now:
-        now = datetime.datetime.now(utc if is_aware(d) else None)
+        now = datetime.datetime.utcnow()
 
     delta = (d - now) if reversed else (now - d)
     # ignore microseconds
diff --git a/mediagoblin/plugins/oauth/templates/oauth/authorize.html b/mediagoblin/tools/transition.py
index 8a00c925..a8041b89 100644
--- a/mediagoblin/plugins/oauth/templates/oauth/authorize.html
+++ b/mediagoblin/tools/transition.py
@@ -1,4 +1,3 @@
-{#
 # GNU MediaGoblin -- federated, autonomous media hosting
 # Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
@@ -6,7 +5,7 @@
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-#, se, seee
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -14,18 +13,9 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
--#}
-{% extends "mediagoblin/base.html" %}
-{% import "mediagoblin/utils/wtforms.html" as wtforms_util %}
 
-{% block mediagoblin_content %}
-<form action="{{ request.urlgen('mediagoblin.plugins.oauth.authorize_client') }}"
-    method="POST">
-    <div class="form_box_xl">
-        {{ csrf_token }}
-        <h2>Authorize {{ client.name }}?</h2>
-        <p class="client-description">{{ client.description }}</p>
-        {{ wtforms_util.render_divs(form) }}
-    </div>
-</form>
-{% endblock %}
+
+import os
+
+# one global to disable them all
+DISABLE_GLOBALS = os.environ.get("DISABLE_GLOBALS", "false").lower() == "true"
diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py
index f77351b5..a5e56cfe 100644
--- a/mediagoblin/tools/translate.py
+++ b/mediagoblin/tools/translate.py
@@ -17,6 +17,7 @@
 import gettext
 import pkg_resources
 
+import six
 
 from babel import localedata
 from babel.support import LazyProxy
@@ -52,9 +53,9 @@ class ReallyLazyProxy(LazyProxy):
     """
     Like LazyProxy, except that it doesn't cache the value ;)
     """
-    @property
-    def value(self):
-        return self._func(*self._args, **self._kwargs)
+    def __init__(self, func, *args, **kwargs):
+        super(ReallyLazyProxy, self).__init__(func, *args, **kwargs)
+        object.__setattr__(self, '_is_cache_enabled', False)
 
     def __repr__(self):
         return "<%s for %s(%r, %r)>" % (
@@ -146,8 +147,9 @@ def pass_to_ugettext(*args, **kwargs):
     The reason we can't have a global ugettext method is because
     mg_globals gets swapped out by the application per-request.
     """
-    return mg_globals.thread_scope.translations.ugettext(
-        *args, **kwargs)
+    if six.PY2:
+        return mg_globals.thread_scope.translations.ugettext(*args, **kwargs)
+    return mg_globals.thread_scope.translations.gettext(*args, **kwargs)
 
 def pass_to_ungettext(*args, **kwargs):
     """
@@ -156,8 +158,9 @@ def pass_to_ungettext(*args, **kwargs):
     The reason we can't have a global ugettext method is because
     mg_globals gets swapped out by the application per-request.
     """
-    return mg_globals.thread_scope.translations.ungettext(
-        *args, **kwargs)
+    if six.PY2:
+        return mg_globals.thread_scope.translations.ungettext(*args, **kwargs)
+    return mg_globals.thread_scope.translations.ngettext(*args, **kwargs)
 
 
 def lazy_pass_to_ugettext(*args, **kwargs):
diff --git a/mediagoblin/tools/url.py b/mediagoblin/tools/url.py
index 657c0373..4d97247a 100644
--- a/mediagoblin/tools/url.py
+++ b/mediagoblin/tools/url.py
@@ -17,6 +17,8 @@
 import re
 from unidecode import unidecode
 
+import six
+
 _punct_re = re.compile(r'[\t !"#:$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+')
 
 
@@ -27,4 +29,4 @@ def slugify(text, delim=u'-'):
     result = []
     for word in _punct_re.split(text.lower()):
         result.extend(unidecode(word).split())
-    return unicode(delim.join(result))
+    return six.text_type(delim.join(result))
diff --git a/mediagoblin/tools/workbench.py b/mediagoblin/tools/workbench.py
index 0bd4096b..f1ad6414 100644
--- a/mediagoblin/tools/workbench.py
+++ b/mediagoblin/tools/workbench.py
@@ -18,10 +18,15 @@ import os
 import shutil
 import tempfile
 
+import six
+
+from mediagoblin._compat import py2_unicode
 
 # Actual workbench stuff
 # ----------------------
 
+
+@py2_unicode
 class Workbench(object):
     """
     Represent the directory for the workbench
@@ -36,11 +41,8 @@ class Workbench(object):
         """
         self.dir = dir
 
-    def __unicode__(self):
-        return unicode(self.dir)
-
     def __str__(self):
-        return str(self.dir)
+        return six.text_type(self.dir)
 
     def __repr__(self):
         try:
diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index 1a09864b..77e280e1 100644
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -41,7 +41,7 @@ class MediaCollectForm(wtforms.Form):
     note = wtforms.TextAreaField(
         _('Include a note'),
         [wtforms.validators.Optional()],)
-    collection_title = wtforms.TextField(
+    collection_title = wtforms.StringField(
         _('Title'),
         [wtforms.validators.Length(min=0, max=500)])
     collection_description = wtforms.TextAreaField(
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index 8eb51c8d..1a1d4139 100644
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -31,6 +31,10 @@ add_route('mediagoblin.user_pages.media_confirm_delete',
           '/u/<string:user>/m/<int:media_id>/confirm-delete/',
           'mediagoblin.user_pages.views:media_confirm_delete')
 
+add_route('mediagoblin.user_pages.activity_view',
+          '/<string:username>/activity/<string:id>/',
+          'mediagoblin.user_pages.views:activity_view')
+
 # Submission handling of new comments. TODO: only allow for POST methods
 add_route('mediagoblin.user_pages.media_post_comment',
           '/u/<string:user>/m/<int:media_id>/comment/add/',
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 78751a28..cc7f3684 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -18,14 +18,17 @@ import logging
 import datetime
 import json
 
+import six
+
 from mediagoblin import messages, mg_globals
 from mediagoblin.db.models import (MediaEntry, MediaTag, Collection,
-                                   CollectionItem, User)
+                                   CollectionItem, User, Activity)
 from mediagoblin.tools.response import render_to_response, render_404, \
     redirect, redirect_obj
 from mediagoblin.tools.text import cleaned_markdown_conversion
 from mediagoblin.tools.translate import pass_to_ugettext as _
 from mediagoblin.tools.pagination import Pagination
+from mediagoblin.tools.federation import create_activity
 from mediagoblin.user_pages import forms as user_forms
 from mediagoblin.user_pages.lib import (send_comment_email,
 	add_media_to_collection, build_report_object)
@@ -178,7 +181,7 @@ def media_post_comment(request, media):
     comment = request.db.MediaComment()
     comment.media_entry = media.id
     comment.author = request.user.id
-    comment.content = unicode(request.form['comment_content'])
+    comment.content = six.text_type(request.form['comment_content'])
 
     # Show error message if commenting is disabled.
     if not mg_globals.app_config['allow_comments']:
@@ -192,16 +195,15 @@ def media_post_comment(request, media):
             messages.ERROR,
             _("Oops, your comment was empty."))
     else:
+        create_activity("post", comment, comment.author, target=media)
+        add_comment_subscription(request.user, media)
         comment.save()
 
         messages.add_message(
             request, messages.SUCCESS,
             _('Your comment has been posted!'))
-
         trigger_notification(comment, media, request)
 
-        add_comment_subscription(request.user, media)
-
     return redirect_obj(request, media)
 
 
@@ -212,7 +214,7 @@ def media_preview_comment(request):
     if not request.is_xhr:
         return render_404(request)
 
-    comment = unicode(request.form['comment_content'])
+    comment = six.text_type(request.form['comment_content'])
     cleancomment = { "content":cleaned_markdown_conversion(comment)}
 
     return Response(json.dumps(cleancomment))
@@ -260,6 +262,7 @@ def media_collect(request, media):
         collection.description = form.collection_description.data
         collection.creator = request.user.id
         collection.generate_slug()
+        create_activity("create", collection, collection.creator)
         collection.save()
 
     # Otherwise, use the collection selected from the drop-down
@@ -287,7 +290,7 @@ def media_collect(request, media):
                              % (media.title, collection.title))
     else: # Add item to collection
         add_media_to_collection(collection, media, form.note.data)
-
+        create_activity("add", media, request.user, target=collection)
         messages.add_message(request, messages.SUCCESS,
                              _('"%s" added to collection "%s"')
                              % (media.title, collection.title))
@@ -692,3 +695,34 @@ def file_a_report(request, media, comment):
         request,
         'mediagoblin/user_pages/report.html',
         context)
+
+@require_active_login
+def activity_view(request):
+    """ /<username>/activity/<id> - Display activity
+
+    This should display a HTML presentation of the activity
+    this is NOT an API endpoint.
+    """
+    # Get the user object.
+    username = request.matchdict["username"]
+    user = User.query.filter_by(username=username).first()
+
+    activity_id = request.matchdict["id"]
+
+    if request.user is None:
+        return render_404(request)
+
+    activity = Activity.query.filter_by(
+        id=activity_id,
+        author=user.id
+    ).first()
+
+    if activity is None:
+        return render_404(request)
+
+    return render_to_response(
+        request,
+        "mediagoblin/api/activity.html",
+        {"activity": activity}
+    )
+
diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 009e48e4..9e893d56 100644
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -25,7 +25,7 @@ from mediagoblin.decorators import uses_pagination, user_not_banned
 @user_not_banned
 @uses_pagination
 def default_root_view(request, page):
-    cursor = MediaEntry.query.filter_by(state=u'processed').\
+    cursor = request.db.query(MediaEntry).filter_by(state=u'processed').\
         order_by(MediaEntry.created.desc())
 
     pagination = Pagination(page, cursor)
diff --git a/paste.ini b/paste.ini
index 3c7eb177..68fd9dea 100644
--- a/paste.ini
+++ b/paste.ini
@@ -6,19 +6,16 @@
 debug = false
 
 [pipeline:main]
-pipeline = errors routing
-
-[composite:routing]
-use = egg:Paste#urlmap
-/ = mediagoblin
-/mgoblin_media/ = publicstore_serve
-/mgoblin_static/ = mediagoblin_static
-/theme_static/ = theme_static
-/plugin_static/ = plugin_static
+pipeline = errors mediagoblin
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
 config = %(here)s/mediagoblin_local.ini %(here)s/mediagoblin.ini
+# static paths
+/mgoblin_media = %(here)s/user_dev/media/public
+/mgoblin_static = %(here)s/mediagoblin/static
+/theme_static = %(here)s/user_dev/theme_static
+/plugin_static = %(here)s/user_dev/plugin_static
 
 [loggers]
 keys = root
@@ -42,26 +39,6 @@ formatter = generic
 [formatter_generic]
 format = %(asctime)s %(levelname)-7.7s [%(name)s] %(message)s
 
-[app:publicstore_serve]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/media/public/
-cache_max_age = 604800
-
-[app:mediagoblin_static]
-use = egg:Paste#static
-document_root = %(here)s/mediagoblin/static/
-cache_max_age = 86400
-
-[app:theme_static]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/theme_static/
-cache_max_age = 86400
-
-[app:plugin_static]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/plugin_static/
-cache_max_age = 86400
-
 [filter:errors]
 use = egg:mediagoblin#errors
 debug = false
@@ -74,9 +51,14 @@ debug = false
 # The server that is run by default.
 # By default, should only be accessable locally
 [server:main]
-use = egg:Paste#http
+use = egg:mediagoblin#paste_server_selector
 host = 127.0.0.1
 port = 6543
+# Gunicorn settings. See http://docs.gunicorn.org/en/19.0/settings.html
+# for more information about configuring Gunicorn
+proc_name = gmg
+reload = true
+accesslog = -
 
 #######################
 # Helper server configs
diff --git a/setup.py b/setup.py
index 327221d2..29391fb0 100644
--- a/setup.py
+++ b/setup.py
@@ -14,17 +14,25 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function
+
 from setuptools import setup, find_packages
+from io import open
 import os
 import re
 
+import sys
+
+PY2 = sys.version_info[0] == 2  # six is not installed yet
+
 READMEFILE = "README"
 VERSIONFILE = os.path.join("mediagoblin", "_version.py")
 VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]"
 
 
 def get_version():
-    verstrline = open(VERSIONFILE, "rt").read()
+    with open(VERSIONFILE, "rt") as fobj:
+        verstrline = fobj.read()
     mo = re.search(VSRE, verstrline, re.M)
     if mo:
         return mo.group(1)
@@ -32,6 +40,69 @@ def get_version():
         raise RuntimeError("Unable to find version string in %s." %
                            VERSIONFILE)
 
+pyversion_install_requires = []
+if PY2:
+    pyversion_install_requires.append('argparse')  # only for < 2.7
+    pyversion_install_requires.append('PasteScript')
+    # newer sqlalchemy-migrate requires pbr which BREAKS EVERYTHING AND IS
+    # TERRIBLE AND IS THE END OF ALL THINGS
+    # I'd love to remove this restriction.
+    pyversion_install_requires.append('sqlalchemy-migrate<0.8')
+    # # Annoying.  Please remove once we can!  We only indirectly
+    # # use pbr, and currently it breaks things, presumably till
+    # # their next release.
+    # pyversion_install_requires.append('pbr==0.5.22')
+    pyversion_install_requires.append('mock')  # mock is in the stdlib for 3.3+
+    # PyPI version (1.4.2) does not have proper Python 3 support
+    pyversion_install_requires.append('ExifRead')
+    pyversion_install_requires.append('PasteScript')
+    pyversion_install_requires.append('Paste')
+else:
+    pyversion_install_requires.append('gunicorn')
+
+install_requires = [
+    'alembic==0.6.6',
+    'python-dateutil',
+    'wtforms',
+    'py-bcrypt',
+    'pytest>=2.3.1',
+    'pytest-xdist',
+    'werkzeug>=0.7',
+    'celery>=3.0',
+    'kombu',
+    'jinja2',
+    'Babel>=1.3',
+    'webtest<2',
+    'ConfigObj',
+    'Markdown',
+    'sqlalchemy<0.9.0, >0.8.0',
+    'itsdangerous',
+    'pytz',
+    'sphinx',
+    'six',
+    'oauthlib',
+    'unidecode',
+    'jsonschema',
+    'PasteDeploy',
+    'requests',
+    'pyld',
+    # This is optional:
+    # 'translitcodec',
+    # For now we're expecting that users will install this from
+    # their package managers.
+    # 'lxml',
+    # 'Pillow',
+] + pyversion_install_requires
+
+dependency_links = []
+if not PY2:
+    # PyPI version (1.4.2) does not have proper Python 3 support
+    dependency_links.append('https://github.com/ianare/exif-py/zipball/develop#egg=ExifRead-2.0.0')
+    install_requires.append('ExifRead>=2.0.0')
+
+with open(READMEFILE, encoding="utf-8") as fobj:
+    long_description = fobj.read()
+
 try:
     setup(
     name="mediagoblin",
@@ -40,57 +111,8 @@ try:
     zip_safe=False,
     include_package_data = True,
     # scripts and dependencies
-    install_requires=[
-        'setuptools',
-        'python-dateutil',
-        'PasteScript',
-        'wtforms',
-        'py-bcrypt',
-        'pytest>=2.3.1',
-        'pytest-xdist',
-        'werkzeug>=0.7',
-        'celery>=3.0',
-        'kombu',
-        'jinja2',
-        'sphinx',
-        'Babel>=1.0',
-        'argparse',
-        'webtest<2',
-        'ConfigObj',
-        'Markdown',
-        'sqlalchemy<0.9.0, >0.8.0',
-        # newer sqlalchemy-migrate requires pbr which BREAKS EVERYTHING AND IS
-        #  TERRIBLE AND IS THE END OF ALL THINGS
-        #  I'd love to remove this restriction.
-        'sqlalchemy-migrate<0.8',
-        'mock',
-        'itsdangerous',
-        'pytz',
-        'six>=1.4.1',
-        'oauthlib',
-        'unidecode',
-        'jsonschema',
-        'requests',
-        'pyld',
-        'ExifRead',
-
-        # PLEASE change this when we can; a dependency is forcing us to set this
-        # specific number and it is breaking setup.py develop
-        'six==1.5.2'
-
-        ## Annoying.  Please remove once we can!  We only indirectly
-        ## use pbr, and currently it breaks things, presumably till
-        ## their next release.
-        # 'pbr==0.5.22',
-
-        ## This is optional!
-        # 'translitcodec',
-        ## For now we're expecting that users will install this from
-        ## their package managers.
-        # 'lxml',
-        # 'PIL',
-        ],
-    # requires=['gst'],
+    install_requires=install_requires,
+    dependency_links=dependency_links,
     test_suite='nose.collector',
     entry_points="""\
         [console_scripts]
@@ -100,6 +122,9 @@ try:
         [paste.app_factory]
         app = mediagoblin.app:paste_app_factory
 
+        [paste.server_runner]
+        paste_server_selector = mediagoblin.app:paste_server_selector
+
         [paste.filter_app_factory]
         errors = mediagoblin.errormiddleware:mgoblin_error_middleware
 
@@ -113,7 +138,7 @@ try:
     author='Free Software Foundation and contributors',
     author_email='cwebber@gnu.org',
     url="http://mediagoblin.org/",
-    long_description=open(READMEFILE).read(),
+    long_description=long_description,
     description='MediaGoblin is a web application for publishing all kinds of media',
     classifiers=[
         "Development Status :: 3 - Alpha",
@@ -121,22 +146,26 @@ try:
         "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content"
         ],
     )
-except TypeError, e:
+except TypeError as e:
+    import sys
+
     # Check if the problem is caused by the sqlalchemy/setuptools conflict
     msg_as_str = str(e)
     if not (msg_as_str == 'dist must be a Distribution instance'):
         raise
 
     # If so, tell the user it is OK to just run the script again.
-    print "\n\n---------- NOTE ----------"
-    print "The setup.py command you ran failed."
-    print ""
-    print ("It is a known possible failure. Just run it again. It works the "
-           "second time.")
-    import sys
+    print("\n\n---------- NOTE ----------", file=sys.stderr)
+    print("The setup.py command you ran failed.\n", file=sys.stderr)
+    print("It is a known possible failure. Just run it again. It works the "
+          "second time.", file=sys.stderr)
     sys.exit(1)
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..023c53ed
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,13 @@
+[tox]
+envlist = py27, py33
+skipsdist = True
+sitepackages = False
+
+[testenv]
+usedevelop = True
+# for ExifRead 2.0.0
+install_command = pip install --process-dependency-links --pre {opts} {packages}
+commands = py.test ./mediagoblin/tests --boxed
+deps =
+ lxml
+ Pillow